shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-22 17:35:35 +03:00
Code

hostnamed: minor style cleanups

Browse Source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2020-12-04 19:40:46 +01:00
parent efda832d4f
commit 536970d4f9
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/hostname/hostnamed.c
View File

@ -68,11 +68,9 @@ typedef struct Context {
} Context; } Context;
static void context_reset(Context *c, uint64_t mask) { static void context_reset(Context *c, uint64_t mask) {
int p;
assert(c); assert(c);
for (p = 0; p < _PROP_MAX; p++) { for (int p = 0; p < _PROP_MAX; p++) {
if (!FLAGS_SET(mask, UINT64_C(1) << p)) if (!FLAGS_SET(mask, UINT64_C(1) << p))
continue; continue;
@ -366,12 +364,11 @@ static int context_write_data_static_hostname(Context *c) {
assert(c); assert(c);
if (isempty(c->data[PROP_STATIC_HOSTNAME])) { if (isempty(c->data[PROP_STATIC_HOSTNAME])) {
if (unlink("/etc/hostname") < 0) if (unlink("/etc/hostname") < 0)
return errno == ENOENT ? 0 : -errno; return errno == ENOENT ? 0 : -errno;
return 0; return 0;
} }
return write_string_file_atomic_label("/etc/hostname", c->data[PROP_STATIC_HOSTNAME]); return write_string_file_atomic_label("/etc/hostname", c->data[PROP_STATIC_HOSTNAME]);
} }
@ -386,7 +383,7 @@ static int context_write_data_machine_info(Context *c) {
}; };
_cleanup_strv_free_ char **l = NULL; _cleanup_strv_free_ char **l = NULL;
int r, p; int r;
assert(c); assert(c);
@ -394,7 +391,7 @@ static int context_write_data_machine_info(Context *c) {
if (r < 0 && r != -ENOENT) if (r < 0 && r != -ENOENT)
return r; return r;
for (p = PROP_PRETTY_HOSTNAME; p <= PROP_LOCATION; p++) { for (int p = PROP_PRETTY_HOSTNAME; p <= PROP_LOCATION; p++) {
_cleanup_free_ char *t = NULL; _cleanup_free_ char *t = NULL;
char **u; char **u;

1
src/shared/hostname-setup.c
View File

@ -121,7 +121,6 @@ int read_etc_hostname(const char *path, char **ret) {
return -errno; return -errno;
return read_etc_hostname_stream(f, ret); return read_etc_hostname_stream(f, ret);
} }
static bool hostname_is_set(void) { static bool hostname_is_set(void) {