picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

tree-wide: use SET_FLAG() macro to make code more clear

Browse source
This commit is contained in:
Alexander Kuleshov 2016-03-03 23:30:37 +06:00
parent 9f0cd100d0
commit 5883ff6017
7 changed files with 12 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/libsystemd/sd-bus/bus-message.c
View file

@ -1131,10 +1131,7 @@ _public_ int sd_bus_message_set_expect_reply(sd_bus_message *m, int b) {
assert_return(!m->sealed, -EPERM);
assert_return(m->header->type == SD_BUS_MESSAGE_METHOD_CALL, -EPERM);
if (b)
m->header->flags &= ~BUS_MESSAGE_NO_REPLY_EXPECTED;
else
m->header->flags |= BUS_MESSAGE_NO_REPLY_EXPECTED;
SET_FLAG(m->header->flags, BUS_MESSAGE_NO_REPLY_EXPECTED, !b);
return 0;
}
@ -1143,10 +1140,7 @@ _public_ int sd_bus_message_set_auto_start(sd_bus_message *m, int b) {
assert_return(m, -EINVAL);
assert_return(!m->sealed, -EPERM);
if (b)
m->header->flags &= ~BUS_MESSAGE_NO_AUTO_START;
else
m->header->flags |= BUS_MESSAGE_NO_AUTO_START;
SET_FLAG(m->header->flags, BUS_MESSAGE_NO_AUTO_START, !b);
return 0;
}
@ -1155,10 +1149,7 @@ _public_ int sd_bus_message_set_allow_interactive_authorization(sd_bus_message *
assert_return(m, -EINVAL);
assert_return(!m->sealed, -EPERM);
if (b)
m->header->flags |= BUS_MESSAGE_ALLOW_INTERACTIVE_AUTHORIZATION;
else
m->header->flags &= ~BUS_MESSAGE_ALLOW_INTERACTIVE_AUTHORIZATION;
SET_FLAG(m->header->flags, BUS_MESSAGE_ALLOW_INTERACTIVE_AUTHORIZATION, b);
return 0;
}

5
src/libsystemd/sd-bus/sd-bus.c
View file

@ -313,10 +313,7 @@ _public_ int sd_bus_negotiate_creds(sd_bus *bus, int b, uint64_t mask) {
assert_return(!IN_SET(bus->state, BUS_CLOSING, BUS_CLOSED), -EPERM);
assert_return(!bus_pid_changed(bus), -ECHILD);
if (b)
bus->creds_mask |= mask;
else
bus->creds_mask &= ~mask;
SET_FLAG(bus->creds_mask, mask, b);
/* The well knowns we need unconditionally, so that matches can work */
bus->creds_mask |= SD_BUS_CREDS_WELL_KNOWN_NAMES|SD_BUS_CREDS_UNIQUE_NAME;

5
src/libsystemd/sd-netlink/netlink-message.c
View file

@ -107,10 +107,7 @@ int sd_netlink_message_request_dump(sd_netlink_message *m, int dump) {
m->hdr->nlmsg_type == RTM_GETNEIGH,
-EINVAL);
if (dump)
m->hdr->nlmsg_flags |= NLM_F_DUMP;
else
m->hdr->nlmsg_flags &= ~NLM_F_DUMP;
SET_FLAG(m->hdr->nlmsg_flags, NLM_F_DUMP, dump);
return 0;
}

5
src/network/networkd-network.c
View file

@ -629,10 +629,7 @@ int config_parse_ipv4ll(
* config_parse_address_family_boolean(), except that it
* applies only to IPv4 */
if (parse_boolean(rvalue))
*link_local |= ADDRESS_FAMILY_IPV4;
else
*link_local &= ~ADDRESS_FAMILY_IPV4;
SET_FLAG(*link_local, ADDRESS_FAMILY_IPV4, parse_boolean(rvalue));
return 0;
}

20
src/resolve/resolve-tool.c
View file

@ -1280,40 +1280,28 @@ static int parse_argv(int argc, char *argv[]) {
r = parse_boolean(optarg);
if (r < 0)
return log_error_errno(r, "Failed to parse --cname= argument.");
if (r == 0)
arg_flags |= SD_RESOLVED_NO_CNAME;
else
arg_flags &= ~SD_RESOLVED_NO_CNAME;
SET_FLAG(arg_flags, SD_RESOLVED_NO_CNAME, r == 0);
break;
case ARG_SERVICE_ADDRESS:
r = parse_boolean(optarg);
if (r < 0)
return log_error_errno(r, "Failed to parse --service-address= argument.");
if (r == 0)
arg_flags |= SD_RESOLVED_NO_ADDRESS;
else
arg_flags &= ~SD_RESOLVED_NO_ADDRESS;
SET_FLAG(arg_flags, SD_RESOLVED_NO_ADDRESS, r == 0);
break;
case ARG_SERVICE_TXT:
r = parse_boolean(optarg);
if (r < 0)
return log_error_errno(r, "Failed to parse --service-txt= argument.");
if (r == 0)
arg_flags |= SD_RESOLVED_NO_TXT;
else
arg_flags &= ~SD_RESOLVED_NO_TXT;
SET_FLAG(arg_flags, SD_RESOLVED_NO_TXT, r == 0);
break;
case ARG_SEARCH:
r = parse_boolean(optarg);
if (r < 0)
return log_error_errno(r, "Failed to parse --search argument.");
if (r == 0)
arg_flags |= SD_RESOLVED_NO_SEARCH;
else
arg_flags &= ~SD_RESOLVED_NO_SEARCH;
SET_FLAG(arg_flags, SD_RESOLVED_NO_SEARCH, r == 0);
break;
case ARG_STATISTICS:

5
src/shared/ptyfwd.c
View file

@ -461,10 +461,7 @@ int pty_forward_set_ignore_vhangup(PTYForward *f, bool b) {
if (!!(f->flags & PTY_FORWARD_IGNORE_VHANGUP) == b)
return 0;
if (b)
f->flags |= PTY_FORWARD_IGNORE_VHANGUP;
else
f->flags &= ~PTY_FORWARD_IGNORE_VHANGUP;
SET_FLAG(f->flags, PTY_FORWARD_IGNORE_VHANGUP, b);
if (!ignore_vhangup(f)) {

5
src/tmpfiles/tmpfiles.c
View file

@ -917,10 +917,7 @@ static int parse_attribute_from_arg(Item *item) {
v = attributes[i].value;
if (mode == MODE_ADD || mode == MODE_SET)
value |= v;
else
value &= ~v;
SET_FLAG(value, v, (mode == MODE_ADD || mode == MODE_SET));
mask |= v;
}