<!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 { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { 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>[23378] trunk/launchd/src</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.macosforge.org/projects/launchd/changeset/23378">23378</a></dd>
<dt>Author</dt> <dd>zarzycki@apple.com</dd>
<dt>Date</dt> <dd>2007-09-13 10:16:54 -0700 (Thu, 13 Sep 2007)</dd>
</dl>

<h3>Log Message</h3>
<pre>White space clean up.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunklaunchdsrclaunchctlc">trunk/launchd/src/launchctl.c</a></li>
<li><a href="#trunklaunchdsrclaunchdc">trunk/launchd/src/launchd.c</a></li>
<li><a href="#trunklaunchdsrclaunchd_core_logicc">trunk/launchd/src/launchd_core_logic.c</a></li>
<li><a href="#trunklaunchdsrclaunchd_runtimec">trunk/launchd/src/launchd_runtime.c</a></li>
<li><a href="#trunklaunchdsrclaunchproxyc">trunk/launchd/src/launchproxy.c</a></li>
<li><a href="#trunklaunchdsrcliblaunchc">trunk/launchd/src/liblaunch.c</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunklaunchdsrclaunchctlc"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/launchctl.c (23377 => 23378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchctl.c        2007-09-13 00:50:24 UTC (rev 23377)
+++ trunk/launchd/src/launchctl.c        2007-09-13 17:16:54 UTC (rev 23378)
</span><span class="lines">@@ -81,8 +81,8 @@
</span><span class="cx"> #define MACHINIT_JOBKEY_SERVERPORT        &quot;ServerPort&quot;
</span><span class="cx"> #define MACHINIT_JOBKEY_SERVICEPORT        &quot;ServicePort&quot;
</span><span class="cx"> 
</span><del>-#define assumes(e)      \
-                (__builtin_expect(!(e), 0) ? _log_launchctl_bug(__rcs_file_version__, __FILE__, __LINE__, #e), false : true)
</del><ins>+#define assumes(e)        \
+        (__builtin_expect(!(e), 0) ? _log_launchctl_bug(__rcs_file_version__, __FILE__, __LINE__, #e), false : true)
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> struct load_unload_state {
</span><span class="lines">@@ -738,7 +738,7 @@
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         if (!(S_ISREG(sb.st_mode) || S_ISDIR(sb.st_mode))) {
</span><del>-                fprintf(stderr, &quot;%s: Dubious path. Not a regular file or directory (skipping):  %s\n&quot;, getprogname(), path);
</del><ins>+                fprintf(stderr, &quot;%s: Dubious path. Not a regular file or directory (skipping): %s\n&quot;, getprogname(), path);
</ins><span class="cx">                 return false;
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="lines">@@ -894,9 +894,9 @@
</span><span class="cx">                         setm = true;
</span><span class="cx">                 }
</span><span class="cx"> 
</span><del>-                if (passive) {                  
</del><ins>+                if (passive) {
</ins><span class="cx">                         if (unlink(sun.sun_path) == -1 &amp;&amp; errno != ENOENT) {
</span><del>-                                close(sfd);     
</del><ins>+                                close(sfd);
</ins><span class="cx">                                 return;
</span><span class="cx">                         }
</span><span class="cx">                         oldmask = umask(S_IRWXG|S_IRWXO);
</span><span class="lines">@@ -1621,7 +1621,7 @@
</span><span class="cx"> int
</span><span class="cx"> load_and_unload_cmd(int argc, char *const argv[])
</span><span class="cx"> {
</span><del>-        NSSearchPathEnumerationState es = 0;
</del><ins>+        NSSearchPathEnumerationState es = 0;
</ins><span class="cx">         char nspath[PATH_MAX * 2]; /* safe side, we need to append */
</span><span class="cx">         bool badopts = false;
</span><span class="cx">         struct load_unload_state lus;
</span><span class="lines">@@ -2595,7 +2595,7 @@
</span><span class="cx"> is_legacy_mach_job(launch_data_t obj)
</span><span class="cx"> {
</span><span class="cx">         bool has_servicename = launch_data_dict_lookup(obj, MACHINIT_JOBKEY_SERVICENAME);
</span><del>-        bool has_command  = launch_data_dict_lookup(obj, MACHINIT_JOBKEY_COMMAND);
</del><ins>+        bool has_command = launch_data_dict_lookup(obj, MACHINIT_JOBKEY_COMMAND);
</ins><span class="cx">         bool has_label = launch_data_dict_lookup(obj, LAUNCH_JOBKEY_LABEL);
</span><span class="cx"> 
</span><span class="cx">         return has_command &amp;&amp; has_servicename &amp;&amp; !has_label;
</span></span></pre></div>
<a id="trunklaunchdsrclaunchdc"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/launchd.c (23377 => 23378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchd.c        2007-09-13 00:50:24 UTC (rev 23377)
+++ trunk/launchd/src/launchd.c        2007-09-13 17:16:54 UTC (rev 23378)
</span><span class="lines">@@ -115,7 +115,7 @@
</span><span class="cx"> 
</span><span class="cx">         while ((ch = getopt(argc, argv, &quot;s&quot;)) != -1) {
</span><span class="cx">                 switch (ch) {
</span><del>-                case 's': sflag = true;   break;        /* single user */
</del><ins>+                case 's': sflag = true; break;        /* single user */
</ins><span class="cx">                 case '?': /* we should do something with the global optopt variable here */
</span><span class="cx">                 default:
</span><span class="cx">                         fprintf(stderr, &quot;%s: ignoring unknown arguments\n&quot;, getprogname());
</span></span></pre></div>
<a id="trunklaunchdsrclaunchd_core_logicc"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/launchd_core_logic.c (23377 => 23378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchd_core_logic.c        2007-09-13 00:50:24 UTC (rev 23377)
+++ trunk/launchd/src/launchd_core_logic.c        2007-09-13 17:16:54 UTC (rev 23378)
</span><span class="lines">@@ -273,8 +273,8 @@
</span><span class="cx">         char name[0];
</span><span class="cx"> };
</span><span class="cx"> 
</span><del>-#define jobmgr_assumes(jm, e)      \
-                        (__builtin_expect(!(e), 0) ? jobmgr_log_bug(jm, __rcs_file_version__, __FILE__, __LINE__, #e), false : true)
</del><ins>+#define jobmgr_assumes(jm, e)        \
+        (__builtin_expect(!(e), 0) ? jobmgr_log_bug(jm, __rcs_file_version__, __FILE__, __LINE__, #e), false : true)
</ins><span class="cx"> 
</span><span class="cx"> static jobmgr_t jobmgr_new(jobmgr_t jm, mach_port_t requestorport, mach_port_t transfer_port, bool sflag, const char *name);
</span><span class="cx"> static job_t jobmgr_import2(jobmgr_t jm, launch_data_t pload);
</span><span class="lines">@@ -369,8 +369,8 @@
</span><span class="cx"> static size_t hash_ms(const char *msstr) __attribute__((pure));
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-#define job_assumes(j, e)      \
-                        (__builtin_expect(!(e), 0) ? job_log_bug(j, __rcs_file_version__, __FILE__, __LINE__, #e), false : true)
</del><ins>+#define job_assumes(j, e)        \
+        (__builtin_expect(!(e), 0) ? job_log_bug(j, __rcs_file_version__, __FILE__, __LINE__, #e), false : true)
</ins><span class="cx"> 
</span><span class="cx"> static void job_import_keys(launch_data_t obj, const char *key, void *context);
</span><span class="cx"> static void job_import_bool(job_t j, const char *key, bool value);
</span><span class="lines">@@ -421,15 +421,15 @@
</span><span class="cx">         const char *key;
</span><span class="cx">         int val;
</span><span class="cx"> } launchd_keys2limits[] = {
</span><del>-        { LAUNCH_JOBKEY_RESOURCELIMIT_CORE,    RLIMIT_CORE    },
-        { LAUNCH_JOBKEY_RESOURCELIMIT_CPU,     RLIMIT_CPU     },
-        { LAUNCH_JOBKEY_RESOURCELIMIT_DATA,    RLIMIT_DATA    },
-        { LAUNCH_JOBKEY_RESOURCELIMIT_FSIZE,   RLIMIT_FSIZE   },
-        { LAUNCH_JOBKEY_RESOURCELIMIT_MEMLOCK, RLIMIT_MEMLOCK },
-        { LAUNCH_JOBKEY_RESOURCELIMIT_NOFILE,  RLIMIT_NOFILE  },
-        { LAUNCH_JOBKEY_RESOURCELIMIT_NPROC,   RLIMIT_NPROC   },
-        { LAUNCH_JOBKEY_RESOURCELIMIT_RSS,     RLIMIT_RSS     },
-        { LAUNCH_JOBKEY_RESOURCELIMIT_STACK,   RLIMIT_STACK   },
</del><ins>+        { LAUNCH_JOBKEY_RESOURCELIMIT_CORE,        RLIMIT_CORE        },
+        { LAUNCH_JOBKEY_RESOURCELIMIT_CPU,        RLIMIT_CPU        },
+        { LAUNCH_JOBKEY_RESOURCELIMIT_DATA,        RLIMIT_DATA        },
+        { LAUNCH_JOBKEY_RESOURCELIMIT_FSIZE,        RLIMIT_FSIZE        },
+        { LAUNCH_JOBKEY_RESOURCELIMIT_MEMLOCK,        RLIMIT_MEMLOCK        },
+        { LAUNCH_JOBKEY_RESOURCELIMIT_NOFILE,        RLIMIT_NOFILE        },
+        { LAUNCH_JOBKEY_RESOURCELIMIT_NPROC,        RLIMIT_NPROC        },
+        { LAUNCH_JOBKEY_RESOURCELIMIT_RSS,        RLIMIT_RSS        },
+        { LAUNCH_JOBKEY_RESOURCELIMIT_STACK,        RLIMIT_STACK        },
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> static time_t cronemu(int mon, int mday, int hour, int min);
</span><span class="lines">@@ -716,7 +716,7 @@
</span><span class="cx">         } else if (getpid() == 1) {
</span><span class="cx">                 jobmgr_log(jm, LOG_DEBUG, &quot;About to call: reboot(%s)&quot;, reboot_flags_to_C_names(jm-&gt;reboot_flags));
</span><span class="cx">                 runtime_closelog();
</span><del>-                jobmgr_assumes(jm,  reboot(jm-&gt;reboot_flags) != -1);
</del><ins>+                jobmgr_assumes(jm, reboot(jm-&gt;reboot_flags) != -1);
</ins><span class="cx">                 runtime_closelog();
</span><span class="cx">         } else {
</span><span class="cx">                 runtime_closelog();
</span><span class="lines">@@ -3070,9 +3070,9 @@
</span><span class="cx">         }
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void    
</del><ins>+void
</ins><span class="cx"> semaphoreitem_ignore(job_t j, struct semaphoreitem *si)
</span><del>-{       
</del><ins>+{
</ins><span class="cx">         if (si-&gt;fd != -1) {
</span><span class="cx">                 job_log(j, LOG_DEBUG, &quot;Ignoring Vnode: %d&quot;, si-&gt;fd);
</span><span class="cx">                 job_assumes(j, kevent_mod(si-&gt;fd, EVFILT_VNODE, EV_DELETE, 0, 0, NULL) != -1);
</span><span class="lines">@@ -4336,8 +4336,8 @@
</span><span class="cx">         job_assumes(ms-&gt;job, launchd_mport_notify_req(ms-&gt;port, which) == KERN_SUCCESS);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-#define NELEM(x)                (sizeof(x)/sizeof(x[0]))
-#define END_OF(x)               (&amp;(x)[NELEM(x)])
</del><ins>+#define NELEM(x)        (sizeof(x)/sizeof(x[0]))
+#define END_OF(x)        (&amp;(x)[NELEM(x)])
</ins><span class="cx"> 
</span><span class="cx"> char **
</span><span class="cx"> mach_cmd2argv(const char *string)
</span><span class="lines">@@ -4737,11 +4737,11 @@
</span><span class="cx">                 return true;
</span><span class="cx">         }
</span><span class="cx"> 
</span><del>-        if (mon &lt; wtm-&gt;tm_mon) {
</del><ins>+        if (mon &lt; wtm-&gt;tm_mon) {
</ins><span class="cx">                 return false;
</span><span class="cx">         }
</span><span class="cx"> 
</span><del>-        if (mon &gt; wtm-&gt;tm_mon) {
</del><ins>+        if (mon &gt; wtm-&gt;tm_mon) {
</ins><span class="cx">                 wtm-&gt;tm_mon = mon;
</span><span class="cx">                 wtm-&gt;tm_mday = 1;
</span><span class="cx">                 wtm-&gt;tm_hour = 0;
</span><span class="lines">@@ -4772,11 +4772,11 @@
</span><span class="cx">                 return true;
</span><span class="cx">         }
</span><span class="cx"> 
</span><del>-        if (mday &lt; wtm-&gt;tm_mday) {
</del><ins>+        if (mday &lt; wtm-&gt;tm_mday) {
</ins><span class="cx">                 return false;
</span><span class="cx">         }
</span><span class="cx"> 
</span><del>-        if (mday &gt; wtm-&gt;tm_mday) {
</del><ins>+        if (mday &gt; wtm-&gt;tm_mday) {
</ins><span class="cx">                 wtm-&gt;tm_mday = mday;
</span><span class="cx">                 wtm-&gt;tm_hour = 0;
</span><span class="cx">                 wtm-&gt;tm_min = 0;
</span></span></pre></div>
<a id="trunklaunchdsrclaunchd_runtimec"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/launchd_runtime.c (23377 => 23378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchd_runtime.c        2007-09-13 00:50:24 UTC (rev 23377)
+++ trunk/launchd/src/launchd_runtime.c        2007-09-13 17:16:54 UTC (rev 23378)
</span><span class="lines">@@ -142,7 +142,7 @@
</span><span class="cx">         launchd_assert(pthread_create(&amp;kqueue_demand_thread, &amp;attr, kqueue_demand_loop, NULL) == 0);
</span><span class="cx">         pthread_attr_destroy(&amp;attr);
</span><span class="cx"> 
</span><del>-        pthread_attr_init(&amp;attr);
</del><ins>+        pthread_attr_init(&amp;attr);
</ins><span class="cx">         pthread_attr_setdetachstate(&amp;attr, PTHREAD_CREATE_DETACHED);
</span><span class="cx">         pthread_attr_setstacksize(&amp;attr, PTHREAD_STACK_MIN);
</span><span class="cx">         launchd_assert(pthread_create(&amp;demand_thread, &amp;attr, mport_demand_loop, NULL) == 0);
</span><span class="lines">@@ -1173,7 +1173,7 @@
</span><span class="cx">         char *data_off;
</span><span class="cx">         struct logmsg_s *lm;
</span><span class="cx"> 
</span><del>-#define ROUND_TO_64BIT_WORD_SIZE(x)     ((x + 7) &amp; ~7)
</del><ins>+#define ROUND_TO_64BIT_WORD_SIZE(x)        ((x + 7) &amp; ~7)
</ins><span class="cx"> 
</span><span class="cx">         /* we do this to make the unpacking for the log_drain cause unalignment faults */
</span><span class="cx">         lm_sz = ROUND_TO_64BIT_WORD_SIZE(lm_sz);
</span></span></pre></div>
<a id="trunklaunchdsrclaunchproxyc"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/launchproxy.c (23377 => 23378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchproxy.c        2007-09-13 00:50:24 UTC (rev 23377)
+++ trunk/launchd/src/launchproxy.c        2007-09-13 17:16:54 UTC (rev 23378)
</span><span class="lines">@@ -48,12 +48,12 @@
</span><span class="cx"> 
</span><span class="cx"> static void find_fds(launch_data_t o, const char *key __attribute__((unused)), void *context __attribute__((unused)))
</span><span class="cx"> {
</span><del>-        struct kevent kev;
-        size_t i;
</del><ins>+        struct kevent kev;
+        size_t i;
</ins><span class="cx">         int fd;
</span><span class="cx"> 
</span><del>-        switch (launch_data_get_type(o)) {
-        case LAUNCH_DATA_FD:
</del><ins>+        switch (launch_data_get_type(o)) {
+        case LAUNCH_DATA_FD:
</ins><span class="cx">                 fd = launch_data_get_fd(o);
</span><span class="cx">                 if (-1 == fd)
</span><span class="cx">                         break;
</span><span class="lines">@@ -61,17 +61,17 @@
</span><span class="cx">                 EV_SET(&amp;kev, fd, EVFILT_READ, EV_ADD, 0, 0, NULL);
</span><span class="cx">                 if (kevent(kq, &amp;kev, 1, NULL, 0, NULL) == -1)
</span><span class="cx">                         syslog(LOG_DEBUG, &quot;kevent(%d): %m&quot;, fd);
</span><del>-                break;
-        case LAUNCH_DATA_ARRAY:
-                for (i = 0; i &lt; launch_data_array_get_count(o); i++)
-                        find_fds(launch_data_array_get_index(o, i), NULL, NULL);
-                break;
-        case LAUNCH_DATA_DICTIONARY:
-                launch_data_dict_iterate(o, find_fds, NULL);
-                break;
-        default:
-                break;
-        }
</del><ins>+                break;
+        case LAUNCH_DATA_ARRAY:
+                for (i = 0; i &lt; launch_data_array_get_count(o); i++)
+                        find_fds(launch_data_array_get_index(o, i), NULL, NULL);
+                break;
+        case LAUNCH_DATA_DICTIONARY:
+                launch_data_dict_iterate(o, find_fds, NULL);
+                break;
+        default:
+                break;
+        }
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> int main(int argc __attribute__((unused)), char *argv[])
</span></span></pre></div>
<a id="trunklaunchdsrcliblaunchc"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/liblaunch.c (23377 => 23378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/liblaunch.c        2007-09-13 00:50:24 UTC (rev 23377)
+++ trunk/launchd/src/liblaunch.c        2007-09-13 17:16:54 UTC (rev 23378)
</span><span class="lines">@@ -372,7 +372,7 @@
</span><span class="cx"> launch_data_array_pop_first(launch_data_t where)
</span><span class="cx"> {
</span><span class="cx">         launch_data_t r = NULL;
</span><del>-       
</del><ins>+
</ins><span class="cx">         if (where-&gt;_array_cnt &gt; 0) {
</span><span class="cx">                 r = where-&gt;_array[0];
</span><span class="cx">                 memmove(where-&gt;_array, where-&gt;_array + 1, (where-&gt;_array_cnt - 1) * sizeof(launch_data_t));
</span><span class="lines">@@ -525,23 +525,23 @@
</span><span class="cx"> launch_t
</span><span class="cx"> launchd_fdopen(int fd)
</span><span class="cx"> {
</span><del>-        launch_t c;
</del><ins>+        launch_t c;
</ins><span class="cx"> 
</span><del>-        c = calloc(1, sizeof(struct _launch));
</del><ins>+        c = calloc(1, sizeof(struct _launch));
</ins><span class="cx">         if (!c)
</span><span class="cx">                 return NULL;
</span><span class="cx"> 
</span><del>-        c-&gt;fd = fd;
</del><ins>+        c-&gt;fd = fd;
</ins><span class="cx"> 
</span><span class="cx">         fcntl(fd, F_SETFL, O_NONBLOCK);
</span><span class="cx"> 
</span><del>-        if ((c-&gt;sendbuf = malloc(0)) == NULL)
</del><ins>+        if ((c-&gt;sendbuf = malloc(0)) == NULL)
</ins><span class="cx">                 goto out_bad;
</span><del>-        if ((c-&gt;sendfds = malloc(0)) == NULL)
</del><ins>+        if ((c-&gt;sendfds = malloc(0)) == NULL)
</ins><span class="cx">                 goto out_bad;
</span><del>-        if ((c-&gt;recvbuf = malloc(0)) == NULL)
</del><ins>+        if ((c-&gt;recvbuf = malloc(0)) == NULL)
</ins><span class="cx">                 goto out_bad;
</span><del>-        if ((c-&gt;recvfds = malloc(0)) == NULL)
</del><ins>+        if ((c-&gt;recvfds = malloc(0)) == NULL)
</ins><span class="cx">                 goto out_bad;
</span><span class="cx"> 
</span><span class="cx">         return c;
</span><span class="lines">@@ -770,10 +770,10 @@
</span><span class="cx">                 iov[0].iov_base = &amp;lmh;
</span><span class="cx">                 iov[0].iov_len = sizeof(lmh);
</span><span class="cx">                 mh.msg_iov = iov;
</span><del>-                mh.msg_iovlen = 2;
</del><ins>+                mh.msg_iovlen = 2;
</ins><span class="cx">         } else {
</span><span class="cx">                 mh.msg_iov = iov + 1;
</span><del>-                mh.msg_iovlen = 1;
</del><ins>+                mh.msg_iovlen = 1;
</ins><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         iov[1].iov_base = lh-&gt;sendbuf;
</span><span class="lines">@@ -916,7 +916,7 @@
</span><span class="cx">                                 goto out;
</span><span class="cx">                 } while (launchd_msg_send(_lc-&gt;l, NULL) == -1);
</span><span class="cx">         }
</span><del>-       
</del><ins>+
</ins><span class="cx">         while (resp == NULL) {
</span><span class="cx">                 if (d == NULL &amp;&amp; launch_data_array_get_count(_lc-&gt;async_resp) &gt; 0) {
</span><span class="cx">                         resp = launch_data_array_pop_first(_lc-&gt;async_resp);
</span><span class="lines">@@ -950,13 +950,13 @@
</span><span class="cx">         struct cmsghdr *cm = alloca(4096); 
</span><span class="cx">         launch_data_t rmsg = NULL;
</span><span class="cx">         size_t data_offset, fd_offset;
</span><del>-        struct msghdr mh;
-        struct iovec iov;
</del><ins>+        struct msghdr mh;
+        struct iovec iov;
</ins><span class="cx">         int r;
</span><span class="cx"> 
</span><del>-        memset(&amp;mh, 0, sizeof(mh));
-        mh.msg_iov = &amp;iov;
-        mh.msg_iovlen = 1;
</del><ins>+        memset(&amp;mh, 0, sizeof(mh));
+        mh.msg_iov = &amp;iov;
+        mh.msg_iovlen = 1;
</ins><span class="cx"> 
</span><span class="cx">         lh-&gt;recvbuf = reallocf(lh-&gt;recvbuf, lh-&gt;recvlen + 8*1024);
</span><span class="cx"> 
</span><span class="lines">@@ -1099,7 +1099,7 @@
</span><span class="cx">         launch_data_t r = launch_data_alloc(LAUNCH_DATA_ERRNO);
</span><span class="cx"> 
</span><span class="cx">         if (r)
</span><del>-               launch_data_set_errno(r, e);
</del><ins>+                launch_data_set_errno(r, e);
</ins><span class="cx"> 
</span><span class="cx">         return r;
</span><span class="cx"> }
</span><span class="lines">@@ -1109,7 +1109,7 @@
</span><span class="cx">         launch_data_t r = launch_data_alloc(LAUNCH_DATA_FD);
</span><span class="cx"> 
</span><span class="cx">         if (r)
</span><del>-               launch_data_set_fd(r, fd);
</del><ins>+                launch_data_set_fd(r, fd);
</ins><span class="cx"> 
</span><span class="cx">         return r;
</span><span class="cx"> }
</span><span class="lines">@@ -1119,7 +1119,7 @@
</span><span class="cx">         launch_data_t r = launch_data_alloc(LAUNCH_DATA_MACHPORT);
</span><span class="cx"> 
</span><span class="cx">         if (r)
</span><del>-               launch_data_set_machport(r, p);
</del><ins>+                launch_data_set_machport(r, p);
</ins><span class="cx"> 
</span><span class="cx">         return r;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>

</body>
</html>