Changeset 23563

Timestamp:

03/21/08 15:52:53 (9 months ago)

Author:

zarzycki@…

Message:

<rdar://problem/5810463> 10A34: Nothing in Installer log window

Location:

trunk/launchd/src

Files:

• launchd_runtime.c (modified) (1 diff)
• libvproc.c (modified) (1 diff)
• libvproc_internal.h (modified) (2 diffs)

trunk/launchd/src/launchd_runtime.c

@@ -1283 +1283 @@
 
         while ((lm = STAILQ_FIRST(&logmsg_queue))) {
-                lm->from_name -= (size_t)lm;
-                lm->about_name -= (size_t)lm;
-                lm->msg -= (size_t)lm;
-                lm->session_name -= (size_t)lm;
+                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;
 
                 memcpy(offset, lm, lm->obj_sz);

trunk/launchd/src/libvproc.c

@@ -413 +413 @@
 
         for (lm = (struct logmsg_s *)outdata; tmp_cnt > 0; lm = ((void *)lm + lm->obj_sz)) {
-                lm->from_name += (size_t)lm;
-                lm->about_name += (size_t)lm;
-                lm->msg += (size_t)lm;
-                lm->session_name += (size_t)lm;
+                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;
 
                 tv.tv_sec = lm->when / USEC_PER_SEC;

trunk/launchd/src/libvproc_internal.h

@@ -59 +59 @@
 
 struct logmsg_s {
-        STAILQ_ENTRY(logmsg_s) sqe;
+        union {
+                STAILQ_ENTRY(logmsg_s) sqe;
+                uint64_t __pad;
+        };
         int64_t when;
         pid_t from_pid;
@@ -67 +70 @@
         int err_num;
         int pri;
-        const char *from_name;
-        const char *about_name;
-        const char *session_name;
-        const char *msg;
+        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;
+        };
         size_t obj_sz;
         char data[0];