Changeset 23378

Timestamp:

09/13/07 10:16:54 (15 months ago)

Author:

zarzycki@…

Message:

White space clean up.

Location:

trunk/launchd/src

Files:

• launchctl.c (modified) (5 diffs)
• launchd.c (modified) (1 diff)
• launchd_core_logic.c (modified) (8 diffs)
• launchd_runtime.c (modified) (2 diffs)
• launchproxy.c (modified) (2 diffs)
• liblaunch.c (modified) (8 diffs)

trunk/launchd/src/launchctl.c

@@ -82 +82 @@
 #define MACHINIT_JOBKEY_SERVICEPORT     "ServicePort"
 
-#define assumes(e)      \
-                (__builtin_expect(!(e), 0) ? _log_launchctl_bug(__rcs_file_version__, __FILE__, __LINE__, #e), false : true)
+#define assumes(e)      \
+        (__builtin_expect(!(e), 0) ? _log_launchctl_bug(__rcs_file_version__, __FILE__, __LINE__, #e), false : true)
 
 
@@ -739 +739 @@
 
         if (!(S_ISREG(sb.st_mode) || S_ISDIR(sb.st_mode))) {
-                fprintf(stderr, "%s: Dubious path. Not a regular file or directory (skipping):  %s\n", getprogname(), path);
+                fprintf(stderr, "%s: Dubious path. Not a regular file or directory (skipping): %s\n", getprogname(), path);
                 return false;
         }
@@ -895 +895 @@
                 }
 
-                if (passive) {                  
+                if (passive) {
                         if (unlink(sun.sun_path) == -1 && errno != ENOENT) {
-                                close(sfd);     
+                                close(sfd);
                                 return;
                         }
@@ -1622 +1622 @@
 load_and_unload_cmd(int argc, char *const argv[])
 {
-        NSSearchPathEnumerationState es = 0;
+        NSSearchPathEnumerationState es = 0;
         char nspath[PATH_MAX * 2]; /* safe side, we need to append */
         bool badopts = false;
@@ -2596 +2596 @@
 {
         bool has_servicename = launch_data_dict_lookup(obj, MACHINIT_JOBKEY_SERVICENAME);
-        bool has_command  = launch_data_dict_lookup(obj, MACHINIT_JOBKEY_COMMAND);
+        bool has_command = launch_data_dict_lookup(obj, MACHINIT_JOBKEY_COMMAND);
         bool has_label = launch_data_dict_lookup(obj, LAUNCH_JOBKEY_LABEL);
 

trunk/launchd/src/launchd.c

@@ -116 +116 @@
         while ((ch = getopt(argc, argv, "s")) != -1) {
                 switch (ch) {
-                case 's': sflag = true;   break;        /* single user */
+                case 's': sflag = true; break;  /* single user */
                 case '?': /* we should do something with the global optopt variable here */
                 default:

trunk/launchd/src/launchd_core_logic.c

@@ -274 +274 @@
 };
 
-#define jobmgr_assumes(jm, e)      \
-                        (__builtin_expect(!(e), 0) ? jobmgr_log_bug(jm, __rcs_file_version__, __FILE__, __LINE__, #e), false : true)
+#define jobmgr_assumes(jm, e)   \
+        (__builtin_expect(!(e), 0) ? jobmgr_log_bug(jm, __rcs_file_version__, __FILE__, __LINE__, #e), false : true)
 
 static jobmgr_t jobmgr_new(jobmgr_t jm, mach_port_t requestorport, mach_port_t transfer_port, bool sflag, const char *name);
@@ -370 +370 @@
 
 
-#define job_assumes(j, e)      \
-                        (__builtin_expect(!(e), 0) ? job_log_bug(j, __rcs_file_version__, __FILE__, __LINE__, #e), false : true)
+#define job_assumes(j, e)       \
+        (__builtin_expect(!(e), 0) ? job_log_bug(j, __rcs_file_version__, __FILE__, __LINE__, #e), false : true)
 
 static void job_import_keys(launch_data_t obj, const char *key, void *context);
@@ -422 +422 @@
         int val;
 } launchd_keys2limits[] = {
-        { 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   },
+        { 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    },
 };
 
@@ -717 +717 @@
                 jobmgr_log(jm, LOG_DEBUG, "About to call: reboot(%s)", reboot_flags_to_C_names(jm->reboot_flags));
                 runtime_closelog();
-                jobmgr_assumes(jm,  reboot(jm->reboot_flags) != -1);
+                jobmgr_assumes(jm, reboot(jm->reboot_flags) != -1);
                 runtime_closelog();
         } else {
@@ -3071 +3071 @@
 }
 
-void    
+void
 semaphoreitem_ignore(job_t j, struct semaphoreitem *si)
-{       
+{
         if (si->fd != -1) {
                 job_log(j, LOG_DEBUG, "Ignoring Vnode: %d", si->fd);
@@ -4337 +4337 @@
 }
 
-#define NELEM(x)                (sizeof(x)/sizeof(x[0]))
-#define END_OF(x)               (&(x)[NELEM(x)])
+#define NELEM(x)        (sizeof(x)/sizeof(x[0]))
+#define END_OF(x)       (&(x)[NELEM(x)])
 
 char **
@@ -4738 +4738 @@
         }
 
-        if (mon < wtm->tm_mon) {
+        if (mon < wtm->tm_mon) {
                 return false;
         }
 
-        if (mon > wtm->tm_mon) {
+        if (mon > wtm->tm_mon) {
                 wtm->tm_mon = mon;
                 wtm->tm_mday = 1;
@@ -4773 +4773 @@
         }
 
-        if (mday < wtm->tm_mday) {
+        if (mday < wtm->tm_mday) {
                 return false;
         }
 
-        if (mday > wtm->tm_mday) {
+        if (mday > wtm->tm_mday) {
                 wtm->tm_mday = mday;
                 wtm->tm_hour = 0;

trunk/launchd/src/launchd_runtime.c

@@ -143 +143 @@
         pthread_attr_destroy(&attr);
 
-        pthread_attr_init(&attr);
+        pthread_attr_init(&attr);
         pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
         pthread_attr_setstacksize(&attr, PTHREAD_STACK_MIN);
@@ -1174 +1174 @@
         struct logmsg_s *lm;
 
-#define ROUND_TO_64BIT_WORD_SIZE(x)     ((x + 7) & ~7)
+#define ROUND_TO_64BIT_WORD_SIZE(x)     ((x + 7) & ~7)
 
         /* we do this to make the unpacking for the log_drain cause unalignment faults */

trunk/launchd/src/launchproxy.c

@@ -49 +49 @@
 static void find_fds(launch_data_t o, const char *key __attribute__((unused)), void *context __attribute__((unused)))
 {
-        struct kevent kev;
-        size_t i;
+        struct kevent kev;
+        size_t i;
         int fd;
 
-        switch (launch_data_get_type(o)) {
-        case LAUNCH_DATA_FD:
+        switch (launch_data_get_type(o)) {
+        case LAUNCH_DATA_FD:
                 fd = launch_data_get_fd(o);
                 if (-1 == fd)
@@ -62 +62 @@
                 if (kevent(kq, &kev, 1, NULL, 0, NULL) == -1)
                         syslog(LOG_DEBUG, "kevent(%d): %m", fd);
-                break;
-        case LAUNCH_DATA_ARRAY:
-                for (i = 0; i < 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;
-        }
+                break;
+        case LAUNCH_DATA_ARRAY:
+                for (i = 0; i < 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;
+        }
 }
 

trunk/launchd/src/liblaunch.c

@@ -373 +373 @@
 {
         launch_data_t r = NULL;
-       
+
         if (where->_array_cnt > 0) {
                 r = where->_array[0];
@@ -526 +526 @@
 launchd_fdopen(int fd)
 {
-        launch_t c;
-
-        c = calloc(1, sizeof(struct _launch));
+        launch_t c;
+
+        c = calloc(1, sizeof(struct _launch));
         if (!c)
                 return NULL;
 
-        c->fd = fd;
+        c->fd = fd;
 
         fcntl(fd, F_SETFL, O_NONBLOCK);
 
-        if ((c->sendbuf = malloc(0)) == NULL)
+        if ((c->sendbuf = malloc(0)) == NULL)
                 goto out_bad;
-        if ((c->sendfds = malloc(0)) == NULL)
+        if ((c->sendfds = malloc(0)) == NULL)
                 goto out_bad;
-        if ((c->recvbuf = malloc(0)) == NULL)
+        if ((c->recvbuf = malloc(0)) == NULL)
                 goto out_bad;
-        if ((c->recvfds = malloc(0)) == NULL)
+        if ((c->recvfds = malloc(0)) == NULL)
                 goto out_bad;
 
@@ -771 +771 @@
                 iov[0].iov_len = sizeof(lmh);
                 mh.msg_iov = iov;
-                mh.msg_iovlen = 2;
+                mh.msg_iovlen = 2;
         } else {
                 mh.msg_iov = iov + 1;
-                mh.msg_iovlen = 1;
+                mh.msg_iovlen = 1;
         }
 
@@ -917 +917 @@
                 } while (launchd_msg_send(_lc->l, NULL) == -1);
         }
-       
+
         while (resp == NULL) {
                 if (d == NULL && launch_data_array_get_count(_lc->async_resp) > 0) {
@@ -951 +951 @@
         launch_data_t rmsg = NULL;
         size_t data_offset, fd_offset;
-        struct msghdr mh;
-        struct iovec iov;
+        struct msghdr mh;
+        struct iovec iov;
         int r;
 
-        memset(&mh, 0, sizeof(mh));
-        mh.msg_iov = &iov;
-        mh.msg_iovlen = 1;
+        memset(&mh, 0, sizeof(mh));
+        mh.msg_iov = &iov;
+        mh.msg_iovlen = 1;
 
         lh->recvbuf = reallocf(lh->recvbuf, lh->recvlen + 8*1024);
@@ -1100 +1100 @@
 
         if (r)
-               launch_data_set_errno(r, e);
+                launch_data_set_errno(r, e);
 
         return r;
@@ -1110 +1110 @@
 
         if (r)
-               launch_data_set_fd(r, fd);
+                launch_data_set_fd(r, fd);
 
         return r;
@@ -1120 +1120 @@
 
         if (r)
-               launch_data_set_machport(r, p);
+                launch_data_set_machport(r, p);
 
         return r;