Changeset 102f641 in mainline for uspace/srv/sysman/units

Timestamp:

2019-09-02T19:01:50Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

25697163

Parents:

241f1985

Message:

Correcting syntax according to ccheck

Location:

uspace/srv/sysman/units

Files:

• unit_cfg.c (modified) (4 diffs)
• unit_mnt.c (modified) (5 diffs)
• unit_mnt.h (modified) (2 diffs)
• unit_svc.c (modified) (6 diffs)
• unit_svc.h (modified) (1 diff)
• unit_tgt.c (modified) (1 diff)

uspace/srv/sysman/units/unit_cfg.c

@@ -46 +46 @@
 
 static config_item_t unit_configuration[] = {
-        {"Path", &config_parse_string, offsetof(unit_cfg_t, path), NULL},
+        { "Path", &config_parse_string, offsetof(unit_cfg_t, path), NULL },
         CONFIGURATION_ITEM_SENTINEL
 };
@@ -81 +81 @@
                 goto finish;
         }
-        
+
         /* We parse files as part of ongoing repo transaction (locked). */
         unit_t *u = repo_find_unit_by_name_unsafe(unit_name);
@@ -231 +231 @@
 
         errno_t rc = cfg_load_configuration(u_cfg->path);
-        
+
         if (rc == EOK) {
                 unit->state = STATE_STARTED;
@@ -267 +267 @@
 }
 
-DEFINE_UNIT_VMT(unit_cfg)
-
+DEFINE_UNIT_VMT(unit_cfg);

uspace/srv/sysman/units/unit_mnt.c

@@ -41 +41 @@
 
 static config_item_t unit_configuration[] = {
-        {"What",      &config_parse_string, offsetof(unit_mnt_t, device),     NULL},
-        {"Where",     &config_parse_string, offsetof(unit_mnt_t, mountpoint), NULL},
-        {"Type",      &config_parse_string, offsetof(unit_mnt_t, type),       NULL},
-        {"Autostart", &config_parse_bool,   offsetof(unit_mnt_t, autostart),  "true"},
-        {"Blocking",  &config_parse_bool,   offsetof(unit_mnt_t, blocking),   "true"},
+        { "What",      &config_parse_string, offsetof(unit_mnt_t, device),     NULL },
+        { "Where",     &config_parse_string, offsetof(unit_mnt_t, mountpoint), NULL },
+        { "Type",      &config_parse_string, offsetof(unit_mnt_t, type),       NULL },
+        { "Autostart", &config_parse_bool,   offsetof(unit_mnt_t, autostart),  "true" },
+        { "Blocking",  &config_parse_bool,   offsetof(unit_mnt_t, blocking),   "true" },
         CONFIGURATION_ITEM_SENTINEL
 };
@@ -195 +195 @@
         assert(!u_mnt->autostart || u_mnt->blocking);
 
-        
         assert(unit->state == STATE_STOPPED);
 
@@ -203 +202 @@
         mnt_data.mountpoint = u_mnt->mountpoint;
         mnt_data.device     = u_mnt->device;
-        /* TODO use other mount parameters
+        /*
+         * TODO use other mount parameters
          * mnt_data.options    = u_mnt->options;
          * mnt_data.instance   = u_mnt->instance;
@@ -235 +235 @@
         assert(!u_mnt->autostart || u_mnt->blocking);
 
-        
         // note: we should never hit STATE_STARTING, since it'd mean there are
         //       two jobs running at once (unless job cancellation is implemented)
@@ -284 +283 @@
 }
 
-
-DEFINE_UNIT_VMT(unit_mnt)
-
+DEFINE_UNIT_VMT(unit_mnt);

uspace/srv/sysman/units/unit_mnt.h

@@ -39 +39 @@
         char *device;
 
-        /** Should be underlying units (FS server, device) be autostarted
-         * (implies blocking) */
+        /**
+         * Should be underlying units (FS server, device) be autostarted
+         * (implies blocking)
+         */
         bool autostart;
 
@@ -50 +52 @@
 
 #endif
-

uspace/srv/sysman/units/unit_svc.c

@@ -40 +40 @@
 
 static config_item_t unit_configuration[] = {
-        {"ExecStart", &util_parse_command, offsetof(unit_svc_t, exec_start), NULL},
+        { "ExecStart", &util_parse_command, offsetof(unit_svc_t, exec_start), NULL },
         CONFIGURATION_ITEM_SENTINEL
 };
@@ -82 +82 @@
         assert(u_svc);
 
-        
         assert(unit->state == STATE_STOPPED);
 
@@ -117 +116 @@
         assert(u_svc);
 
-        
         // note: May change when job cancellation is possible.
         assert(unit->state == STATE_STARTED);
@@ -133 +131 @@
 
         if (rc != EOK) {
-                /* Task may still be running, but be conservative about unit's
-                 * state. */
+                /*
+                 * Task may still be running, but be conservative about unit's
+                 * state.
+                 */
                 unit->state = STATE_FAILED;
                 return rc;
@@ -144 +144 @@
 }
 
-
 static void unit_svc_exposee_created(unit_t *unit)
 {
         assert(CAST_SVC(unit));
-        assert(unit->state == STATE_STOPPED || unit->state == STATE_STARTING || unit->state==STATE_STARTED);
+        assert(unit->state == STATE_STOPPED || unit->state == STATE_STARTING || unit->state == STATE_STARTED);
 
         /* Exposee itself doesn't represent started unit. */
@@ -160 +159 @@
 }
 
-DEFINE_UNIT_VMT(unit_svc)
-
+DEFINE_UNIT_VMT(unit_svc);

uspace/srv/sysman/units/unit_svc.h

@@ -51 +51 @@
 
 #endif
-

uspace/srv/sysman/units/unit_tgt.c

@@ -82 +82 @@
 }
 
-
-DEFINE_UNIT_VMT(unit_tgt)
-
+DEFINE_UNIT_VMT(unit_tgt);