clearlinux/systemd-stable
2
0
Fork 0
mirror of https://github.com/clearlinux/systemd-stable.git synced 2026-09-07 14:14:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1216 from poettering/coccinelle-fixes-2

Browse Source 
Coccinelle fixes 2
This commit is contained in:
Daniel Mack
2015-09-09 15:12:28 +02:00
parent 02736a9abc 57255510c9
commit d7acddde05
32 changed files with 164 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files
coccinelle/empty-if.cocci
+42 -5
View File
@@ -1,19 +1,56 @@
@@
expression e, f;
expression e, f, g, h, i, j;
statement s, t;
@@
(
if (e) {
if (f) s
(
if (h) s
|
if (h) s else t
|
while (h) s
|
for (h; i; j) s
)
}
|
if (e) {
if (f) s
else t
while (e) {
(
if (h) s
|
if (h) s else t
|
while (h) s
|
for (h; i; j) s
)
}
|
for (e; f; g) {
(
if (h) s
|
if (h) s else t
|
while (h) s
|
for (h; i; j) s
)
}
|
- if (e) {
+ if (e)
s
- }
|
- while (e) {
+ while (e)
s
- }
|
- for (e; f; g) {
+ for (e; f; g)
s
- }
)
coccinelle/errno.cocci
+24 -18
View File
@@ -1,42 +1,48 @@
@@
identifier r;
expression t, e;
expression e;
@@
- r = -e;
- log_error_errno(e, t);
+ r = log_error_errno(e, t);
- log_error_errno(e,
+ r = log_error_errno(e,
...);
@@
identifier r;
expression t, e;
expression e;
@@
- log_error_errno(e, t);
- log_error_errno(e,
+ r = log_error_errno(e,
...);
- r = -e;
+ r = log_error_errno(e, t);
@@
identifier r;
expression t, e;
expression e;
@@
- r = log_error_errno(e, t);
- r = log_error_errno(e,
+ return log_error_errno(e,
...);
- return r;
+ return log_error_errno(e, t);
@@
identifier r;
expression t, e;
expression e;
@@
- r = -e;
- log_warning_errno(e, t);
+ r = log_warning_errno(e, t);
- log_warning_errno(e,
+ r = log_warning_errno(e,
...);
@@
identifier r;
expression t, e;
expression e;
@@
- log_warning_errno(e, t);
- log_warning_errno(e,
+ r = log_warning_errno(e,
...);
- r = -e;
+ r = log_warning_errno(e, t);
@@
identifier r;
expression t, e;
expression e;
@@
- r = log_warning_errno(e, t);
- r = log_warning_errno(e,
+ return log_warning_errno(e,
...);
- return r;
+ return log_warning_errno(e, t);
coccinelle/while-true.cocci
+12
View File
@@ -0,0 +1,12 @@
@@
statement s;
@@
- while (true)
+ for (;;)
s
@@
statement s;
@@
- while (1)
+ for (;;)
s
src/boot/efi/graphics.c
+1 -2
View File
@@ -67,10 +67,9 @@ EFI_STATUS graphics_mode(BOOLEAN on) {
EFI_STATUS err;
err = LibLocateProtocol(&ConsoleControlProtocolGuid, (VOID **)&ConsoleControl);
if (EFI_ERROR(err)) {
if (EFI_ERROR(err))
/* console control protocol is nonstandard and might not exist. */
return err == EFI_NOT_FOUND ? EFI_SUCCESS : err;
}
/* check current mode */
err = uefi_call_wrapper(ConsoleControl->GetMode, 4, ConsoleControl, &current, &uga_exists, &stdin_locked);
src/bootchart/bootchart.c
+1 -2
View File
@@ -338,10 +338,9 @@ int main(int argc, char *argv[]) {
* - child logs data
*/
if (getpid() == 1) {
if (fork()) {
if (fork())
/* parent */
execl(arg_init_path, arg_init_path, NULL);
}
}
argv[0][0] = '@';
src/bootchart/svg.c
+1 -1
View File
@@ -888,7 +888,7 @@ static struct ps_struct *get_next_ps(struct ps_struct *ps, struct ps_struct *ps_
return ps->next;
/* go back for parent siblings */
while (1) {
for (;;) {
if (ps->parent && ps->parent->next)
return ps->parent->next;
src/core/execute.c
+1 -2
View File
@@ -1998,9 +1998,8 @@ void exec_context_done(ExecContext *c) {
strv_free(c->environment_files);
c->environment_files = NULL;
for (l = 0; l < ELEMENTSOF(c->rlimit); l++) {
for (l = 0; l < ELEMENTSOF(c->rlimit); l++)
c->rlimit[l] = mfree(c->rlimit[l]);
}
c->working_directory = mfree(c->working_directory);
c->root_directory = mfree(c->root_directory);
src/core/main.c
+1 -2
View File
@@ -1842,9 +1842,8 @@ finish:
arg_shutdown_watchdog = m->shutdown_watchdog;
m = manager_free(m);
for (j = 0; j < ELEMENTSOF(arg_default_rlimit); j++) {
for (j = 0; j < ELEMENTSOF(arg_default_rlimit); j++)
arg_default_rlimit[j] = mfree(arg_default_rlimit[j]);
}
arg_default_unit = mfree(arg_default_unit);
src/core/namespace.c
+7 -8
View File
@@ -294,15 +294,15 @@ static int mount_kdbus(BindMount *m) {
busnode = strjoina(root, "/bus");
if (mknod(busnode, (st.st_mode & ~07777) | 0600, st.st_rdev) < 0) {
log_error_errno(errno, "mknod() for %s failed: %m", busnode);
r = -errno;
r = log_error_errno(errno, "mknod() for %s failed: %m",
busnode);
goto fail;
}
r = mount(m->path, busnode, NULL, MS_BIND, NULL);
if (r < 0) {
log_error_errno(errno, "bind mount of %s failed: %m", m->path);
r = -errno;
r = log_error_errno(errno, "bind mount of %s failed: %m",
m->path);
goto fail;
}
@@ -313,8 +313,8 @@ static int mount_kdbus(BindMount *m) {
}
if (mount(root, basepath, NULL, MS_MOVE, NULL) < 0) {
log_error_errno(errno, "bind mount of %s failed: %m", basepath);
r = -errno;
r = log_error_errno(errno, "bind mount of %s failed: %m",
basepath);
goto fail;
}
@@ -555,10 +555,9 @@ int setup_namespace(
/* Remount / as the desired mode. Not that this will not
* reestablish propagation from our side to the host, since
* what's disconnected is disconnected. */
if (mount(NULL, "/", NULL, mount_flags | MS_REC, NULL) < 0) {
if (mount(NULL, "/", NULL, mount_flags | MS_REC, NULL) < 0)
/* at this point, we cannot rollback */
return -errno;
}
return 0;
src/core/service.c
+2 -5
View File
@@ -2937,14 +2937,11 @@ static void service_notify_message(Unit *u, pid_t pid, char **tags, FDSet *fds)
}
/* Interpret WATCHDOG= */
if (strv_find(tags, "WATCHDOG=1")) {
if (strv_find(tags, "WATCHDOG=1"))
service_reset_watchdog(s);
}
/* Add the passed fds to the fd store */
if (strv_find(tags, "FDSTORE=1")) {
if (strv_find(tags, "FDSTORE=1"))
service_add_fd_store_set(s, fds);
}
/* Notify clients about changed status or main pid */
if (notify_dbus)
src/debug-generator/debug-generator.c
+8 -8
View File
@@ -95,10 +95,10 @@ static int generate_mask_symlinks(void) {
if (!p)
return log_oom();
if (symlink("/dev/null", p) < 0) {
log_error_errno(errno, "Failed to create mask symlink %s: %m", p);
r = -errno;
}
if (symlink("/dev/null", p) < 0)
r = log_error_errno(errno,
"Failed to create mask symlink %s: %m",
p);
}
return r;
@@ -124,10 +124,10 @@ static int generate_wants_symlinks(void) {
mkdir_parents_label(p, 0755);
if (symlink(f, p) < 0) {
log_error_errno(errno, "Failed to create wants symlink %s: %m", p);
r = -errno;
}
if (symlink(f, p) < 0)
r = log_error_errno(errno,
"Failed to create wants symlink %s: %m",
p);
}
return r;
src/hostname/hostnamed.c
+1 -2
View File
@@ -63,9 +63,8 @@ static void context_reset(Context *c) {
assert(c);
for (p = 0; p < _PROP_MAX; p++) {
for (p = 0; p < _PROP_MAX; p++)
c->data[p] = mfree(c->data[p]);
}
}
static void context_free(Context *c) {
src/journal-remote/journal-remote-parse.c
+1 -1
View File
@@ -94,7 +94,7 @@ static int get_line(RemoteSource *source, char **line, size_t *size) {
assert(source->buf == NULL || source->size > 0);
assert(source->fd >= 0);
while (true) {
for (;;) {
if (source->buf) {
size_t start = MAX(source->scanned, source->offset);
src/journal-remote/journal-remote.c
+2 -3
View File
@@ -518,7 +518,7 @@ static int process_http_upload(
} else
finished = true;
while (true) {
for (;;) {
r = process_source(source, arg_compress, arg_seal);
if (r == -EAGAIN)
break;
@@ -614,10 +614,9 @@ static int request_handler(
return code;
} else {
r = getnameinfo_pretty(fd, &hostname);
if (r < 0) {
if (r < 0)
return mhd_respond(connection, MHD_HTTP_INTERNAL_SERVER_ERROR,
"Cannot check remote hostname");
}
}
assert(hostname);
src/journal-remote/journal-upload-journal.c
+1 -1
View File
@@ -17,7 +17,7 @@ static ssize_t write_entry(char *buf, size_t size, Uploader *u) {
assert(size <= SSIZE_MAX);
while (true) {
for (;;) {
switch(u->entry_state) {
case ENTRY_CURSOR: {
src/journal-remote/journal-upload.c
+1 -1
View File
@@ -828,7 +828,7 @@ int main(int argc, char **argv) {
"READY=1\n"
"STATUS=Processing input...");
while (true) {
for (;;) {
r = sd_event_get_state(u.events);
if (r < 0)
break;
src/journal/coredumpctl.c
+3 -2
View File
@@ -646,8 +646,9 @@ static int save_core(sd_journal *j, int fd, char **path, bool *unlink_temp) {
fdf = open(filename, O_RDONLY | O_CLOEXEC);
if (fdf < 0) {
log_error_errno(errno, "Failed to open %s: %m", filename);
r = -errno;
r = log_error_errno(errno,
"Failed to open %s: %m",
filename);
goto error;
}
src/journal/journalctl.c
+1 -2
View File
@@ -1453,8 +1453,7 @@ static int setup_keys(void) {
safe_close(fd);
fd = mkostemp_safe(k, O_WRONLY|O_CLOEXEC);
if (fd < 0) {
log_error_errno(errno, "Failed to open %s: %m", k);
r = -errno;
r = log_error_errno(errno, "Failed to open %s: %m", k);
goto finish;
}
src/journal/journald-native.c
+2
View File
@@ -184,6 +184,7 @@ void server_process_native_message(
free(identifier);
identifier = t;
}
} else if (l >= 8 &&
startswith(p, "MESSAGE=")) {
char *t;
@@ -193,6 +194,7 @@ void server_process_native_message(
free(message);
message = t;
}
} else if (l > strlen("OBJECT_PID=") &&
l < strlen("OBJECT_PID=") + DECIMAL_STR_MAX(pid_t) &&
startswith(p, "OBJECT_PID=") &&
src/libsystemd/sd-netlink/netlink-message.c
+1 -2
View File
@@ -892,9 +892,8 @@ int sd_netlink_message_rewind(sd_netlink_message *m) {
if (!m->sealed)
rtnl_message_seal(m);
for (i = 1; i <= m->n_containers; i++) {
for (i = 1; i <= m->n_containers; i++)
m->containers[i].attributes = mfree(m->containers[i].attributes);
}
m->n_containers = 0;
src/login/logind-session.c
+12 -8
View File
@@ -1005,22 +1005,25 @@ int session_prepare_vt(Session *s) {
r = fchown(vt, s->user->uid, -1);
if (r < 0) {
r = -errno;
log_error_errno(errno, "Cannot change owner of /dev/tty%u: %m", s->vtnr);
r = log_error_errno(errno,
"Cannot change owner of /dev/tty%u: %m",
s->vtnr);
goto error;
}
r = ioctl(vt, KDSKBMODE, K_OFF);
if (r < 0) {
r = -errno;
log_error_errno(errno, "Cannot set K_OFF on /dev/tty%u: %m", s->vtnr);
r = log_error_errno(errno,
"Cannot set K_OFF on /dev/tty%u: %m",
s->vtnr);
goto error;
}
r = ioctl(vt, KDSETMODE, KD_GRAPHICS);
if (r < 0) {
r = -errno;
log_error_errno(errno, "Cannot set KD_GRAPHICS on /dev/tty%u: %m", s->vtnr);
r = log_error_errno(errno,
"Cannot set KD_GRAPHICS on /dev/tty%u: %m",
s->vtnr);
goto error;
}
@@ -1032,8 +1035,9 @@ int session_prepare_vt(Session *s) {
mode.acqsig = SIGRTMIN + 1;
r = ioctl(vt, VT_SETMODE, &mode);
if (r < 0) {
r = -errno;
log_error_errno(errno, "Cannot set VT_PROCESS on /dev/tty%u: %m", s->vtnr);
r = log_error_errno(errno,
"Cannot set VT_PROCESS on /dev/tty%u: %m",
s->vtnr);
goto error;
}
src/shared/clean-ipc.c
+15 -10
View File
@@ -78,8 +78,9 @@ static int clean_sysvipc_shm(uid_t delete_uid) {
if (errno == EIDRM || errno == EINVAL)
continue;
log_warning_errno(errno, "Failed to remove SysV shared memory segment %i: %m", shmid);
ret = -errno;
ret = log_warning_errno(errno,
"Failed to remove SysV shared memory segment %i: %m",
shmid);
}
}
@@ -130,8 +131,9 @@ static int clean_sysvipc_sem(uid_t delete_uid) {
if (errno == EIDRM || errno == EINVAL)
continue;
log_warning_errno(errno, "Failed to remove SysV semaphores object %i: %m", semid);
ret = -errno;
ret = log_warning_errno(errno,
"Failed to remove SysV semaphores object %i: %m",
semid);
}
}
@@ -183,8 +185,9 @@ static int clean_sysvipc_msg(uid_t delete_uid) {
if (errno == EIDRM || errno == EINVAL)
continue;
log_warning_errno(errno, "Failed to remove SysV message queue %i: %m", msgid);
ret = -errno;
ret = log_warning_errno(errno,
"Failed to remove SysV message queue %i: %m",
msgid);
}
}
@@ -302,8 +305,9 @@ static int clean_posix_mq(uid_t uid) {
if (errno == ENOENT)
continue;
log_warning_errno(errno, "Failed to stat() MQ segment %s: %m", de->d_name);
ret = -errno;
ret = log_warning_errno(errno,
"Failed to stat() MQ segment %s: %m",
de->d_name);
continue;
}
@@ -317,8 +321,9 @@ static int clean_posix_mq(uid_t uid) {
if (errno == ENOENT)
continue;
log_warning_errno(errno, "Failed to unlink POSIX message queue %s: %m", fn);
ret = -errno;
ret = log_warning_errno(errno,
"Failed to unlink POSIX message queue %s: %m",
fn);
}
}
src/shared/pty.c
+2 -4
View File
@@ -311,9 +311,8 @@ static int pty_dispatch_read(Pty *pty) {
continue;
return (errno == EAGAIN) ? 0 : -errno;
} else if (len == 0) {
} else if (len == 0)
continue;
}
/* set terminating zero for debugging safety */
pty->in_buf[len] = 0;
@@ -356,9 +355,8 @@ static int pty_dispatch_write(Pty *pty) {
continue;
return (errno == EAGAIN) ? 1 : -errno;
} else if (len == 0) {
} else if (len == 0)
continue;
}
ring_pull(&pty->out_buf, (size_t)len);
}
src/test/test-ratelimit.c
+3 -6
View File
@@ -27,19 +27,16 @@ static void test_ratelimit_test(void) {
int i;
RATELIMIT_DEFINE(ratelimit, 1 * USEC_PER_SEC, 10);
for (i = 0; i < 10; i++) {
for (i = 0; i < 10; i++)
assert_se(ratelimit_test(&ratelimit));
}
assert_se(!ratelimit_test(&ratelimit));
sleep(1);
for (i = 0; i < 10; i++) {
for (i = 0; i < 10; i++)
assert_se(ratelimit_test(&ratelimit));
}
RATELIMIT_INIT(ratelimit, 0, 10);
for (i = 0; i < 10000; i++) {
for (i = 0; i < 10000; i++)
assert_se(ratelimit_test(&ratelimit));
}
}
int main(int argc, char *argv[]) {
src/udev/ata_id/ata_id.c
+1 -1
View File
@@ -432,7 +432,7 @@ int main(int argc, char *argv[])
if (udev == NULL)
return 0;
while (1) {
for (;;) {
int option;
option = getopt_long(argc, argv, "xh", options, NULL);
src/udev/cdrom_id/cdrom_id.c
+2 -3
View File
@@ -565,9 +565,8 @@ static int cd_profiles(struct udev *udev, int fd)
if (len > sizeof(features)) {
log_debug("can not get features in a single query, truncating");
len = sizeof(features);
} else if (len <= 8) {
} else if (len <= 8)
len = sizeof(features);
}
/* Now get the full feature buffer */
scsi_cmd_init(udev, &sc);
@@ -869,7 +868,7 @@ int main(int argc, char *argv[])
if (udev == NULL)
goto exit;
while (1) {
for (;;) {
int option;
option = getopt_long(argc, argv, "deluh", options, NULL);
src/udev/collect/collect.c
+1 -1
View File
@@ -364,7 +364,7 @@ int main(int argc, char **argv)
goto exit;
}
while (1) {
for (;;) {
int option;
option = getopt_long(argc, argv, "ardh", options, NULL);
src/udev/scsi_id/scsi_id.c
+6 -9
View File
@@ -190,7 +190,7 @@ static int get_file_options(struct udev *udev,
*newargv = NULL;
lineno = 0;
while (1) {
for (;;) {
vendor_in = model_in = options_in = NULL;
buf = fgets(buffer, MAX_BUFFER_LEN, f);
@@ -279,9 +279,9 @@ static int get_file_options(struct udev *udev,
strcpy(buffer, options_in);
c = argc_count(buffer) + 2;
*newargv = calloc(c, sizeof(**newargv));
if (!*newargv) {
if (!*newargv)
retval = log_oom();
} else {
else {
*argc = c;
c = 0;
/*
@@ -537,16 +537,13 @@ static int scsi_id(struct udev *udev, char *maj_min_dev)
if (dev_scsi.wwn_vendor_extension[0] != '\0') {
printf("ID_WWN_VENDOR_EXTENSION=0x%s\n", dev_scsi.wwn_vendor_extension);
printf("ID_WWN_WITH_EXTENSION=0x%s%s\n", dev_scsi.wwn, dev_scsi.wwn_vendor_extension);
} else {
} else
printf("ID_WWN_WITH_EXTENSION=0x%s\n", dev_scsi.wwn);
}
}
if (dev_scsi.tgpt_group[0] != '\0') {
if (dev_scsi.tgpt_group[0] != '\0')
printf("ID_TARGET_PORT=%s\n", dev_scsi.tgpt_group);
}
if (dev_scsi.unit_serial_number[0] != '\0') {
if (dev_scsi.unit_serial_number[0] != '\0')
printf("ID_SCSI_SERIAL=%s\n", dev_scsi.unit_serial_number);
}
goto out;
}
src/udev/scsi_id/scsi_serial.c
+2 -4
View File
@@ -135,9 +135,8 @@ static int sg_err_category_new(struct udev *udev,
return SG_ERR_CAT_MEDIA_CHANGED;
if (0x29 == asc)
return SG_ERR_CAT_RESET;
} else if (sense_key == ILLEGAL_REQUEST) {
} else if (sense_key == ILLEGAL_REQUEST)
return SG_ERR_CAT_NOTSUPPORTED;
}
}
return SG_ERR_CAT_SENSE;
}
@@ -490,9 +489,8 @@ static int check_fill_0x83_id(struct udev *udev,
if ((page_83[1] & 0x30) == 0x10) {
if (id_search->id_type != SCSI_ID_TGTGROUP)
return 1;
} else if ((page_83[1] & 0x30) != 0) {
} else if ((page_83[1] & 0x30) != 0)
return 1;
}
if ((page_83[1] & 0x0f) != id_search->id_type)
return 1;
src/udev/udev-builtin-keyboard.c
+1 -2
View File
@@ -255,9 +255,8 @@ static int builtin_keyboard(struct udev_device *dev, int argc, char *argv[], boo
}
override_abs(fd, node, evcode, udev_list_entry_get_value(entry));
} else if (streq(key, "POINTINGSTICK_SENSITIVITY")) {
} else if (streq(key, "POINTINGSTICK_SENSITIVITY"))
set_trackpoint_sensitivity(dev, udev_list_entry_get_value(entry));
}
}
/* install list of force-release codes */
src/udev/udev-rules.c
+4 -4
View File
@@ -1428,9 +1428,9 @@ static int add_rule(struct udev_rules *rules, char *line,
} else if ((rules->resolve_names > 0) && strchr("$%", value[0]) == NULL) {
uid = add_uid(rules, value);
rule_add_key(&rule_tmp, TK_A_OWNER_ID, op, NULL, &uid);
} else if (rules->resolve_names >= 0) {
} else if (rules->resolve_names >= 0)
rule_add_key(&rule_tmp, TK_A_OWNER, op, value, NULL);
}
rule_tmp.rule.rule.can_set_name = true;
continue;
}
@@ -1450,9 +1450,9 @@ static int add_rule(struct udev_rules *rules, char *line,
} else if ((rules->resolve_names > 0) && strchr("$%", value[0]) == NULL) {
gid = add_gid(rules, value);
rule_add_key(&rule_tmp, TK_A_GROUP_ID, op, NULL, &gid);
} else if (rules->resolve_names >= 0) {
} else if (rules->resolve_names >= 0)
rule_add_key(&rule_tmp, TK_A_GROUP, op, value, NULL);
}
rule_tmp.rule.rule.can_set_name = true;
continue;
}
src/udev/udev-watch.c
+2 -3
View File
@@ -83,9 +83,8 @@ unlink:
closedir(dir);
rmdir("/run/udev/watch.old");
} else if (errno != ENOENT) {
} else if (errno != ENOENT)
log_error_errno(errno, "unable to move watches dir /run/udev/watch; old watches will not be restored: %m");
}
}
void udev_watch_begin(struct udev *udev, struct udev_device *dev) {
@@ -100,7 +99,7 @@ void udev_watch_begin(struct udev *udev, struct udev_device *dev) {
wd = inotify_add_watch(inotify_fd, udev_device_get_devnode(dev), IN_CLOSE_WRITE);
if (wd < 0) {
log_error_errno(errno, "inotify_add_watch(%d, %s, %o) failed: %m",
inotify_fd, udev_device_get_devnode(dev), IN_CLOSE_WRITE);
inotify_fd, udev_device_get_devnode(dev), IN_CLOSE_WRITE);
return;
}