shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-12 09:17:44 +03:00
Code

gcc: make a couple of gcc warnings go away

Browse Source
This commit is contained in:
Lennart Poettering 2010-03-31 20:08:05 +02:00
parent 8e27452380
commit b866264a18
5 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
device.c
View File

@ -186,8 +186,10 @@ static int device_process_new_device(Manager *m, struct udev_device *dev, bool u
if (names) {
FOREACH_WORD(w, l, names, state) {
if (!(e = strndup(w, l)))
if (!(e = strndup(w, l))) {
r = -ENOMEM;
goto fail;
}
r = unit_add_name(u, e);
free(e);
@ -199,8 +201,10 @@ static int device_process_new_device(Manager *m, struct udev_device *dev, bool u
if (wants) {
FOREACH_WORD(w, l, wants, state) {
if (!(e = strndup(w, l)))
if (!(e = strndup(w, l))) {
r = -ENOMEM;
goto fail;
}
r = unit_add_dependency_by_name(u, UNIT_WANTS, e);
free(e);

2
job.c
View File

@ -410,7 +410,7 @@ int job_run_and_invalidate(Job *j) {
int job_finish_and_invalidate(Job *j, bool success) {
Unit *u;
Unit *other;
UnitType t;
JobType t;
Iterator i;
assert(j);

2
service.c
View File

@ -1436,7 +1436,7 @@ static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) {
* don't care about failing commands. */
if (s->control_command->command_next &&
(success || (s->state == SERVICE_EXEC_STOP || s->state == SERVICE_EXEC_STOP_POST)))
(success || (s->state == SERVICE_STOP || s->state == SERVICE_STOP_POST)))
/* There is another command to *
* execute, so let's do that. */

2
socket.c
View File

@ -701,7 +701,7 @@ static void socket_sigchld_event(Unit *u, pid_t pid, int code, int status) {
log_debug("%s control process exited, code=%s status=%i", unit_id(u), sigchld_code_to_string(code), status);
if (s->control_command->command_next &&
(success || (s->state == SOCKET_EXEC_STOP_PRE || s->state == SOCKET_EXEC_STOP_POST))) {
(success || (s->state == SOCKET_STOP_PRE || s->state == SOCKET_STOP_POST))) {
log_debug("%s running next command for the state %s", unit_id(u), state_string_table[s->state]);
socket_run_next(s, success);
} else {

4
util.c
View File

@ -903,8 +903,8 @@ char *xescape(const char *s, const char *bad) {
for (f = s, t = r; *f; f++) {
if (*f < ' ' || *f >= 127 ||
*f == '\\' || strchr(bad, *f)) {
if ((*f < ' ') || (*f >= 127) ||
(*f == '\\') || strchr(bad, *f)) {
*(t++) = '\\';
*(t++) = 'x';
*(t++) = hexchar(*f >> 4);