chiark / gitweb /
manager: fix the build
authorLennart Poettering <lennart@poettering.net>
Thu, 13 Sep 2012 17:29:46 +0000 (19:29 +0200)
committerLennart Poettering <lennart@poettering.net>
Thu, 13 Sep 2012 17:29:46 +0000 (19:29 +0200)
src/core/manager.c
src/core/path.c

index 23d8ca3..b0357b7 100644 (file)
@@ -2013,7 +2013,7 @@ bool manager_unit_pending_inactive(Manager *m, const char *name) {
 }
 
 void manager_check_finished(Manager *m) {
-        char firmware[FORMAT_TIMESPAN_MAX], loader[FORMAT_TIMESPAN_MAX], userspace[FORMAT_TIMESPAN_MAX], initrd[FORMAT_TIMESPAN_MAX], kernel[FORMAT_TIMESPAN_MAX], sum[FORMAT_TIMESPAN_MAX];
+        char userspace[FORMAT_TIMESPAN_MAX], initrd[FORMAT_TIMESPAN_MAX], kernel[FORMAT_TIMESPAN_MAX], sum[FORMAT_TIMESPAN_MAX];
         usec_t firmware_usec, loader_usec, kernel_usec, initrd_usec, userspace_usec, total_usec;
 
         assert(m);
@@ -2039,10 +2039,10 @@ void manager_check_finished(Manager *m) {
                  * m->loader_usec.monotonic should be considered
                  * negative values. */
 
-                firmware_usec = m->firmware_usec.monotonic - m->loader_timestamp.monotonic;
-                loader_usec = m->loader_usec.monotonic - m->kernel_usec.monotonic;
+                firmware_usec = m->firmware_timestamp.monotonic - m->loader_timestamp.monotonic;
+                loader_usec = m->loader_timestamp.monotonic - m->kernel_timestamp.monotonic;
                 userspace_usec = m->finish_timestamp.monotonic - m->userspace_timestamp.monotonic;
-                total_usec = m->firmware_usec.monotonic + m->finish_timestamp.monotonic;
+                total_usec = m->firmware_timestamp.monotonic + m->finish_timestamp.monotonic;
 
                 if (dual_timestamp_is_set(&m->initrd_timestamp)) {
 
index 42dd5da..e3defeb 100644 (file)
@@ -73,14 +73,16 @@ int path_spec_watch(PathSpec *s, Unit *u) {
                 goto fail;
         }
 
-        if ((s->primary_wd = inotify_add_watch(s->inotify_fd, k, flags_table[s->type])) >= 0)
+        s->primary_wd = inotify_add_watch(s->inotify_fd, k, flags_table[s->type]);
+        if (s->primary_wd >= 0)
                 exists = true;
 
         do {
                 int flags;
 
                 /* This assumes the path was passed through path_kill_slashes()! */
-                if (!(slash = strrchr(k, '/')))
+                slash = strrchr(k, '/');
+                if (!slash)
                         break;
 
                 /* Trim the path at the last slash. Keep the slash if it's the root dir. */