aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2007-04-12 13:18:52 +0000
committerRoy Marples <roy@marples.name>2007-04-12 13:18:52 +0000
commit67c5d8e940ecd0d856b35b2aa4541fbc5831c085 (patch)
tree2d6c3235a6b8a15ec833441c2318a9be2b59cdb5
parent000f2395349552a9c1a08f634f1c5d1ed5417b1f (diff)
Style updates
-rw-r--r--src/env-update.c18
-rw-r--r--src/mountinfo.c14
-rw-r--r--src/rc-status.c8
-rw-r--r--src/rc.h16
-rw-r--r--src/runscript.c24
5 files changed, 40 insertions, 40 deletions
diff --git a/src/env-update.c b/src/env-update.c
index 9ddeae02..f3f4f3b8 100644
--- a/src/env-update.c
+++ b/src/env-update.c
@@ -21,17 +21,17 @@
#include "rc-misc.h"
#include "strlist.h"
-#define ENVDIR "/etc/env.d"
-#define PROFILE_ENV "/etc/profile.env"
-#define CSH_ENV "/etc/csh.env"
-#define LDSOCONF "/etc/ld.so.conf"
+#define ENVDIR "/etc/env.d"
+#define PROFILE_ENV "/etc/profile.env"
+#define CSH_ENV "/etc/csh.env"
+#define LDSOCONF "/etc/ld.so.conf"
-#define NOTICE "# THIS FILE IS AUTOMATICALLY GENERATED BY env-update.\n" \
- "# DO NOT EDIT THIS FILE. CHANGES TO STARTUP PROFILES\n" \
- "# GO INTO %s NOT %s\n\n"
+#define NOTICE "# THIS FILE IS AUTOMATICALLY GENERATED BY env-update.\n" \
+ "# DO NOT EDIT THIS FILE. CHANGES TO STARTUP PROFILES\n" \
+ "# GO INTO %s NOT %s\n\n"
-#define LDNOTICE "# ld.so.conf autogenerated by env-update; make all\n" \
- "# changes to contents of /etc/env.d directory\n"
+#define LDNOTICE "# ld.so.conf autogenerated by env-update; make all\n" \
+ "# changes to contents of /etc/env.d directory\n"
static const char *specials[] = {
"ADA_INCLUDE_PATH",
diff --git a/src/mountinfo.c b/src/mountinfo.c
index b7cc1b14..33f1869b 100644
--- a/src/mountinfo.c
+++ b/src/mountinfo.c
@@ -145,13 +145,13 @@ int main (int argc, char **argv)
char c;
static struct option longopts[] = {
- { "fstype-regex", 1, NULL, 'F'},
- { "node-regex", 1, NULL, 'N'},
- { "skip-regex", 1, NULL, 'S'},
- { "fstype", 0, NULL, 'f'},
- { "node", 0, NULL, 'n'},
- { "reverse", 0, NULL, 'r'},
- { NULL, 0, NULL, 0}
+ { "fstype-regex", 1, NULL, 'F'},
+ { "node-regex", 1, NULL, 'N'},
+ { "skip-regex", 1, NULL, 'S'},
+ { "fstype", 0, NULL, 'f'},
+ { "node", 0, NULL, 'n'},
+ { "reverse", 0, NULL, 'r'},
+ { NULL, 0, NULL, 0}
};
while ((c = getopt_long (argc, argv, "F:N:S:fnr",
diff --git a/src/rc-status.c b/src/rc-status.c
index 7709e422..76dedce9 100644
--- a/src/rc-status.c
+++ b/src/rc-status.c
@@ -63,11 +63,11 @@ int main (int argc, char **argv)
int j;
const struct option longopts[] = {
- {"all", 0, NULL, 'a'},
- {"list", 0, NULL, 'l'},
+ {"all", 0, NULL, 'a'},
+ {"list", 0, NULL, 'l'},
{"servicelist", 0, NULL, 's'},
- {"unused", 0, NULL, 'u'},
- {NULL, 0, NULL, 0}
+ {"unused", 0, NULL, 'u'},
+ {NULL, 0, NULL, 0}
};
while ((c = getopt_long(argc, argv, "alsu", longopts, &option_index)) != -1)
diff --git a/src/rc.h b/src/rc.h
index ef05c4d8..dbe7147b 100644
--- a/src/rc.h
+++ b/src/rc.h
@@ -16,12 +16,12 @@
#include <stdbool.h>
/* Special level names */
-#define RC_LEVEL_SYSINIT "sysinit"
-#define RC_LEVEL_BOOT "boot"
-#define RC_LEVEL_SINGLE "single"
-#define RC_LEVEL_SHUTDOWN "shutdown"
-#define RC_LEVEL_REBOOT "reboot"
-#define RC_LEVEL_DEFAULT "default"
+#define RC_LEVEL_SYSINIT "sysinit"
+#define RC_LEVEL_BOOT "boot"
+#define RC_LEVEL_SINGLE "single"
+#define RC_LEVEL_SHUTDOWN "shutdown"
+#define RC_LEVEL_REBOOT "reboot"
+#define RC_LEVEL_DEFAULT "default"
typedef enum
{
@@ -100,8 +100,8 @@ typedef struct rc_depinfo
/* Options for rc_dep_depends and rc_order_services.
When changing runlevels, you should use RC_DEP_START and RC_DEP_STOP for
the start and stop lists as we tweak the provided services for this. */
-#define RC_DEP_TRACE 0x01
-#define RC_DEP_STRICT 0x02
+#define RC_DEP_TRACE 0x01
+#define RC_DEP_STRICT 0x02
#define RC_DEP_START 0x04
#define RC_DEP_STOP 0x08
diff --git a/src/runscript.c b/src/runscript.c
index ee32253a..98b26889 100644
--- a/src/runscript.c
+++ b/src/runscript.c
@@ -29,8 +29,8 @@
#include "rc-plugin.h"
#include "strlist.h"
-#define RCSCRIPT_HELP RC_LIBDIR "/sh/rc-help.sh"
-#define SELINUX_LIB RC_LIBDIR "/runscript_selinux.so"
+#define RCSCRIPT_HELP RC_LIBDIR "/sh/rc-help.sh"
+#define SELINUX_LIB RC_LIBDIR "/runscript_selinux.so"
static char *applet = NULL;
static char *exclusive = NULL;
@@ -427,7 +427,7 @@ static void svc_start (const char *service, bool deps)
if (rc_is_env ("IN_HOTPLUG", "1") || in_background) {
if (! rc_service_state (service, rc_service_inactive) &&
- ! rc_service_state (service, rc_service_stopped))
+ ! rc_service_state (service, rc_service_stopped))
exit (EXIT_FAILURE);
background = true;
}
@@ -634,7 +634,7 @@ static void svc_stop (const char *service, bool deps)
if (rc_is_env ("IN_HOTPLUG", "1") || in_background)
if (! rc_service_state (service, rc_service_started) &&
- ! rc_service_state (service, rc_service_inactive))
+ ! rc_service_state (service, rc_service_inactive))
exit (EXIT_FAILURE);
if (rc_service_state (service, rc_service_stopped))
@@ -819,14 +819,14 @@ int main (int argc, char **argv)
char c;
static struct option longopts[] = {
- { "debug", 0, NULL, 'd'},
- { "help", 0, NULL, 'h'},
- { "nocolor", 0, NULL, 'C'},
- { "nocolour", 0, NULL, 'C'},
- { "nodeps", 0, NULL, 'D'},
- { "quiet", 0, NULL, 'q'},
- { "verbose", 0, NULL, 'v'},
- { NULL, 0, NULL, 0}
+ { "debug", 0, NULL, 'd'},
+ { "help", 0, NULL, 'h'},
+ { "nocolor", 0, NULL, 'C'},
+ { "nocolour", 0, NULL, 'C'},
+ { "nodeps", 0, NULL, 'D'},
+ { "quiet", 0, NULL, 'q'},
+ { "verbose", 0, NULL, 'v'},
+ { NULL, 0, NULL, 0}
};
/* Show help if insufficient args */