1 |
commit: fe18c7bb632671457c3c261d36dece3fd09a4f69 |
2 |
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat May 28 15:53:29 2011 +0000 |
4 |
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat May 28 15:53:29 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=fe18c7bb |
7 |
|
8 |
librc: tweak style: foo () -> foo() |
9 |
|
10 |
Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org> |
11 |
|
12 |
--- |
13 |
src/librc/librc-daemon.c | 6 +++--- |
14 |
src/librc/librc-depend.c | 12 ++++++------ |
15 |
src/librc/librc-stringlist.c | 10 +++++----- |
16 |
src/librc/librc.c | 6 +++--- |
17 |
4 files changed, 17 insertions(+), 17 deletions(-) |
18 |
|
19 |
diff --git a/src/librc/librc-daemon.c b/src/librc/librc-daemon.c |
20 |
index dde62f9..c6b8782 100644 |
21 |
--- a/src/librc/librc-daemon.c |
22 |
+++ b/src/librc/librc-daemon.c |
23 |
@@ -308,10 +308,10 @@ _match_list(const char *exec, const char *const *argv, const char *pidfile) |
24 |
|
25 |
if (pidfile) { |
26 |
l = strlen(pidfile) + 9; |
27 |
- m = xmalloc(sizeof (char) * l); |
28 |
+ m = xmalloc(sizeof(char) * l); |
29 |
snprintf(m, l, "pidfile=%s", pidfile); |
30 |
rc_stringlist_add(match, m); |
31 |
- free (m); |
32 |
+ free(m); |
33 |
} |
34 |
|
35 |
return match; |
36 |
@@ -508,7 +508,7 @@ rc_service_daemons_crashed(const char *service) |
37 |
if ((fp = fopen(pidfile, "r"))) { |
38 |
if (fscanf(fp, "%d", &pid) == 1) |
39 |
retval = false; |
40 |
- fclose (fp); |
41 |
+ fclose(fp); |
42 |
} |
43 |
free(pidfile); |
44 |
pidfile = NULL; |
45 |
|
46 |
diff --git a/src/librc/librc-depend.c b/src/librc/librc-depend.c |
47 |
index 2e39267..5d6167e 100644 |
48 |
--- a/src/librc/librc-depend.c |
49 |
+++ b/src/librc/librc-depend.c |
50 |
@@ -144,7 +144,7 @@ rc_deptree_load_file(const char *deptree_file) |
51 |
e = strsep(&p, "_"); |
52 |
if (!e || strcmp(e, "depinfo") != 0) |
53 |
continue; |
54 |
- e = strsep (&p, "_"); |
55 |
+ e = strsep(&p, "_"); |
56 |
if (!e || sscanf(e, "%d", &i) != 1) |
57 |
continue; |
58 |
if (!(type = strsep(&p, "_="))) |
59 |
@@ -425,8 +425,8 @@ visit_service(const RC_DEPTREE *deptree, |
60 |
continue; |
61 |
provided = get_provided(di, runlevel, options); |
62 |
TAILQ_FOREACH(p, provided, entries) |
63 |
- if (strcmp (p->value, depinfo->service) == 0) { |
64 |
- visit_service (deptree, types, sorted, visited, di, |
65 |
+ if (strcmp(p->value, depinfo->service) == 0) { |
66 |
+ visit_service(deptree, types, sorted, visited, di, |
67 |
runlevel, options | RC_DEP_TRACE); |
68 |
break; |
69 |
} |
70 |
@@ -681,7 +681,7 @@ rc_deptree_update_needed(time_t *newest, char *file) |
71 |
/* Create base directories if needed */ |
72 |
for (i = 0; depdirs[i]; i++) |
73 |
if (mkdir(depdirs[i], 0755) != 0 && errno != EEXIST) |
74 |
- fprintf(stderr, "mkdir `%s': %s\n", depdirs[i], strerror (errno)); |
75 |
+ fprintf(stderr, "mkdir `%s': %s\n", depdirs[i], strerror(errno)); |
76 |
|
77 |
/* Quick test to see if anything we use has changed and we have |
78 |
* data in our deptree */ |
79 |
@@ -922,7 +922,7 @@ rc_deptree_update(void) |
80 |
di = get_depinfo(deptree, s->value); |
81 |
if (!di) { |
82 |
if (strcmp(deptype->type, "ineed") == 0) { |
83 |
- fprintf (stderr, |
84 |
+ fprintf(stderr, |
85 |
"Service `%s' needs non" |
86 |
" existent service `%s'\n", |
87 |
depinfo->service, s->value); |
88 |
@@ -1032,7 +1032,7 @@ rc_deptree_update(void) |
89 |
if (TAILQ_FIRST(config)) { |
90 |
if ((fp = fopen(RC_DEPCONFIG, "w"))) { |
91 |
TAILQ_FOREACH(s, config, entries) |
92 |
- fprintf (fp, "%s\n", s->value); |
93 |
+ fprintf(fp, "%s\n", s->value); |
94 |
fclose(fp); |
95 |
} else { |
96 |
fprintf(stderr, "fopen `%s': %s\n", |
97 |
|
98 |
diff --git a/src/librc/librc-stringlist.c b/src/librc/librc-stringlist.c |
99 |
index 818a31c..22b823b 100644 |
100 |
--- a/src/librc/librc-stringlist.c |
101 |
+++ b/src/librc/librc-stringlist.c |
102 |
@@ -41,7 +41,7 @@ rc_stringlist_new(void) |
103 |
librc_hidden_def(rc_stringlist_new) |
104 |
|
105 |
RC_STRING * |
106 |
-rc_stringlist_add (RC_STRINGLIST *list, const char *value) |
107 |
+rc_stringlist_add(RC_STRINGLIST *list, const char *value) |
108 |
{ |
109 |
RC_STRING *s = xmalloc(sizeof(*s)); |
110 |
|
111 |
@@ -52,7 +52,7 @@ rc_stringlist_add (RC_STRINGLIST *list, const char *value) |
112 |
librc_hidden_def(rc_stringlist_add) |
113 |
|
114 |
RC_STRING * |
115 |
-rc_stringlist_addu (RC_STRINGLIST *list, const char *value) |
116 |
+rc_stringlist_addu(RC_STRINGLIST *list, const char *value) |
117 |
{ |
118 |
RC_STRING *s; |
119 |
|
120 |
@@ -74,8 +74,8 @@ rc_stringlist_delete(RC_STRINGLIST *list, const char *value) |
121 |
TAILQ_FOREACH(s, list, entries) |
122 |
if (strcmp(s->value, value) == 0) { |
123 |
TAILQ_REMOVE(list, s, entries); |
124 |
- free (s->value); |
125 |
- free (s); |
126 |
+ free(s->value); |
127 |
+ free(s); |
128 |
return true; |
129 |
} |
130 |
|
131 |
@@ -127,7 +127,7 @@ rc_stringlist_sort(RC_STRINGLIST **list) |
132 |
TAILQ_REMOVE(l, s, entries); |
133 |
last = NULL; |
134 |
TAILQ_FOREACH(n, new, entries) { |
135 |
- if (strcmp (s->value, n->value) < 0) |
136 |
+ if (strcmp(s->value, n->value) < 0) |
137 |
break; |
138 |
last = n; |
139 |
} |
140 |
|
141 |
diff --git a/src/librc/librc.c b/src/librc/librc.c |
142 |
index 5feb5d7..d769eea 100644 |
143 |
--- a/src/librc/librc.c |
144 |
+++ b/src/librc/librc.c |
145 |
@@ -749,7 +749,7 @@ rc_service_state(const char *service) |
146 |
|
147 |
if (state & RC_SERVICE_STOPPED) { |
148 |
dirs = ls_dir(RC_SVCDIR "/scheduled", 0); |
149 |
- TAILQ_FOREACH (dir, dirs, entries) { |
150 |
+ TAILQ_FOREACH(dir, dirs, entries) { |
151 |
snprintf(file, sizeof(file), |
152 |
RC_SVCDIR "/scheduled/%s/%s", |
153 |
dir->value, service); |
154 |
@@ -892,7 +892,7 @@ rc_services_in_runlevel_stacked(const char *runlevel) |
155 |
|
156 |
list = rc_services_in_runlevel(runlevel); |
157 |
stacks = rc_runlevel_stacks(runlevel); |
158 |
- TAILQ_FOREACH (stack, stacks, entries) { |
159 |
+ TAILQ_FOREACH(stack, stacks, entries) { |
160 |
sl = rc_services_in_runlevel(stack->value); |
161 |
if (list != NULL) { |
162 |
TAILQ_CONCAT(list, sl, entries); |
163 |
@@ -1008,7 +1008,7 @@ rc_services_scheduled_by(const char *service) |
164 |
RC_STRING *dir; |
165 |
char file[PATH_MAX]; |
166 |
|
167 |
- TAILQ_FOREACH (dir, dirs, entries) { |
168 |
+ TAILQ_FOREACH(dir, dirs, entries) { |
169 |
snprintf(file, sizeof(file), RC_SVCDIR "/scheduled/%s/%s", |
170 |
dir->value, service); |
171 |
if (exists(file)) |