aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/librc/librc-depend.c10
-rw-r--r--src/librc/librc-misc.c2
-rw-r--r--src/rc/openrc-run.c2
-rw-r--r--src/rc/openrc-shutdown.c6
-rw-r--r--src/rc/rc-status.c2
-rw-r--r--src/rc/rc-wtmp.c4
-rw-r--r--src/rc/start-stop-daemon.c2
7 files changed, 14 insertions, 14 deletions
diff --git a/src/librc/librc-depend.c b/src/librc/librc-depend.c
index 37f0b60d..0d894e20 100644
--- a/src/librc/librc-depend.c
+++ b/src/librc/librc-depend.c
@@ -616,11 +616,11 @@ mtime_check(const char *source, const char *target, bool newer,
return false;
mtime = buf.st_mtime;
- retval = deep_mtime_check(target,newer,&mtime,file);
- if (rel) {
- *rel = mtime;
- }
- return retval;
+ retval = deep_mtime_check(target,newer,&mtime,file);
+ if (rel) {
+ *rel = mtime;
+ }
+ return retval;
}
bool
diff --git a/src/librc/librc-misc.c b/src/librc/librc-misc.c
index 4ff7f439..c6af405c 100644
--- a/src/librc/librc-misc.c
+++ b/src/librc/librc-misc.c
@@ -423,7 +423,7 @@ rc_conf_value(const char *setting)
}
rc_conf = rc_config_directory(rc_conf);
- rc_conf = rc_config_kcl(rc_conf);
+ rc_conf = rc_config_kcl(rc_conf);
/* Convert old uppercase to lowercase */
TAILQ_FOREACH(s, rc_conf, entries) {
diff --git a/src/rc/openrc-run.c b/src/rc/openrc-run.c
index 7649b04c..1958dbc8 100644
--- a/src/rc/openrc-run.c
+++ b/src/rc/openrc-run.c
@@ -1120,7 +1120,7 @@ int main(int argc, char **argv)
char *dir, *save = NULL, *saveLnk = NULL;
char *pidstr = NULL;
size_t l = 0, ll;
- const char *file;
+ const char *file;
struct stat stbuf;
/* Show help if insufficient args */
diff --git a/src/rc/openrc-shutdown.c b/src/rc/openrc-shutdown.c
index 2c8863bb..45936052 100644
--- a/src/rc/openrc-shutdown.c
+++ b/src/rc/openrc-shutdown.c
@@ -111,8 +111,8 @@ static void create_nologin(int mins)
t += 60 * mins;
if ((fp = fopen(nologin_file, "w")) != NULL) {
- fprintf(fp, "\rThe system is going down on %s\r\n", ctime(&t));
- fclose(fp);
+ fprintf(fp, "\rThe system is going down on %s\r\n", ctime(&t));
+ fclose(fp);
}
}
@@ -122,7 +122,7 @@ static void create_nologin(int mins)
static void send_cmd(const char *cmd)
{
FILE *fifo;
- size_t ignored;
+ size_t ignored;
if (do_dryrun) {
einfo("Would send %s to init", cmd);
diff --git a/src/rc/rc-status.c b/src/rc/rc-status.c
index 8b73b812..33610fa1 100644
--- a/src/rc/rc-status.c
+++ b/src/rc/rc-status.c
@@ -244,7 +244,7 @@ print_stacked_services(const char *runlevel)
int main(int argc, char **argv)
{
RC_SERVICE state;
- RC_STRING *s, *l, *t, *level;
+ RC_STRING *s, *l, *t, *level;
bool show_all = false;
char *p, *runlevel = NULL;
int opt, retval = 0;
diff --git a/src/rc/rc-wtmp.c b/src/rc/rc-wtmp.c
index 40cc280c..271ae7a6 100644
--- a/src/rc/rc-wtmp.c
+++ b/src/rc/rc-wtmp.c
@@ -43,8 +43,8 @@ void log_wtmp(const char *user, const char *id, pid_t pid, int type,
strncpy(utmp.ut_id , id , sizeof(utmp.ut_id ));
strncpy(utmp.ut_line, line, sizeof(utmp.ut_line));
- /* Put the OS version in place of the hostname */
- if (uname(&uname_buf) == 0)
+ /* Put the OS version in place of the hostname */
+ if (uname(&uname_buf) == 0)
strncpy(utmp.ut_host, uname_buf.release, sizeof(utmp.ut_host));
updwtmp(WTMP_FILE, &utmp);
diff --git a/src/rc/start-stop-daemon.c b/src/rc/start-stop-daemon.c
index a96b29f0..c59d3d5c 100644
--- a/src/rc/start-stop-daemon.c
+++ b/src/rc/start-stop-daemon.c
@@ -547,7 +547,7 @@ int main(int argc, char **argv)
} else if (name) {
*--argv = name;
++argc;
- } else if (exec) {
+ } else if (exec) {
*--argv = exec;
++argc;
};