chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
execute: drop now unnecessary GCC pragma again
[elogind.git]
/
service.c
diff --git
a/service.c
b/service.c
index 2427f209731b6c9dda700c72da275ff52317615a..67950d4e649d587cf7f77930c926eee2093da7d7 100644
(file)
--- a/
service.c
+++ b/
service.c
@@
-130,13
+130,13
@@
static void service_dump(Unit *u, FILE *f, const char *prefix) {
ServiceExecCommand c;
Service *s = SERVICE(u);
ServiceExecCommand c;
Service *s = SERVICE(u);
- char *prefix2;
+ const char *prefix2;
+ char *p2;
assert(s);
assert(s);
- prefix2 = strappend(prefix, "\t");
- if (!prefix2)
- prefix2 = "";
+ p2 = strappend(prefix, "\t");
+ prefix2 = p2 ? p2 : prefix;
fprintf(f,
"%sService State: %s\n",
fprintf(f,
"%sService State: %s\n",
@@
-161,7
+161,7
@@
static void service_dump(Unit *u, FILE *f, const char *prefix) {
exec_command_dump_list(s->exec_command[c], f, prefix2);
}
exec_command_dump_list(s->exec_command[c], f, prefix2);
}
- free(p
refix
2);
+ free(p2);
}
static int service_load_pid_file(Service *s) {
}
static int service_load_pid_file(Service *s) {
@@
-243,7
+243,7
@@
fail:
static int service_notify_sockets(Service *s) {
Iterator i;
Set *set;
static int service_notify_sockets(Service *s) {
Iterator i;
Set *set;
- Socket *sock
et
;
+ Socket *sock;
int r;
assert(s);
int r;
assert(s);
@@
-253,8
+253,8
@@
static int service_notify_sockets(Service *s) {
if ((r = service_get_sockets(s, &set)) < 0)
return r;
if ((r = service_get_sockets(s, &set)) < 0)
return r;
- SET_FOREACH(sock
et
, set, i)
- socket_notify_service_dead(sock
et
);
+ SET_FOREACH(sock, set, i)
+ socket_notify_service_dead(sock);
set_free(set);
set_free(set);
@@
-338,7
+338,7
@@
static int service_collect_fds(Service *s, int **fds, unsigned *n_fds) {
int *rfds = NULL;
unsigned rn_fds = 0;
Set *set;
int *rfds = NULL;
unsigned rn_fds = 0;
Set *set;
- Socket *sock
et
;
+ Socket *sock;
assert(s);
assert(fds);
assert(s);
assert(fds);
@@
-347,11
+347,11
@@
static int service_collect_fds(Service *s, int **fds, unsigned *n_fds) {
if ((r = service_get_sockets(s, &set)) < 0)
return r;
if ((r = service_get_sockets(s, &set)) < 0)
return r;
- SET_FOREACH(sock
et
, set, i) {
+ SET_FOREACH(sock, set, i) {
int *cfds;
unsigned cn_fds;
int *cfds;
unsigned cn_fds;
- if ((r = socket_collect_fds(sock
et
, &cfds, &cn_fds)) < 0)
+ if ((r = socket_collect_fds(sock, &cfds, &cn_fds)) < 0)
goto fail;
if (!cfds)
goto fail;
if (!cfds)