Changeset 102f641 in mainline for uspace/srv

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

Files:

• devman/drv_conn.c (modified) (1 diff)
• hid/compositor/compositor.c (modified) (2 diffs)
• loader/main.c (modified) (3 diffs)
• locsrv/locsrv.c (modified) (4 diffs)
• net/loopip/loopip.c (modified) (1 diff)
• ns/ns.c (modified) (2 diffs)
• sysman/connection_broker.c (modified) (3 diffs)
• sysman/connection_ctl.c (modified) (10 diffs)
• sysman/edge.c (modified) (1 diff)
• sysman/edge.h (modified) (1 diff)
• sysman/job.c (modified) (2 diffs)
• sysman/job.h (modified) (1 diff)
• sysman/job_closure.c (modified) (8 diffs)
• sysman/job_queue.c (modified) (3 diffs)
• sysman/log.c (modified) (2 diffs)
• sysman/main.c (modified) (4 diffs)
• sysman/repo.c (modified) (3 diffs)
• sysman/repo.h (modified) (1 diff)
• sysman/sm_task.c (modified) (4 diffs)
• sysman/sysman.c (modified) (4 diffs)
• sysman/sysman.h (modified) (1 diff)
• sysman/test/job_closure.c (modified) (7 diffs)
• sysman/test/job_queue.c (modified) (10 diffs)
• sysman/test/main.c (modified) (1 diff)
• sysman/test/mock_unit.c (modified) (1 diff)
• sysman/unit.c (modified) (4 diffs)
• sysman/unit.h (modified) (1 diff)
• sysman/units/unit_cfg.c (modified) (4 diffs)
• sysman/units/unit_mnt.c (modified) (5 diffs)
• sysman/units/unit_mnt.h (modified) (2 diffs)
• sysman/units/unit_svc.c (modified) (6 diffs)
• sysman/units/unit_svc.h (modified) (1 diff)
• sysman/units/unit_tgt.c (modified) (1 diff)
• sysman/util.c (modified) (2 diffs)
• taskman/event.c (modified) (8 diffs)
• taskman/main.c (modified) (7 diffs)
• taskman/task.c (modified) (8 diffs)
• taskman/task.h (modified) (2 diffs)
• vfs/vfs.c (modified) (1 diff)
• vfs/vfs_register.c (modified) (1 diff)

uspace/srv/devman/drv_conn.c

@@ -115 +115 @@
         sysman_main_exposee_added(unit_name, call->task_id);
         free(unit_name);
-        
+
         switch (driver->state) {
         case DRIVER_NOT_STARTED:

uspace/srv/hid/compositor/compositor.c

@@ -2305 +2305 @@
         /* Finally, register compositor server. */
         async_set_fallback_port_handler(client_connection, NULL);
-        
+
         rc = loc_server_register(NAME);
         if (rc != EOK) {
@@ -2311 +2311 @@
                 return rc;
         }
-        
+
         server_name = name;
-        
+
         /* Prepare window registrator (entrypoint for clients). */
         char winreg[LOC_NAME_MAXLEN + 1];

uspace/srv/loader/main.c

@@ -43 +43 @@
  * and completely hidden from applications.
  */
-
 
 #include <stdio.h>
@@ -443 +442 @@
         /* Set a handler of incomming connections. */
         async_set_fallback_port_handler(ldr_connection, NULL);
-        
+
         /* Announce to taskman. */
         errno_t rc = taskman_intro_loader();
@@ -457 +456 @@
          */
         async_manager();
-        
+
         /* Never reached */
         return 0;

uspace/srv/locsrv/locsrv.c

@@ -608 +608 @@
 
         list_append(&service->server_services, &service->server->services);
-        
+
         fibril_mutex_unlock(&service->server->services_mutex);
         fibril_condvar_broadcast(&services_list_cv);
@@ -841 +841 @@
         int flags = ipc_get_arg1(icall);
         bool start_requested = false;
-        
+
 recheck:
 
@@ -853 +853 @@
          */
         if (svc == NULL) {
-                /* TODO:
+                /*
+                 * TODO:
                  * Consider non-blocking service start, return some dummy id
                  * and block only after connection request (actually makes more
@@ -892 +893 @@
                 async_answer_0(icall, rc);
         }
-        
+
         fibril_mutex_unlock(&services_list_mutex);
         free(ns_name);

uspace/srv/net/loopip/loopip.c

@@ -116 +116 @@
 
         prodcons_initialize(&loopip_rcv_queue);
-        
+
         const char *svc_name = SERVICE_NAME_LOOPBACK;
         service_id_t sid;

uspace/srv/ns/ns.c

@@ -118 +118 @@
         if (rc != EOK)
                 return rc;
-        
+
         rc = taskman_intro_ns_noasync();
         if (rc != EOK) {
@@ -125 +125 @@
         }
         task_retval_noasync(0);
-        
+
         async_set_fallback_port_handler(ns_connection, NULL);
 
         printf("%s: Accepting connections\n", NAME);
-        
+
         async_manager();
 

uspace/srv/sysman/connection_broker.c

@@ -96 +96 @@
         }
 
-
         retval = ENOTSUP;
 
@@ -119 +118 @@
         while (true) {
                 ipc_call_t call;
-                
+
                 if (!async_get_call(&call) || !ipc_get_imethod(&call)) {
                         /* Client disconnected */
@@ -146 +145 @@
         }
 }
-
-

uspace/srv/sysman/connection_ctl.c

@@ -41 +41 @@
 #include "sysman.h"
 
-
 // TODO possibly provide as type-safe function + macro in sysman.h for generic boxing
 static ipc_call_t *box_callid(ipc_call_t *icall)
@@ -215 +214 @@
         size_t act_size;
         int rc;
-        
+
         if (!async_data_read_receive(&call, &size)) {
                 async_answer_0(&call, EREFUSED);
@@ -221 +220 @@
                 return;
         }
-        
-        
+
         unit_handle_t *handles = malloc(size);
         if (handles == NULL && size > 0) {
@@ -229 +227 @@
                 return;
         }
-        
-        
+
         rc = fill_handles_buffer(handles, size, &act_size);
         if (rc != EOK) {
@@ -237 +234 @@
                 return;
         }
-        
+
         size_t real_size = min(act_size, size);
         sysarg_t retval = async_data_read_finalize(&call, handles, real_size);
         free(handles);
-        
+
         async_answer_1(icall, retval, act_size);
 }
@@ -249 +246 @@
         ipc_call_t call;
         size_t size;
-        
+
         if (!async_data_read_receive(&call, &size)) {
                 async_answer_0(&call, EREFUSED);
@@ -255 +252 @@
                 return;
         }
-        
+
         unit_t *u = repo_find_unit_by_handle(ipc_get_arg1(icall));
         if (u == NULL) {
@@ -262 +259 @@
                 return;
         }
-        
+
         size_t real_size = min(str_size(u->name) + 1, size);
         sysarg_t retval = async_data_read_finalize(&call, u->name, real_size);
-        
+
         async_answer_0(icall, retval);
 }
@@ -303 +300 @@
         while (true) {
                 ipc_call_t call;
-                
+
                 if (!async_get_call(&call) || !ipc_get_imethod(&call)) {
                         /* Client disconnected */
@@ -339 +336 @@
         }
 }
-

uspace/srv/sysman/edge.c

@@ -118 +118 @@
 }
 
-
 /**
  * @return        EOK on success

uspace/srv/sysman/edge.h

@@ -71 +71 @@
 extern void edge_remove(unit_edge_t **);
 
-
 #endif
-
-

uspace/srv/sysman/job.c

@@ -39 +39 @@
 #include "sysman.h"
 
-
 /*
  * Static functions
  */
-
 
 /** Remove blocking_job from blocked job structure
@@ -273 +271 @@
         sysman_raise_event(&sysman_event_job_finished, job);
 }
-

uspace/srv/sysman/job.h

@@ -65 +65 @@
         /** Jobs that this job is preventing from running */
         dyn_array_t blocked_jobs;
-        /** No. of jobs that the job is actually blocking (may differ from size
-         * of blocked_jobs for not fully merged job */
+        /**
+         * No. of jobs that the job is actually blocking (may differ from size
+         * of blocked_jobs for not fully merged job
+         */
         size_t blocked_jobs_count;
         /** No. of jobs that must finish before this job */

uspace/srv/sysman/job_closure.c

@@ -37 +37 @@
 #include "log.h"
 
-
 /** Struct describes how to traverse units graph */
 struct bfs_ops;
@@ -52 +51 @@
          * return result of visit (error stops further traversal)
          */
-        int (* visit)(unit_t *, unit_edge_t *, bfs_ops_t *, void *);
+        int (*visit)(unit_t *, unit_edge_t *, bfs_ops_t *, void *);
 
         /** Clean units remaining in BFS queue after error */
-        void (* clean)(unit_t *, bfs_ops_t *, void *);
+        void (*clean)(unit_t *, bfs_ops_t *, void *);
 };
 
@@ -65 +64 @@
 {
         assert(blocking_job->blocked_jobs.size ==
-            blocking_job->blocked_jobs_count);
+            blocking_job->blocked_jobs_count);
 
         int rc = dyn_array_append(&blocking_job->blocked_jobs, job_t *,
@@ -203 +202 @@
         unit->bfs_tag = true;
         list_append(&unit->bfs_link, &units_fifo);
-        
+
         while (!list_empty(&units_fifo)) {
                 unit = list_get_instance(list_first(&units_fifo), unit_t,
@@ -209 +208 @@
                 list_remove(&unit->bfs_link);
 
-
-                if (ops->direction == BFS_FORWARD)
-                    list_foreach(unit->edges_out, edges_out, unit_edge_t, e) {
-                        unit_t *u = e->output;
-                        if (!u->bfs_tag) {
-                                u->bfs_tag = true;
-                                list_append(&u->bfs_link, &units_fifo);
+                if (ops->direction == BFS_FORWARD) {
+                        list_foreach(unit->edges_out, edges_out, unit_edge_t, e) {
+                                unit_t *u = e->output;
+                                if (!u->bfs_tag) {
+                                        u->bfs_tag = true;
+                                        list_append(&u->bfs_link, &units_fifo);
+                                }
+                                rc = ops->visit(u, e, ops, arg);
+                                if (rc != EOK) {
+                                        goto finish;
+                                }
                         }
-                        rc = ops->visit(u, e, ops, arg);
-                        if (rc != EOK) {
-                                goto finish;
-                        }
-                } else
-                    list_foreach(unit->edges_in, edges_in, unit_edge_t, e) {
-                        unit_t *u = e->input;
-                        if (!u->bfs_tag) {
-                                u->bfs_tag = true;
-                                list_append(&u->bfs_link, &units_fifo);
-                        }
-                        rc = ops->visit(u, e, ops, arg);
-                        if (rc != EOK) {
-                                goto finish;
+                } else {
+                        list_foreach(unit->edges_in, edges_in, unit_edge_t, e) {
+                                unit_t *u = e->input;
+                                if (!u->bfs_tag) {
+                                        u->bfs_tag = true;
+                                        list_append(&u->bfs_link, &units_fifo);
+                                }
+                                rc = ops->visit(u, e, ops, arg);
+                                if (rc != EOK) {
+                                        goto finish;
+                                }
                         }
                 }
@@ -243 +243 @@
                 list_remove(cur_link);
         }
-        
+
         return rc;
 }
@@ -349 +349 @@
         }
 
-        
         /* Clean after ourselves (BFS tag jobs) */
         dyn_array_foreach(*job_closure, job_t *, job_it) {
@@ -360 +359 @@
         return rc;
 }
-

uspace/srv/sysman/job_queue.c

@@ -230 +230 @@
         }
 
-        /* Unmerged jobs are enqueued, merged are disposed
+        /*
+         * Unmerged jobs are enqueued, merged are disposed
          *
          * TODO Ensure that jobs that block merged jobs contain the corrent job
@@ -242 +243 @@
                 }
 
-
                 unit_t *u = job->unit;
                 assert(u->job == NULL);
@@ -274 +274 @@
         }
 }
-
-

uspace/srv/sysman/log.c

@@ -39 +39 @@
 static log_level_t max_level = LVL_NOTE;
 
-extern void sysman_log_init(log_level_t level)
+void sysman_log_init(log_level_t level)
 {
         max_level = level;
@@ -51 +51 @@
         va_list args;
         va_start(args, fmt);
-        
+
         vprintf(fmt, args);
         printf("\n");

uspace/srv/sysman/main.c

@@ -83 +83 @@
 
 /** Build hard coded configuration */
-static errno_t create_entry_configuration(void) {
+static errno_t create_entry_configuration(void)
+{
         errno_t rc;
         unit_t *mnt_initrd = NULL;
@@ -108 +109 @@
         cfg_init->name           = str_dup(UNIT_CFG_INITRD);
         CAST_CFG(cfg_init)->path = str_dup(INITRD_CFG_PATH);
-        
+
         tgt_init = unit_create(UNIT_TARGET);
         if (tgt_init == NULL) {
@@ -115 +116 @@
         }
         tgt_init->name = str_dup(TARGET_INIT);
-        
 
         /*
@@ -160 +160 @@
         }
         job_del_ref(&job);
-        
+
         const char **target_name_ptr = arg;
         prepare_and_run_job(target_name_ptr + 1);

uspace/srv/sysman/repo.c

@@ -107 +107 @@
 }
 
-
 static hash_table_ops_t units_by_name_ht_ops = {
         .hash            = &units_by_name_ht_hash,
@@ -133 +132 @@
 {
         sysman_log(LVL_DEBUG2, "%s(%s, %i)", __func__, name, lock);
-        if (lock) fibril_rwlock_read_lock(&repo_lock);
+        if (lock)
+                fibril_rwlock_read_lock(&repo_lock);
         ht_link_t *ht_link = hash_table_find(&units_by_name, (void *)name);
-        if (lock) fibril_rwlock_read_unlock(&repo_lock);
+        if (lock)
+                fibril_rwlock_read_unlock(&repo_lock);
 
         if (ht_link != NULL) {
@@ -177 +178 @@
 }
 
-void repo_begin_update(void) {
+void repo_begin_update(void)
+{
         sysman_log(LVL_DEBUG2, "%s", __func__);
         fibril_rwlock_write_lock(&repo_lock);

uspace/srv/sysman/repo.h

@@ -83 +83 @@
 
 #endif
-
-

uspace/srv/sysman/sm_task.c

@@ -38 +38 @@
 #include "sm_task.h"
 
-
 /** Structure for boxing task event */
 struct sm_task_event {
@@ -103 +102 @@
         CAST_SVC(u_svc)->main_task_id = tid;
         CAST_SVC(u_svc)->anonymous = true;
-        /* exec_start is left undefined, maybe could be hinted by kernel's task
-         * name */
+        /*
+         * exec_start is left undefined, maybe could be hinted by kernel's task
+         * name
+         */
 
         /*
@@ -125 +126 @@
 
         return CAST_SVC(u_svc);
-        
+
 fail:
         if (in_repo_update) {
@@ -177 +178 @@
                 u_svc->unit.state = STATE_STARTING;
         }
-
 
         /* Simple incomplete state automaton */

uspace/srv/sysman/sysman.c

@@ -40 +40 @@
 #include "unit.h"
 
-
 /* Do not expose this generally named type */
 typedef struct {
@@ -99 +98 @@
 {
         void *object = *(void **)key;
-        return (
-            hash_table_get_inst(item, observed_object_t, ht_link)->object ==
-            object);
+        return hash_table_get_inst(item, observed_object_t, ht_link)->object ==
+            object;
 }
 
@@ -357 +355 @@
 }
 
-
 /*
  * Event handlers
@@ -436 +433 @@
         notify_observers(data);
 }
-

uspace/srv/sysman/sysman.h

@@ -53 +53 @@
 extern errno_t sysman_run_job(unit_t *, unit_state_t, int, callback_handler_t, void *);
 
-
 extern void sysman_raise_event(event_handler_t, void *);
 extern void sysman_process_queue(void);

uspace/srv/sysman/test/job_closure.c

@@ -38 +38 @@
 PCUT_INIT
 
-        
+PCUT_TEST_SUITE(job_closure);
+
 static dyn_array_t exp_closure;
 static dyn_array_t act_closure;
@@ -107 +108 @@
 }
 
-PCUT_TEST_SUITE(job_closure);
-
-PCUT_TEST_BEFORE {
+PCUT_TEST_BEFORE
+{
         mock_create_units();
         mock_set_units_state(STATE_STOPPED);
@@ -124 +124 @@
 }
 
-PCUT_TEST_AFTER {
+PCUT_TEST_AFTER
+{
         destroy_job_closure(&act_closure);
         dyn_array_destroy(&act_closure);
@@ -134 +135 @@
 }
 
-PCUT_TEST(job_closure_linear) {
+PCUT_TEST(job_closure_linear)
+{
         unit_t *u0 = mock_units[UNIT_SERVICE][0];
         unit_t *u1 = mock_units[UNIT_SERVICE][1];
@@ -165 +167 @@
 }
 
-PCUT_TEST(job_closure_fork) {
+PCUT_TEST(job_closure_fork)
+{
         unit_t *u0 = mock_units[UNIT_SERVICE][0];
         unit_t *u1 = mock_units[UNIT_SERVICE][1];
@@ -196 +199 @@
 }
 
-PCUT_TEST(job_closure_triangle) {
+PCUT_TEST(job_closure_triangle)
+{
         unit_t *u0 = mock_units[UNIT_SERVICE][0];
         unit_t *u1 = mock_units[UNIT_SERVICE][1];
@@ -230 +234 @@
 }
 
-PCUT_TEST(job_closure_isolate_linears) {
+PCUT_TEST(job_closure_isolate_linears)
+{
         unit_t *u0 = mock_units[UNIT_SERVICE][0];
         unit_t *u1 = mock_units[UNIT_SERVICE][1];

uspace/srv/sysman/test/job_queue.c

@@ -38 +38 @@
 PCUT_INIT
 
+PCUT_TEST_SUITE(job_queue);
+
 static bool initialized = false;
 
@@ -51 +53 @@
 }
 
-PCUT_TEST_SUITE(job_queue);
-
-PCUT_TEST_BEFORE {
+PCUT_TEST_BEFORE
+{
         mock_create_units();
         mock_set_units_state(STATE_STOPPED);
@@ -73 +74 @@
 }
 
-PCUT_TEST_AFTER {
+PCUT_TEST_AFTER
+{
         mock_destroy_units();
 }
 
-PCUT_TEST(single_start_sync) {
+PCUT_TEST(single_start_sync)
+{
         unit_type_vmts[UNIT_TARGET]->start = &mock_unit_vmt_start_sync;
 
@@ -94 +97 @@
 }
 
-PCUT_TEST(single_start_async) {
+PCUT_TEST(single_start_async)
+{
         unit_type_vmts[UNIT_TARGET]->start = &mock_unit_vmt_start_async;
         unit_type_vmts[UNIT_TARGET]->exposee_created =
@@ -117 +121 @@
 }
 
-PCUT_TEST(multipath_to_started_unit) {
+PCUT_TEST(multipath_to_started_unit)
+{
         /* Setup mock behavior */
         unit_type_vmts[UNIT_SERVICE]->start = &mock_unit_vmt_start_sync;
@@ -133 +138 @@
         mock_add_edge(s0, m0);
         mock_add_edge(s1, m0);
-        
+
         /* S1 requires another mount and S0 */
         mock_add_edge(s1, s0);
@@ -152 +157 @@
 }
 
-PCUT_TEST(merge_jobs_with_callback) {
+PCUT_TEST(merge_jobs_with_callback)
+{
         /* Setup mock behavior */
         unit_type_vmts[UNIT_SERVICE]->start = &mock_unit_vmt_start_async;
@@ -169 +175 @@
         /* Job not finished */
         PCUT_ASSERT_NULL(j0);
-
 
         /*
@@ -188 +193 @@
         PCUT_ASSERT_NOT_NULL(j0);
         PCUT_ASSERT_NOT_NULL(j1);
-        
+
         /*
          * Jobs were, merged so both callbacks should have been called with the
@@ -202 +207 @@
 }
 
-
 PCUT_EXPORT(job_queue);

uspace/srv/sysman/test/main.c

@@ -34 +34 @@
 PCUT_IMPORT(job_queue);
 
-PCUT_MAIN()
+PCUT_MAIN();

uspace/srv/sysman/test/mock_unit.c

@@ -104 +104 @@
         unit_notify_state(unit);
 }
-

uspace/srv/sysman/unit.c

@@ -55 +55 @@
 
 static config_item_t unit_configuration[] = {
-        {"After", &unit_parse_unit_list, 0, ""},
+        { "After", &unit_parse_unit_list, 0, "" },
         CONFIGURATION_ITEM_SENTINEL
 };
 
-
 static void unit_init(unit_t *unit, unit_type_t type)
 {
@@ -66 +65 @@
         size_t size = unit_type_vmts[type]->size;
         memset(unit, 0, size);
-        
+
         unit->type = type;
         unit->state = STATE_STOPPED;
@@ -97 +96 @@
 
         UNIT_VMT(unit)->destroy(unit);
-        /* TODO:
+        /*
+         * TODO:
          *      edges
          */
@@ -116 +116 @@
                     unit_section, unit, text_parse);
         }
-                                
+
         if (rc != EOK) {
                 return rc;

uspace/srv/sysman/unit.h

@@ -99 +99 @@
 #include "unit_svc.h"
 
-#define DEFINE_CAST(NAME, TYPE, ENUM_TYPE)                                     \
-        static inline TYPE *CAST_##NAME(unit_t *u)                             \
-        {                                                                      \
-                if (u->type == ENUM_TYPE)                                      \
+#define DEFINE_CAST(NAME, TYPE, ENUM_TYPE)                         \
+        static inline TYPE *CAST_##NAME(unit_t *u)                     \
+        {                                                              \
+                if (u->type == ENUM_TYPE)                                  \
                         return (TYPE *)u;                                      \
-                else                                                           \
+                else                                                       \
                         return NULL;                                           \
-        }                                                                      \
+        }
 
-DEFINE_CAST(CFG, unit_cfg_t, UNIT_CONFIGURATION)
-DEFINE_CAST(MNT, unit_mnt_t, UNIT_MOUNT)
-DEFINE_CAST(TGT, unit_tgt_t, UNIT_TARGET)
-DEFINE_CAST(SVC, unit_svc_t, UNIT_SERVICE)
+DEFINE_CAST(CFG, unit_cfg_t, UNIT_CONFIGURATION);
+DEFINE_CAST(MNT, unit_mnt_t, UNIT_MOUNT);
+DEFINE_CAST(TGT, unit_tgt_t, UNIT_TARGET);
+DEFINE_CAST(SVC, unit_svc_t, UNIT_SERVICE);
 
 struct unit_vmt {

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);

uspace/srv/sysman/util.c

@@ -86 +86 @@
         command->argv[command->argc] = NULL;
 
-
         if (command->argc > MAX_COMMAND_ARGS) {
                 text_parse_raise_error(parse, lineno,
@@ -95 +94 @@
         }
 }
-
 
 void util_command_init(command_t *command)

uspace/srv/taskman/event.c

@@ -167 +167 @@
                                 async_answer_1(pr->icall, EINTR, t->exit);
                         } else {
-                                /* Send both exit status and retval, caller
-                                 * should know what is valid */
+                                /*
+                                 * Send both exit status and retval, caller
+                                 * should know what is valid
+                                 */
                                 async_answer_3(pr->icall, EOK, t->exit,
                                     t->retval, rest);
@@ -180 +182 @@
                 }
 
-                
                 list_remove(&pr->link);
                 free(pr);
@@ -233 +234 @@
 
 void wait_for_task(task_id_t id, int flags, ipc_call_t *icall,
-     task_id_t waiter_id)
+    task_id_t waiter_id)
 {
         assert(!(flags & TASK_WAIT_BOTH) ||
@@ -247 +248 @@
                 return;
         }
-        
+
         if (t->exit != TASK_EXIT_RUNNING) {
                 //TODO are flags BOTH processed correctly here?
@@ -253 +254 @@
                 return;
         }
-        
+
         /*
          * Add request to pending list or reuse existing item for a second
@@ -274 +275 @@
                         goto finish;
                 }
-        
+
                 link_initialize(&pr->link);
                 pr->id = id;
@@ -305 +306 @@
 }
 
-
 errno_t task_set_retval(task_id_t sender, int retval, bool wait_for_exit)
 {
         errno_t rc = EOK;
-        
+
         fibril_rwlock_write_lock(&task_hash_table_lock);
         task_t *t = task_get_by_id(sender);
@@ -317 +317 @@
                 goto finish;
         }
-        
+
         t->retval = retval;
         t->retval_type = wait_for_exit ? RVAL_SET_EXIT : RVAL_SET;
-        
+
         event_notify_all(t);
         process_pending_wait();
-        
+
 finish:
         fibril_rwlock_write_unlock(&task_hash_table_lock);

uspace/srv/taskman/main.c

@@ -54 +54 @@
 #include "taskman.h"
 
-
 typedef struct {
         link_t link;
@@ -74 +73 @@
 {
         DPRINTF("%s:%i from %llu\n", __func__, __LINE__, icall->task_id);
-        /* We don't accept the connection request, we forward it instead to
-         * freshly spawned loader. */
+        /*
+         * We don't accept the connection request, we forward it instead to
+         * freshly spawned loader.
+         */
         errno_t rc = loader_spawn("loader");
-        
+
         if (rc != EOK) {
                 async_answer_0(icall, rc);
                 return;
         }
-        
+
         /* Wait until spawned task presents itself to us. */
         link_t *link = prodcons_consume(&sess_queue);
@@ -148 +149 @@
         /* Used only for connection forwarding -- atomic */
         session_ns = async_callback_receive(EXCHANGE_ATOMIC);
-        
+
         if (session_ns == NULL) {
                 rc = ENOENT;
@@ -218 +219 @@
         // TODO check that loader is expected, would probably discard prodcons
         //      scheme
-        
+
         /* Preallocate session container */
         sess_ref_t *sess_ref = malloc(sizeof(sess_ref_t));
@@ -265 +266 @@
 static bool handle_implicit_call(ipc_call_t *icall)
 {
-        /*DPRINTF("%s:%i %i(%i) from %llu\n", __func__, __LINE__,
-            IPC_GET_IMETHOD(*icall),
-            IPC_GET_ARG1(*icall),
-            icall->in_task_id);*/
-
         if (ipc_get_imethod(icall) < IPC_FIRST_USER_METHOD) {
                 switch (ipc_get_arg1(icall)) {
@@ -330 +326 @@
 }
 
-
-
 int main(int argc, char *argv[])
 {
@@ -358 +352 @@
                 return rc;
         }
-        
+
         task_id_t self_id = task_get_id();
         rc = task_intro(self_id);

uspace/srv/taskman/task.c

@@ -46 +46 @@
         void *arg;
 } walker_context_t;
-        
+
 /*
  * Forwards
@@ -59 +59 @@
 static size_t ht_task_key_hash(const void *key)
 {
-        return *(task_id_t*)key;
+        return *(task_id_t *)key;
 }
 
@@ -71 +71 @@
 {
         task_t *ht = hash_table_get_inst(item, task_t, link);
-        return ht->id == *(task_id_t*)key;
+        return ht->id == *(task_id_t *)key;
 }
 
@@ -127 +127 @@
 
         fibril_rwlock_initialize(&task_hash_table_lock);
-        
+
         return EOK;
 }
@@ -145 +145 @@
                 return NULL;
         }
-        
+
         task_t *t = hash_table_get_inst(link, task_t, link);
         return t;
@@ -202 +202 @@
                 goto finish;
         }
-        
+
         t = malloc(sizeof(task_t));
         if (t == NULL) {
@@ -217 +217 @@
         hash_table_insert(&task_hash_table, &t->link);
         DPRINTF("%s: %llu\n", __func__, t->id);
-        
+
 finish:
         fibril_rwlock_write_unlock(&task_hash_table_lock);
@@ -223 +223 @@
 }
 
-
 /**
  * @}

uspace/srv/taskman/task.h

@@ -43 +43 @@
 /** What type of retval from the task we have */
 typedef enum {
-        RVAL_UNSET,     /**< unset */
-        RVAL_SET,       /**< retval set, e.g. by server */
-        RVAL_SET_EXIT   /**< retval set, wait for expected task exit */
+        /* unset */
+        RVAL_UNSET,
+
+        /* retval set, e.g. by server */
+        RVAL_SET,
+
+        /* retval set, wait for expected task exit */
+        RVAL_SET_EXIT
 } retval_t;
 
@@ -51 +56 @@
 typedef struct {
         ht_link_t link;
-        
-        task_id_t id;          /**< Task id. */
-        task_exit_t exit;      /**< Task's uspace exit status. */
-        bool failed;           /**< Task failed (task can exit unexpectedly
-                                    even w/out failure). */
-        retval_t retval_type;  /**< Task returned a value. */
-        int retval;            /**< The return value. */
 
-        link_t listeners;      /**< Link to listeners list. */
-        async_sess_t *sess;    /**< Session for notifications to task. */
+        /* Task id. */
+        task_id_t id;
+        /* Task's uspace exit status. */
+        task_exit_t exit;
+        /* Task failed (task can exit unexpectedly even w/out failure). */
+        bool failed;
+        /* Task returned a value. */
+        retval_t retval_type;
+        /* The return value. */
+        int retval;
+        /* Link to listeners list. */
+        link_t listeners;
+        /* Session for notifications to task. */
+        async_sess_t *sess;
 } task_t;
 
-typedef bool (* task_walker_t)(task_t *, void *);
+typedef bool (*task_walker_t)(task_t *, void *);
 
 extern fibril_rwlock_t task_hash_table_lock;

uspace/srv/vfs/vfs.c

@@ -155 +155 @@
                 return rc;
         }
-        
+
         /*
          * Start accepting connections.

uspace/srv/vfs/vfs_register.c

@@ -174 +174 @@
         sysman_main_exposee_added(unit_name, req->task_id);
         free(unit_name);
-        
+
         /*
          * Add fs_info to the list of registered FS's.