<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[23563] trunk/launchd/src</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.macosforge.org/projects/launchd/changeset/23563">23563</a></dd>
<dt>Author</dt> <dd>zarzycki@apple.com</dd>
<dt>Date</dt> <dd>2008-03-21 15:52:53 -0700 (Fri, 21 Mar 2008)</dd>
</dl>
<h3>Log Message</h3>
<pre><rdar://problem/5810463> 10A34: Nothing in Installer log window</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunklaunchdsrclaunchd_runtimec">trunk/launchd/src/launchd_runtime.c</a></li>
<li><a href="#trunklaunchdsrclibvprocc">trunk/launchd/src/libvproc.c</a></li>
<li><a href="#trunklaunchdsrclibvproc_internalh">trunk/launchd/src/libvproc_internal.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunklaunchdsrclaunchd_runtimec"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/launchd_runtime.c (23562 => 23563)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchd_runtime.c 2008-03-19 21:43:25 UTC (rev 23562)
+++ trunk/launchd/src/launchd_runtime.c 2008-03-21 22:52:53 UTC (rev 23563)
</span><span class="lines">@@ -1282,10 +1282,10 @@
</span><span class="cx"> offset = (void *)*outval;
</span><span class="cx">
</span><span class="cx"> while ((lm = STAILQ_FIRST(&logmsg_queue))) {
</span><del>- lm->from_name -= (size_t)lm;
- lm->about_name -= (size_t)lm;
- lm->msg -= (size_t)lm;
- lm->session_name -= (size_t)lm;
</del><ins>+ lm->from_name_offset = lm->from_name - (char *)lm;
+ lm->about_name_offset = lm->about_name - (char *)lm;
+ lm->msg_offset = lm->msg - (char *)lm;
+ lm->session_name_offset = lm->session_name - (char *)lm;
</ins><span class="cx">
</span><span class="cx"> memcpy(offset, lm, lm->obj_sz);
</span><span class="cx">
</span></span></pre></div>
<a id="trunklaunchdsrclibvprocc"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/libvproc.c (23562 => 23563)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/libvproc.c 2008-03-19 21:43:25 UTC (rev 23562)
+++ trunk/launchd/src/libvproc.c 2008-03-21 22:52:53 UTC (rev 23563)
</span><span class="lines">@@ -412,10 +412,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> for (lm = (struct logmsg_s *)outdata; tmp_cnt > 0; lm = ((void *)lm + lm->obj_sz)) {
</span><del>- lm->from_name += (size_t)lm;
- lm->about_name += (size_t)lm;
- lm->msg += (size_t)lm;
- lm->session_name += (size_t)lm;
</del><ins>+ lm->from_name = (char *)lm + lm->from_name_offset;
+ lm->about_name = (char *)lm + lm->about_name_offset;
+ lm->msg = (char *)lm + lm->msg_offset;
+ lm->session_name = (char *)lm + lm->session_name_offset;
</ins><span class="cx">
</span><span class="cx"> tv.tv_sec = lm->when / USEC_PER_SEC;
</span><span class="cx"> tv.tv_usec = lm->when % USEC_PER_SEC;
</span></span></pre></div>
<a id="trunklaunchdsrclibvproc_internalh"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/libvproc_internal.h (23562 => 23563)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/libvproc_internal.h 2008-03-19 21:43:25 UTC (rev 23562)
+++ trunk/launchd/src/libvproc_internal.h 2008-03-21 22:52:53 UTC (rev 23563)
</span><span class="lines">@@ -58,7 +58,10 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> struct logmsg_s {
</span><del>- STAILQ_ENTRY(logmsg_s) sqe;
</del><ins>+ union {
+ STAILQ_ENTRY(logmsg_s) sqe;
+ uint64_t __pad;
+ };
</ins><span class="cx"> int64_t when;
</span><span class="cx"> pid_t from_pid;
</span><span class="cx"> pid_t about_pid;
</span><span class="lines">@@ -66,10 +69,22 @@
</span><span class="cx"> gid_t sender_gid;
</span><span class="cx"> int err_num;
</span><span class="cx"> int pri;
</span><del>- const char *from_name;
- const char *about_name;
- const char *session_name;
- const char *msg;
</del><ins>+ union {
+ const char *from_name;
+ uint64_t from_name_offset;
+ };
+ union {
+ const char *about_name;
+ uint64_t about_name_offset;
+ };
+ union {
+ const char *session_name;
+ uint64_t session_name_offset;
+ };
+ union {
+ const char *msg;
+ uint64_t msg_offset;
+ };
</ins><span class="cx"> size_t obj_sz;
</span><span class="cx"> char data[0];
</span><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>