dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-08-03 22:50:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolvectl,systemctl: reduce scope of variables

Browse Source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2020-06-02 17:46:58 +02:00
parent 6cf3011c6c
commit c9d243cdef
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/resolve/resolvectl.c
View File

@@ -1753,7 +1753,6 @@ static int status_global(sd_bus *bus, StatusMode mode, bool *empty_line) {
static int status_all(sd_bus *bus, StatusMode mode) {
_cleanup_(sd_netlink_message_unrefp) sd_netlink_message *req = NULL, *reply = NULL;
_cleanup_(sd_netlink_unrefp) sd_netlink *rtnl = NULL;
sd_netlink_message *i;
bool empty_line = false;
int r;
@@ -1780,7 +1779,7 @@ static int status_all(sd_bus *bus, StatusMode mode) {
return log_error_errno(r, "Failed to enumerate links: %m");
r = 0;
for (i = reply; i; i = sd_netlink_message_next(i)) {
for (sd_netlink_message *i = reply; i; i = sd_netlink_message_next(i)) {
const char *name;
int ifindex, q;
uint16_t type;
@@ -3033,7 +3032,7 @@ static int native_main(int argc, char *argv[], sd_bus *bus) {
static int translate(const char *verb, const char *single_arg, size_t num_args, char **args, sd_bus *bus) {
char **fake, **p;
size_t num, i;
size_t num;
assert(verb);
assert(num_args == 0 || args);
@@ -3044,7 +3043,7 @@ static int translate(const char *verb, const char *single_arg, size_t num_args,
*p++ = (char *) verb;
if (single_arg)
*p++ = (char *) single_arg;
for (i = 0; i < num_args; i++)
for (size_t i = 0; i < num_args; i++)
*p++ = args[i];
optind = 0;

5
src/systemctl/systemctl.c
View File

@@ -397,8 +397,6 @@ static int output_table(Table *table) {
static int output_units_list(const UnitInfo *unit_infos, unsigned c) {
_cleanup_(table_unrefp) Table *table = NULL;
const UnitInfo *u;
int job_count = 0;
int r;
table = table_new("", "unit", "load", "active", "sub", "job", "description");
@@ -417,7 +415,8 @@ static int output_units_list(const UnitInfo *unit_infos, unsigned c) {
(void) table_set_empty_string(table, "-");
for (u = unit_infos; unit_infos && u < unit_infos + c; u++) {
int job_count = 0;
for (const UnitInfo *u = unit_infos; unit_infos && u < unit_infos + c; u++) {
_cleanup_free_ char *j = NULL;
const char *on_underline = "", *on_loaded = "", *on_active = "";
const char *on_circle = "", *id;