Merge pull request #181 from yangfl/typo

Fix typo

src/api.c

@@ -413,7 +413,7 @@ static void api_cb(uev_t *w, void *arg, int events)
 		case INIT_CMD_SVC_ITER:
 //			_d("svc iter, first: %d", rq.runlevel);
 			/*
-			 * XXX: This severly limits the number of
+			 * XXX: This severely limits the number of
 			 * simultaneous client connections, but will
 			 * have to do for now.
 			 */
@@ -493,7 +493,7 @@ int api_init(uev_ctx_t *ctx)
 		return 0;
 
 error:
-	_pe("Failed intializing API socket");
+	_pe("Failed initializing API socket");
 	umask(oldmask);
 	close(sd);
 	return 1;

src/cond-w.c

@@ -273,7 +273,7 @@ static int do_assert(const char *fpath, const struct stat *sb, int tflg, struct
 
 	nm = strstr((char *)fpath, COND_BASE);
 	if (!nm) {
-		_e("Incorrect condtion path %s, cannot %sassert", fpath, set ? "re" : "de");
+		_e("Incorrect condition path %s, cannot %sassert", fpath, set ? "re" : "de");
 		return 1;
 	}
 

src/conf.c

@@ -580,7 +580,7 @@ static void parse_dynamic(char *line, struct rlimit rlimit[], char *file)
 		return;
 	}
 
-	/* Read contrl group limits */
+	/* Read control group limits */
 	if (MATCH_CMD(line, "cgroup ", x)) {
 		conf_parse_cgroup(x);
 		return;

src/finit.c

@@ -312,7 +312,7 @@ static void fs_mount_all(void)
  * occurrence of these file systems in /etc/fstab will replace these
  * mounts later in fs_mount_all()
  *
- * Ignore any mount errors with EBUSY, kernel likely alread mounted
+ * Ignore any mount errors with EBUSY, kernel likely already mounted
  * the filesystem for us automatically, e.g., CONFIG_DEVTMPFS_MOUNT.
  */
 static void fs_init(void)
@@ -389,7 +389,7 @@ static void finalize(void *unused)
 static void crank_worker(void *unused)
 {
 	/*
-	 * Initalize state machine and start all bootstrap tasks
+	 * Initialize state machine and start all bootstrap tasks
 	 * NOTE: no network available!
 	 */
 	sm_init(&sm);
@@ -557,7 +557,7 @@ int main(int argc, char *argv[])
 	console_init();
 
 	/*
-	 * Initalize event context.
+	 * Initialize event context.
 	 */
 	uev_init1(&loop, 1);
 	ctx = &loop;

src/pid.c

@@ -166,7 +166,7 @@ int pid_file_set(svc_t *svc, char *file, int not)
  * The logic is explained below.  Please note that using the first form
  * of the syntax not only creates and removes the PID file, but it also
  * calls touch to update the mtime on service_restart(), only applicable
- * to processes that accept SIGHUP.  This to ensure dependant services
+ * to processes that accept SIGHUP.  This to ensure dependent services
  * are sent SIGCONT properly on reload, otherwise their condition would
  * never be asserted again after `initctl reload`.
  *

src/plugin.c

@@ -274,7 +274,7 @@ static int init_plugins(uev_ctx_t *ctx)
  * Loads a plugin from @path/@name[.so].  Note, if ".so" is missing from
  * the plugin @name it is added before attempting to load.
  *
- * It is up to the plugin itself ot register itself as a "ctor" with the
+ * It is up to the plugin itself or register itself as a "ctor" with the
  * %PLUGIN_INIT macro so that plugin_register() is called automatically.
  *
  * Returns:

src/sample.conf

@@ -12,7 +12,7 @@
 # runlevel.  Finit does not restart them when they exit.
 #
 # - run     : wait for completion before continuing with next stanza
-# - task    : like run but started in background, parallell with other stanzas
+# - task    : like run but started in background, parallel with other stanzas
 # - service : supervised daemon, run in foreground, restarted if it crashes
 #
 # The env: is an optional path to a file with environment variables to

src/service.c

@@ -843,7 +843,7 @@ static int service_restart(svc_t *svc)
 /**
  * service_reload_dynamic - Called on SIGHUP, 'init q' or 'initctl reload'
  *
- * This function is called when Finit has recieved SIGHUP to reload
+ * This function is called when Finit has received SIGHUP to reload
  * .conf files in /etc/finit.d.  It is responsible for starting,
  * stopping and reloading (forwarding SIGHUP) to processes affected.
  */
@@ -1079,7 +1079,7 @@ static void parse_cmdline_args(svc_t *svc, char *cmd)
  * This function is used to register commands to be run on different
  * system runlevels with optional username.  The @type argument details
  * if it's service to bo monitored/respawned (daemon), a one-shot task
- * or a command that must run in sequence and not in parallell, like
+ * or a command that must run in sequence and not in parallel, like
  * service and task commands do.
  *
  * The @line can optionally start with a username, denoted by an @
@@ -1119,7 +1119,7 @@ static void parse_cmdline_args(svc_t *svc, char *cmd)
  *
  * Without the :ID syntax, Finit replaces the first service line with
  * the contents of the second.  The :ID can be any string value and
- * defaults to "" (emtpy string).
+ * defaults to "" (empty string).
  *
  * Returns:
  * POSIX OK(0) on success, or non-zero errno exit status on failure.
@@ -1328,7 +1328,7 @@ int service_register(int type, char *cfg, struct rlimit rlimit[], char *file)
 		/* TTYs cannot be redirected */
 		log = NULL;
 
-		/* Create name:id tuple for identiy, e.g., tty:S0 */
+		/* Create name:id tuple for identity, e.g., tty:S0 */
 		ptr = strrchr(svc->dev, '/');
 		if (ptr)
 			ptr++;

src/sig.c

@@ -445,7 +445,7 @@ const char *sig_name(int signo)
 }
 
 /*
- * Inital signal setup - ignore everything but SIGCHLD until we're capable of responding
+ * Initial signal setup - ignore everything but SIGCHLD until we're capable of responding
  */
 static void chld_handler(int sig, siginfo_t *info, void *ctx)
 {

src/sm.c

@@ -187,7 +187,7 @@ restart:
 		}
 
 		/* Prev runlevel services stopped, call hooks before starting new runlevel ... */
-		_d("All services have been stoppped, calling runlevel change hooks ...");
+		_d("All services have been stopped, calling runlevel change hooks ...");
 		plugin_run_hooks(HOOK_RUNLEVEL_CHANGE);  /* Reconfigure HW/VLANs/etc here */
 
 		_d("Starting services new to this runlevel ...");

src/sm.h

@@ -27,9 +27,9 @@
 typedef enum {
 	SM_BOOTSTRAP_STATE = 0,   /* Init state, bootstrap services */
 	SM_RUNNING_STATE,         /* Normal state, services running */
-	SM_RUNLEVEL_CHANGE_STATE, /* A runlevel change has occured */
+	SM_RUNLEVEL_CHANGE_STATE, /* A runlevel change has occurred */
 	SM_RUNLEVEL_WAIT_STATE,   /* Waiting for all stopped runlevel processes to be halted */
-	SM_RELOAD_CHANGE_STATE,   /* A reload event has occured */
+	SM_RELOAD_CHANGE_STATE,   /* A reload event has occurred */
 	SM_RELOAD_WAIT_STATE,     /* Waiting for all stopped reload processes to be halted */
 } sm_state_t;
 

src/svc.h

@@ -40,7 +40,7 @@ typedef int svc_cmd_t;
 typedef enum {
 	SVC_TYPE_FREE       = 0,	/* Free to allocate */
 	SVC_TYPE_SERVICE    = 1,	/* Monitored, will be respawned */
-	SVC_TYPE_TASK       = 2,	/* One-shot, runs in parallell */
+	SVC_TYPE_TASK       = 2,	/* One-shot, runs in parallel */
 	SVC_TYPE_RUN        = 4,	/* Like task, but wait for completion */
 	SVC_TYPE_TTY        = 8,	/* Like service, but dedicated to TTYs */
 	SVC_TYPE_SYSV       = 32,	/* SysV style init.d script w/ start/stop */