Changeset a35b458 in mainline for uspace/app/init/init.c

Timestamp:

2018-03-02T20:10:49Z (7 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

f1380b7

Parents:

3061bc1

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-02-28 17:38:31)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-02 20:10:49)

Message:

style: Remove trailing whitespace on _all_ lines, including empty ones, for particular file types.

Command used: tools/srepl '\s\+$' '' -- *.c *.h *.py *.sh *.s *.S *.ag

Currently, whitespace on empty lines is very inconsistent.
There are two basic choices: Either remove the whitespace, or keep empty lines
indented to the level of surrounding code. The former is AFAICT more common,
and also much easier to do automatically.

Alternatively, we could write script for automatic indentation, and use that
instead. However, if such a script exists, it's possible to use the indented
style locally, by having the editor apply relevant conversions on load/save,
without affecting remote repository. IMO, it makes more sense to adopt
the simpler rule.

File:

• uspace/app/init/init.c (modified) (22 diffs)

uspace/app/init/init.c

@@ -103 +103 @@
                 return false;
         }
-        
+
         return true;
 }
@@ -121 +121 @@
 {
         const char *opts = "";
-        
+
         if (str_cmp(fstype, "tmpfs") == 0)
                 opts = "restore";
-        
+
         errno_t rc = vfs_mount_path(ROOT_MOUNT_POINT, fstype, ROOT_DEVICE, opts,
             IPC_FLAG_BLOCKING, 0);
@@ -157 +157 @@
                 return ENOENT;
         }
-        
+
         printf("%s: Starting %s\n", NAME, path);
-        
+
         va_list ap;
         const char *arg;
         int cnt = 0;
-        
+
         va_start(ap, path);
         do {
@@ -170 +170 @@
         } while (arg != NULL);
         va_end(ap);
-        
+
         va_start(ap, path);
         task_id_t id;
@@ -176 +176 @@
         errno_t rc = task_spawn(&id, &wait, path, cnt, ap);
         va_end(ap);
-        
+
         if (rc != EOK) {
                 printf("%s: Error spawning %s (%s)\n", NAME, path,
@@ -182 +182 @@
                 return rc;
         }
-        
+
         if (!id) {
                 printf("%s: Error spawning %s (invalid task id)\n", NAME,
@@ -188 +188 @@
                 return EINVAL;
         }
-        
+
         task_exit_t texit;
         int retval;
@@ -197 +197 @@
                 return rc;
         }
-        
+
         if (texit != TASK_EXIT_NORMAL) {
                 printf("%s: Server %s failed to start (unexpectedly "
@@ -203 +203 @@
                 return EINVAL;
         }
-        
+
         if (retval != 0)
                 printf("%s: Server %s failed to start (exit code %d)\n", NAME,
                     path, retval);
-        
+
         return retval == 0 ? EOK : EPARTY;
 }
@@ -221 +221 @@
                 return rc;
         }
-        
+
         /* Wait for the output service to be ready */
         rc = loc_service_get_id(osvc, &service_id, IPC_FLAG_BLOCKING);
@@ -229 +229 @@
                 return rc;
         }
-        
+
         return srv_start(SRV_CONSOLE, isvc, osvc);
 }
@@ -243 +243 @@
                 return rc;
         }
-        
+
         return srv_start(SRV_COMPOSITOR, isvc, name);
 }
@@ -251 +251 @@
         char winreg[50];
         snprintf(winreg, sizeof(winreg), "%s%s%s", "comp", srv_name, "/winreg");
-        
+
         printf("%s: Spawning %s %s\n", NAME, app, winreg);
-        
+
         task_id_t id;
         task_wait_t wait;
@@ -262 +262 @@
                 return -1;
         }
-        
+
         task_exit_t texit;
         int retval;
@@ -271 +271 @@
                 return -1;
         }
-        
+
         return retval;
 }
@@ -280 +280 @@
                 printf("%s: Spawning %s %s %s --msg --wait -- %s\n", NAME,
                     APP_GETTERM, svc, LOCFS_MOUNT_POINT, app);
-                
+
                 errno_t rc = task_spawnl(NULL, NULL, APP_GETTERM, APP_GETTERM, svc,
                     LOCFS_MOUNT_POINT, "--msg", "--wait", "--", app, NULL);
@@ -289 +289 @@
                 printf("%s: Spawning %s %s %s --wait -- %s\n", NAME,
                     APP_GETTERM, svc, LOCFS_MOUNT_POINT, app);
-                
+
                 errno_t rc = task_spawnl(NULL, NULL, APP_GETTERM, APP_GETTERM, svc,
                     LOCFS_MOUNT_POINT, "--wait", "--", app, NULL);
@@ -310 +310 @@
 
         info_print();
-        
+
         if (!mount_root(STRING(RDFMT))) {
                 printf("%s: Exiting\n", NAME);
                 return 1;
         }
-        
+
         /* Make sure file systems are running. */
         if (str_cmp(STRING(RDFMT), "tmpfs") != 0)
@@ -325 +325 @@
         srv_start("/srv/cdfs");
         srv_start("/srv/mfs");
-        
+
         srv_start("/srv/klog");
         srv_start("/srv/locfs");
         srv_start("/srv/taskmon");
-        
+
         if (!mount_locfs()) {
                 printf("%s: Exiting\n", NAME);
                 return 2;
         }
-        
+
         mount_tmpfs();
-        
+
         srv_start("/srv/devman");
         srv_start("/srv/s3c24xx_uart");
         srv_start("/srv/s3c24xx_ts");
-        
+
         srv_start("/srv/vbd");
         srv_start("/srv/volsrv");
-        
+
         srv_start("/srv/loopip");
         srv_start("/srv/ethip");
@@ -352 +352 @@
         srv_start("/srv/dhcp");
         srv_start("/srv/nconfsrv");
-        
+
         srv_start("/srv/clipboard");
         srv_start("/srv/remcons");
-        
+
         srv_start("/srv/input", HID_INPUT);
         srv_start("/srv/output", HID_OUTPUT);
         srv_start("/srv/hound");
-        
+
         if (!config_key_exists("console")) {
                 rc = compositor(HID_INPUT, HID_COMPOSITOR_SERVER);
@@ -368 +368 @@
                 }
         }
-        
+
         rc = console(HID_INPUT, HID_OUTPUT);
         if (rc == EOK) {
@@ -378 +378 @@
                 getterm("term/vc5", "/app/bdsh", false);
         }
-        
+
         return 0;
 }