tree-wide: coccinelle fixes
This commit is contained in:
parent
135a9868a7
commit
1d6cc5d0e5
|
@ -45,7 +45,7 @@ static int unlinkat_harder(
|
||||||
return -errno;
|
return -errno;
|
||||||
if (!S_ISDIR(st.st_mode))
|
if (!S_ISDIR(st.st_mode))
|
||||||
return -ENOTDIR;
|
return -ENOTDIR;
|
||||||
if ((st.st_mode & 0700) == 0700) /* Already set? */
|
if (FLAGS_SET(st.st_mode, 0700)) /* Already set? */
|
||||||
return -EACCES; /* original error */
|
return -EACCES; /* original error */
|
||||||
if (st.st_uid != geteuid()) /* this only works if the UID matches ours */
|
if (st.st_uid != geteuid()) /* this only works if the UID matches ours */
|
||||||
return -EACCES;
|
return -EACCES;
|
||||||
|
|
|
@ -5502,7 +5502,7 @@ void unit_remove_dependencies(Unit *u, UnitDependencyMask mask) {
|
||||||
done = true;
|
done = true;
|
||||||
|
|
||||||
HASHMAP_FOREACH_KEY(di.data, other, u->dependencies[d]) {
|
HASHMAP_FOREACH_KEY(di.data, other, u->dependencies[d]) {
|
||||||
if ((di.origin_mask & ~mask) == di.origin_mask)
|
if (FLAGS_SET(~mask, di.origin_mask))
|
||||||
continue;
|
continue;
|
||||||
di.origin_mask &= ~mask;
|
di.origin_mask &= ~mask;
|
||||||
unit_update_dependency_mask(u, d, other, di);
|
unit_update_dependency_mask(u, d, other, di);
|
||||||
|
@ -5516,7 +5516,7 @@ void unit_remove_dependencies(Unit *u, UnitDependencyMask mask) {
|
||||||
UnitDependencyInfo dj;
|
UnitDependencyInfo dj;
|
||||||
|
|
||||||
dj.data = hashmap_get(other->dependencies[q], u);
|
dj.data = hashmap_get(other->dependencies[q], u);
|
||||||
if ((dj.destination_mask & ~mask) == dj.destination_mask)
|
if (FLAGS_SET(~mask, dj.destination_mask))
|
||||||
continue;
|
continue;
|
||||||
dj.destination_mask &= ~mask;
|
dj.destination_mask &= ~mask;
|
||||||
|
|
||||||
|
|
|
@ -779,7 +779,7 @@ int dhcp_lease_parse_search_domains(const uint8_t *option, size_t len, char ***d
|
||||||
return r;
|
return r;
|
||||||
|
|
||||||
n += r;
|
n += r;
|
||||||
} else if ((c & 0xc0) == 0xc0) {
|
} else if (FLAGS_SET(c, 0xc0)) {
|
||||||
/* Pointer */
|
/* Pointer */
|
||||||
|
|
||||||
uint8_t d;
|
uint8_t d;
|
||||||
|
|
|
@ -270,7 +270,7 @@ static int dhcp6_client_set_duid_internal(
|
||||||
assert_return(duid_len == 0 || duid != NULL, -EINVAL);
|
assert_return(duid_len == 0 || duid != NULL, -EINVAL);
|
||||||
assert_return(IN_SET(client->state, DHCP6_STATE_STOPPED), -EBUSY);
|
assert_return(IN_SET(client->state, DHCP6_STATE_STOPPED), -EBUSY);
|
||||||
|
|
||||||
if (duid != NULL) {
|
if (duid) {
|
||||||
r = dhcp_validate_duid_len(duid_type, duid_len, true);
|
r = dhcp_validate_duid_len(duid_type, duid_len, true);
|
||||||
if (r < 0) {
|
if (r < 0) {
|
||||||
r = dhcp_validate_duid_len(duid_type, duid_len, false);
|
r = dhcp_validate_duid_len(duid_type, duid_len, false);
|
||||||
|
|
|
@ -363,7 +363,7 @@ int calendar_spec_to_string(const CalendarSpec *c, char **p) {
|
||||||
|
|
||||||
if (c->utc)
|
if (c->utc)
|
||||||
fputs(" UTC", f);
|
fputs(" UTC", f);
|
||||||
else if (c->timezone != NULL) {
|
else if (c->timezone) {
|
||||||
fputc(' ', f);
|
fputc(' ', f);
|
||||||
fputs(c->timezone, f);
|
fputs(c->timezone, f);
|
||||||
} else if (IN_SET(c->dst, 0, 1)) {
|
} else if (IN_SET(c->dst, 0, 1)) {
|
||||||
|
|
|
@ -124,7 +124,7 @@ int path_chown_recursive(
|
||||||
if (fd < 0)
|
if (fd < 0)
|
||||||
return -errno;
|
return -errno;
|
||||||
|
|
||||||
if (!uid_is_valid(uid) && !gid_is_valid(gid) && (mask & 07777) == 07777)
|
if (!uid_is_valid(uid) && !gid_is_valid(gid) && FLAGS_SET(mask, 07777))
|
||||||
return 0; /* nothing to do */
|
return 0; /* nothing to do */
|
||||||
|
|
||||||
if (fstat(fd, &st) < 0)
|
if (fstat(fd, &st) < 0)
|
||||||
|
@ -160,7 +160,7 @@ int fd_chown_recursive(
|
||||||
if (!S_ISDIR(st.st_mode))
|
if (!S_ISDIR(st.st_mode))
|
||||||
return -ENOTDIR;
|
return -ENOTDIR;
|
||||||
|
|
||||||
if (!uid_is_valid(uid) && !gid_is_valid(gid) && (mask & 07777) == 07777)
|
if (!uid_is_valid(uid) && !gid_is_valid(gid) && FLAGS_SET(mask, 07777))
|
||||||
return 0; /* nothing to do */
|
return 0; /* nothing to do */
|
||||||
|
|
||||||
/* Shortcut, as above */
|
/* Shortcut, as above */
|
||||||
|
|
|
@ -46,7 +46,7 @@ static void test_tmpdir(const char *id, const char *A, const char *B) {
|
||||||
c = strjoina(a, "/tmp");
|
c = strjoina(a, "/tmp");
|
||||||
assert_se(stat(c, &x) >= 0);
|
assert_se(stat(c, &x) >= 0);
|
||||||
assert_se(S_ISDIR(x.st_mode));
|
assert_se(S_ISDIR(x.st_mode));
|
||||||
assert_se((x.st_mode & 01777) == 01777);
|
assert_se(FLAGS_SET(x.st_mode, 01777));
|
||||||
assert_se(rmdir(c) >= 0);
|
assert_se(rmdir(c) >= 0);
|
||||||
assert_se(rmdir(a) >= 0);
|
assert_se(rmdir(a) >= 0);
|
||||||
}
|
}
|
||||||
|
@ -57,7 +57,7 @@ static void test_tmpdir(const char *id, const char *A, const char *B) {
|
||||||
d = strjoina(b, "/tmp");
|
d = strjoina(b, "/tmp");
|
||||||
assert_se(stat(d, &y) >= 0);
|
assert_se(stat(d, &y) >= 0);
|
||||||
assert_se(S_ISDIR(y.st_mode));
|
assert_se(S_ISDIR(y.st_mode));
|
||||||
assert_se((y.st_mode & 01777) == 01777);
|
assert_se(FLAGS_SET(y.st_mode, 01777));
|
||||||
assert_se(rmdir(d) >= 0);
|
assert_se(rmdir(d) >= 0);
|
||||||
assert_se(rmdir(b) >= 0);
|
assert_se(rmdir(b) >= 0);
|
||||||
}
|
}
|
||||||
|
|
|
@ -236,7 +236,7 @@ static int get_file_options(const char *vendor, const char *model,
|
||||||
retval = -1;
|
retval = -1;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
if (vendor == NULL) {
|
if (!vendor) {
|
||||||
if (!vendor_in)
|
if (!vendor_in)
|
||||||
break;
|
break;
|
||||||
} else if (vendor_in &&
|
} else if (vendor_in &&
|
||||||
|
|
Loading…
Reference in a new issue