shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-03-08 20:58:20 +03:00
Code

tree-wide: avoid uninitialized warning on _cleanup_ variables

Browse Source 
With some versions of the compiler, the _cleanup_ attr makes it think
the variable might be freed/closed when uninitialized, even though it
cannot happen. The added cost is small enough to be worth the benefit,
and optimized builds will help reduce it even further.
This commit is contained in:
Luca Boccassi 2021-04-12 23:10:21 +01:00
parent be084c0dd1
commit c2b2df604b
61 changed files with 106 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/activate/activate.c
View File

@ -151,7 +151,7 @@ static int exec_process(const char *name, char **argv, char **env, int start_fd,
envp[n_env++] = k;
} else {
_cleanup_free_ char *p;
_cleanup_free_ char *p = NULL;
const char *n;
p = strjoin(*s, "=");
@ -421,7 +421,7 @@ static int parse_argv(int argc, char *argv[]) {
break;
case ARG_FDNAME: {
_cleanup_strv_free_ char **names;
_cleanup_strv_free_ char **names = NULL;
char **s;
names = strv_split(optarg, ":");
@ -430,7 +430,7 @@ static int parse_argv(int argc, char *argv[]) {
STRV_FOREACH(s, names)
if (!fdname_is_valid(*s)) {
_cleanup_free_ char *esc;
_cleanup_free_ char *esc = NULL;
esc = cescape(*s);
log_warning("File descriptor name \"%s\" is not valid.", esc);

2
src/basic/efivars.c
View File

@ -350,7 +350,7 @@ int cache_efi_options_variable(void) {
* (NB: For testing purposes, we still check the $SYSTEMD_EFI_OPTIONS env var before accessing this
* cache, even when in SecureBoot mode.) */
if (is_efi_secure_boot()) {
_cleanup_free_ char *k;
_cleanup_free_ char *k = NULL;
k = efi_variable_path(EFI_VENDOR_SYSTEMD, "SystemdOptions");
if (!k)

2
src/basic/path-lookup.c
View File

@ -772,7 +772,7 @@ void lookup_paths_log(LookupPaths *p) {
log_debug("Ignoring unit files.");
p->search_path = strv_free(p->search_path);
} else {
_cleanup_free_ char *t;
_cleanup_free_ char *t = NULL;
t = strv_join(p->search_path, "\n\t");
log_debug("Looking for unit files in (higher priority first):\n\t%s", strna(t));

4
src/basic/terminal-util.c
View File

@ -52,7 +52,7 @@ static volatile int cached_color_mode = _COLOR_INVALID;
static volatile int cached_underline_enabled = -1;
int chvt(int vt) {
_cleanup_close_ int fd;
_cleanup_close_ int fd = -1;
/* Switch to the specified vt number. If the VT is specified <= 0 switch to the VT the kernel log messages go,
* if that's configured. */
@ -514,7 +514,7 @@ int terminal_vhangup_fd(int fd) {
}
int terminal_vhangup(const char *name) {
_cleanup_close_ int fd;
_cleanup_close_ int fd = -1;
fd = open_terminal(name, O_RDWR|O_NOCTTY|O_CLOEXEC|O_NONBLOCK);
if (fd < 0)

2
src/basic/time-util.c
View File

@ -1547,7 +1547,7 @@ int time_change_fd(void) {
.it_value.tv_sec = TIME_T_MAX,
};
_cleanup_close_ int fd;
_cleanup_close_ int fd = -1;
assert_cc(sizeof(time_t) == sizeof(TIME_T_MAX));

2
src/boot/bless-boot.c
View File

@ -126,7 +126,7 @@ static int acquire_path(void) {
strv_free_and_replace(arg_path, a);
if (DEBUG_LOGGING) {
_cleanup_free_ char *j;
_cleanup_free_ char *j = NULL;
j = strv_join(arg_path, ":");
log_debug("Using %s as boot loader drop-in search path.", j);

2
src/boot/bootctl.c
View File

@ -312,7 +312,7 @@ static int status_variables(void) {
}
static int boot_entry_file_check(const char *root, const char *p) {
_cleanup_free_ char *path;
_cleanup_free_ char *path = NULL;
path = path_join(root, p);
if (!path)

2
src/boot/efi/boot.c
View File

@ -456,7 +456,7 @@ static VOID print_status(Config *config, CHAR16 *loaded_image_path) {
device_path = DevicePathFromHandle(entry->device);
if (device_path) {
_cleanup_freepool_ CHAR16 *str;
_cleanup_freepool_ CHAR16 *str = NULL;
str = DevicePathToStr(device_path);
Print(L"device handle '%s'\n", str);

6
src/boot/efi/stub.c
View File

@ -92,7 +92,7 @@ EFI_STATUS efi_main(EFI_HANDLE image, EFI_SYSTEM_TABLE *sys_table) {
* is non-NULL explicitly.) */
if (efivar_get_raw(LOADER_GUID, L"LoaderImageIdentifier", NULL, NULL) != EFI_SUCCESS &&
loaded_image->FilePath) {
_cleanup_freepool_ CHAR16 *s;
_cleanup_freepool_ CHAR16 *s = NULL;
s = DevicePathToStr(loaded_image->FilePath);
efivar_set(LOADER_GUID, L"LoaderImageIdentifier", s, 0);
@ -100,7 +100,7 @@ EFI_STATUS efi_main(EFI_HANDLE image, EFI_SYSTEM_TABLE *sys_table) {
/* if LoaderFirmwareInfo is not set, let's set it */
if (efivar_get_raw(LOADER_GUID, L"LoaderFirmwareInfo", NULL, NULL) != EFI_SUCCESS) {
_cleanup_freepool_ CHAR16 *s;
_cleanup_freepool_ CHAR16 *s = NULL;
s = PoolPrint(L"%s %d.%02d", ST->FirmwareVendor, ST->FirmwareRevision >> 16, ST->FirmwareRevision & 0xffff);
efivar_set(LOADER_GUID, L"LoaderFirmwareInfo", s, 0);
@ -108,7 +108,7 @@ EFI_STATUS efi_main(EFI_HANDLE image, EFI_SYSTEM_TABLE *sys_table) {
/* ditto for LoaderFirmwareType */
if (efivar_get_raw(LOADER_GUID, L"LoaderFirmwareType", NULL, NULL) != EFI_SUCCESS) {
_cleanup_freepool_ CHAR16 *s;
_cleanup_freepool_ CHAR16 *s = NULL;
s = PoolPrint(L"UEFI %d.%02d", ST->Hdr.Revision >> 16, ST->Hdr.Revision & 0xffff);
efivar_set(LOADER_GUID, L"LoaderFirmwareType", s, 0);

2
src/boot/efi/util.c
View File

@ -379,7 +379,7 @@ EFI_STATUS file_read(EFI_FILE_HANDLE dir, const CHAR16 *name, UINTN off, UINTN s
return err;
if (size == 0) {
_cleanup_freepool_ EFI_FILE_INFO *info;
_cleanup_freepool_ EFI_FILE_INFO *info = NULL;
info = LibFileInfo(handle);
if (!info)

8
src/busctl/busctl.c
View File

@ -797,7 +797,7 @@ static Set* member_set_free(Set *s) {
DEFINE_TRIVIAL_CLEANUP_FUNC(Set*, member_set_free);
static int on_interface(const char *interface, uint64_t flags, void *userdata) {
_cleanup_(member_freep) Member *m;
_cleanup_(member_freep) Member *m = NULL;
Set *members = userdata;
int r;
@ -828,7 +828,7 @@ static int on_interface(const char *interface, uint64_t flags, void *userdata) {
}
static int on_method(const char *interface, const char *name, const char *signature, const char *result, uint64_t flags, void *userdata) {
_cleanup_(member_freep) Member *m;
_cleanup_(member_freep) Member *m = NULL;
Set *members = userdata;
int r;
@ -871,7 +871,7 @@ static int on_method(const char *interface, const char *name, const char *signat
}
static int on_signal(const char *interface, const char *name, const char *signature, uint64_t flags, void *userdata) {
_cleanup_(member_freep) Member *m;
_cleanup_(member_freep) Member *m = NULL;
Set *members = userdata;
int r;
@ -910,7 +910,7 @@ static int on_signal(const char *interface, const char *name, const char *signat
}
static int on_property(const char *interface, const char *name, const char *signature, bool writable, uint64_t flags, void *userdata) {
_cleanup_(member_freep) Member *m;
_cleanup_(member_freep) Member *m = NULL;
Set *members = userdata;
int r;

4
src/core/dbus-execute.c
View File

@ -1627,7 +1627,7 @@ int bus_exec_context_set_transient_property(
unit_write_settingf(u, flags, name, "RootHash=");
} else {
_cleanup_free_ void *p;
_cleanup_free_ void *p = NULL;
encoded = hexmem(roothash_decoded, roothash_decoded_size);
if (!encoded)
@ -1673,7 +1673,7 @@ int bus_exec_context_set_transient_property(
unit_write_settingf(u, flags, name, "RootHashSignature=");
} else {
_cleanup_free_ void *p;
_cleanup_free_ void *p = NULL;
ssize_t len;
len = base64mem(roothash_sig_decoded, roothash_sig_decoded_size, &encoded);

2
src/core/dbus-path.c
View File

@ -96,7 +96,7 @@ static int bus_path_set_transient_property(
return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Path in %s is not absolute: %s", type_name, path);
if (!UNIT_WRITE_FLAGS_NOOP(flags)) {
_cleanup_free_ char *k;
_cleanup_free_ char *k = NULL;
PathSpec *s;
k = strdup(path);

4
src/core/execute.c
View File

@ -4639,7 +4639,7 @@ static int exec_child(
final_argv = command->argv;
if (DEBUG_LOGGING) {
_cleanup_free_ char *line;
_cleanup_free_ char *line = NULL;
line = exec_command_line(final_argv);
if (line)
@ -4933,7 +4933,7 @@ int exec_context_destroy_runtime_directory(const ExecContext *c, const char *run
return 0;
STRV_FOREACH(i, c->directories[EXEC_DIRECTORY_RUNTIME].paths) {
_cleanup_free_ char *p;
_cleanup_free_ char *p = NULL;
if (exec_directory_is_private(c, EXEC_DIRECTORY_RUNTIME))
p = path_join(runtime_prefix, "private", *i);

2
src/core/job.c
View File

@ -844,7 +844,7 @@ static void job_print_done_status_message(Unit *u, JobType t, JobResult result)
REENABLE_WARNING;
if (t == JOB_START && result == JOB_FAILED) {
_cleanup_free_ char *quoted;
_cleanup_free_ char *quoted = NULL;
quoted = shell_maybe_quote(u->id, ESCAPE_BACKSLASH);
manager_status_printf(u->manager, STATUS_TYPE_NORMAL, NULL, "See 'systemctl status %s' for details.", strna(quoted));

2
src/core/main.c
View File

@ -2036,7 +2036,7 @@ static void log_execution_mode(bool *ret_first_boot) {
}
} else {
if (DEBUG_LOGGING) {
_cleanup_free_ char *t;
_cleanup_free_ char *t = NULL;
t = uid_to_name(getuid());
log_debug("systemd " GIT_VERSION " running in %suser mode for user " UID_FMT "/%s. (%s)",

2
src/core/manager.c
View File

@ -248,7 +248,7 @@ static void manager_print_jobs_in_progress(Manager *m) {
}
static int have_ask_password(void) {
_cleanup_closedir_ DIR *dir;
_cleanup_closedir_ DIR *dir = NULL;
struct dirent *de;
dir = opendir("/run/systemd/ask-password");

4
src/core/namespace.c
View File

@ -2092,7 +2092,7 @@ int setup_namespace(
}
if (log_namespace) {
_cleanup_free_ char *q;
_cleanup_free_ char *q = NULL;
q = strjoin("/run/systemd/journal.", log_namespace);
if (!q) {
@ -2331,7 +2331,7 @@ int mount_image_add(MountImage **m, size_t *n, const MountImage *item) {
}
LIST_FOREACH(mount_options, i, item->mount_options) {
_cleanup_(mount_options_free_allp) MountOptions *o;
_cleanup_(mount_options_free_allp) MountOptions *o = NULL;
o = new(MountOptions, 1);
if (!o)

2
src/core/service.c
View File

@ -4269,7 +4269,7 @@ int service_set_socket_fd(Service *s, int fd, Socket *sock, bool selinux_context
if (getpeername_pretty(fd, true, &peer) >= 0) {
if (UNIT(s)->description) {
_cleanup_free_ char *a;
_cleanup_free_ char *a = NULL;
a = strjoin(UNIT(s)->description, " (", peer, ")");
if (!a)

6
src/core/unit.c
View File

@ -557,7 +557,7 @@ static void unit_free_requires_mounts_for(Unit *u) {
assert(u);
for (;;) {
_cleanup_free_ char *path;
_cleanup_free_ char *path = NULL;
path = hashmap_steal_first_key(u->requires_mounts_for);
if (!path)
@ -1063,7 +1063,7 @@ int unit_add_exec_dependencies(Unit *u, ExecContext *c) {
char **dp;
STRV_FOREACH(dp, c->directories[dt].paths) {
_cleanup_free_ char *p;
_cleanup_free_ char *p = NULL;
p = path_join(u->manager->prefix[dt], *dp);
if (!p)
@ -2184,7 +2184,7 @@ static int unit_log_resources(Unit *u) {
if (n_message_parts == 0)
t = strjoina("MESSAGE=", u->id, ": Completed.");
else {
_cleanup_free_ char *joined;
_cleanup_free_ char *joined = NULL;
message_parts[n_message_parts] = NULL;

2
src/coredump/coredump.c
View File

@ -588,7 +588,7 @@ static int compose_open_fds(pid_t pid, char **open_fds) {
static int get_process_ns(pid_t pid, const char *namespace, ino_t *ns) {
const char *p;
struct stat stbuf;
_cleanup_close_ int proc_ns_dir_fd;
_cleanup_close_ int proc_ns_dir_fd = -1;
p = procfs_file_alloca(pid, "ns");

4
src/coredump/coredumpctl.c
View File

@ -139,7 +139,7 @@ static int acquire_journal(sd_journal **ret, char **matches) {
return r;
if (DEBUG_LOGGING) {
_cleanup_free_ char *filter;
_cleanup_free_ char *filter = NULL;
filter = journal_make_match_string(j);
log_debug("Journal filter: %s", filter);
@ -979,7 +979,7 @@ static int save_core(sd_journal *j, FILE *file, char **path, bool *unlink_temp)
if (filename) {
#if HAVE_COMPRESSION
_cleanup_close_ int fdf;
_cleanup_close_ int fdf = -1;
fdf = open(filename, O_RDONLY | O_CLOEXEC);
if (fdf < 0) {

2
src/cryptsetup/cryptsetup-keyfile.c
View File

@ -33,7 +33,7 @@ int find_key_file(
}
STRV_FOREACH(i, search_path) {
_cleanup_free_ char *joined;
_cleanup_free_ char *joined = NULL;
joined = path_join(*i, key_file);
if (!joined)

2
src/environment-d-generator/environment-d-generator.c
View File

@ -29,7 +29,7 @@ static int environment_dirs(char ***ret) {
return r;
if (DEBUG_LOGGING) {
_cleanup_free_ char *t;
_cleanup_free_ char *t = NULL;
t = strv_join(dirs, "\n\t");
log_debug("Looking for environment.d files in (higher priority first):\n\t%s", strna(t));

2
src/fstab-generator/fstab-generator.c
View File

@ -460,7 +460,7 @@ static int add_mount(
return r;
if (!isempty(fstype) && !streq(fstype, "auto")) {
_cleanup_free_ char *t;
_cleanup_free_ char *t = NULL;
t = specifier_escape(fstype);
if (!t)

2
src/journal-remote/journal-gatewayd.c
View File

@ -311,7 +311,7 @@ static int request_parse_range(
colon2 = strchr(colon + 1, ':');
if (colon2) {
_cleanup_free_ char *t;
_cleanup_free_ char *t = NULL;
t = strndup(colon + 1, colon2 - colon - 1);
if (!t)

2
src/journal-remote/journal-remote.c
View File

@ -40,7 +40,7 @@ static int open_output(RemoteServer *s, Writer *w, const char* host) {
break;
case JOURNAL_WRITE_SPLIT_HOST: {
_cleanup_free_ char *name;
_cleanup_free_ char *name = NULL;
assert(host);

8
src/journal/journalctl.c
View File

@ -1158,7 +1158,7 @@ static int add_matches(sd_journal *j, char **args) {
if (S_ISREG(st.st_mode) && (0111 & st.st_mode)) {
if (executable_is_script(p, &interpreter) > 0) {
_cleanup_free_ char *comm;
_cleanup_free_ char *comm = NULL;
comm = strndup(basename(p), 15);
if (!comm)
@ -1537,7 +1537,7 @@ static int get_possible_units(
char **patterns,
Set **units) {
_cleanup_set_free_free_ Set *found;
_cleanup_set_free_free_ Set *found = NULL;
const char *field;
int r;
@ -2182,7 +2182,7 @@ int main(int argc, char *argv[]) {
case ACTION_LIST_CATALOG:
case ACTION_DUMP_CATALOG:
case ACTION_UPDATE_CATALOG: {
_cleanup_free_ char *database;
_cleanup_free_ char *database = NULL;
database = path_join(arg_root, CATALOG_DATABASE);
if (!database) {
@ -2436,7 +2436,7 @@ int main(int argc, char *argv[]) {
goto finish;
if (DEBUG_LOGGING) {
_cleanup_free_ char *filter;
_cleanup_free_ char *filter = NULL;
filter = journal_make_match_string(j);
if (!filter)

4
src/journal/journald-stream.c
View File

@ -189,7 +189,7 @@ static int stdout_stream_save(StdoutStream *s) {
s->id_field + STRLEN("_STREAM_ID="));
if (!isempty(s->identifier)) {
_cleanup_free_ char *escaped;
_cleanup_free_ char *escaped = NULL;
escaped = cescape(s->identifier);
if (!escaped) {
@ -201,7 +201,7 @@ static int stdout_stream_save(StdoutStream *s) {
}
if (!isempty(s->unit_id)) {
_cleanup_free_ char *escaped;
_cleanup_free_ char *escaped = NULL;
escaped = cescape(s->unit_id);
if (!escaped) {

2
src/libsystemd-network/fuzz-dhcp6-client.c
View File

@ -23,7 +23,7 @@ int dhcp6_network_bind_udp_socket(int index, struct in6_addr *local_address) {
}
static void fuzz_client(const uint8_t *data, size_t size, bool is_information_request_enabled) {
_cleanup_(sd_event_unrefp) sd_event *e;
_cleanup_(sd_event_unrefp) sd_event *e = NULL;
_cleanup_(sd_dhcp6_client_unrefp) sd_dhcp6_client *client = NULL;
struct in6_addr address = { { { 0xfe, 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x01 } } };

2
src/libsystemd/sd-journal/journal-vacuum.c
View File

@ -88,7 +88,7 @@ static void patch_realtime(
}
static int journal_file_empty(int dir_fd, const char *name) {
_cleanup_close_ int fd;
_cleanup_close_ int fd = -1;
struct stat st;
le64_t n_entries;
ssize_t n;

2
src/libsystemd/sd-journal/sd-journal.c
View File

@ -1860,7 +1860,7 @@ static int add_current_paths(sd_journal *j) {
* treat them as fatal. */
ORDERED_HASHMAP_FOREACH(f, j->files) {
_cleanup_free_ char *dir;
_cleanup_free_ char *dir = NULL;
int r;
dir = dirname_malloc(f->path);

2
src/libsystemd/sd-login/sd-login.c
View File

@ -775,7 +775,7 @@ _public_ int sd_get_sessions(char ***sessions) {
}
_public_ int sd_get_uids(uid_t **users) {
_cleanup_closedir_ DIR *d;
_cleanup_closedir_ DIR *d = NULL;
struct dirent *de;
int r = 0;
unsigned n = 0;

2
src/locale/keymap-util.c
View File

@ -535,7 +535,7 @@ int vconsole_convert_to_x11(Context *c) {
int find_converted_keymap(const char *x11_layout, const char *x11_variant, char **new_keymap) {
const char *dir;
_cleanup_free_ char *n;
_cleanup_free_ char *n = NULL;
if (x11_variant)
n = strjoin(x11_layout, "-", x11_variant);

2
src/locale/localed.c
View File

@ -457,7 +457,7 @@ static int method_set_locale(sd_bus_message *m, void *userdata, sd_bus_error *er
(void) locale_update_system_manager(c, sd_bus_message_get_bus(m));
if (settings) {
_cleanup_free_ char *line;
_cleanup_free_ char *line = NULL;
line = strv_join(settings, ", ");
log_info("Changed locale to %s.", strnull(line));

2
src/login/logind-core.c
View File

@ -485,7 +485,7 @@ int config_parse_n_autovts(
static int vt_is_busy(unsigned vtnr) {
struct vt_stat vt_stat;
int r;
_cleanup_close_ int fd;
_cleanup_close_ int fd = -1;
assert(vtnr >= 1);

4
src/login/logind-dbus.c
View File

@ -1371,7 +1371,7 @@ static int attach_device(Manager *m, const char *seat, const char *sysfs) {
}
static int flush_devices(Manager *m) {
_cleanup_closedir_ DIR *d;
_cleanup_closedir_ DIR *d = NULL;
assert(m);
@ -2073,7 +2073,7 @@ static int update_schedule_file(Manager *m) {
m->scheduled_shutdown_type);
if (!isempty(m->wall_message)) {
_cleanup_free_ char *t;
_cleanup_free_ char *t = NULL;
t = cescape(m->wall_message);
if (!t) {

8
src/login/logind-session.c
View File

@ -266,7 +266,7 @@ int session_save(Session *s) {
fprintf(f, "DISPLAY=%s\n", s->display);
if (s->remote_host) {
_cleanup_free_ char *escaped;
_cleanup_free_ char *escaped = NULL;
escaped = cescape(s->remote_host);
if (!escaped) {
@ -278,7 +278,7 @@ int session_save(Session *s) {
}
if (s->remote_user) {
_cleanup_free_ char *escaped;
_cleanup_free_ char *escaped = NULL;
escaped = cescape(s->remote_user);
if (!escaped) {
@ -290,7 +290,7 @@ int session_save(Session *s) {
}
if (s->service) {
_cleanup_free_ char *escaped;
_cleanup_free_ char *escaped = NULL;
escaped = cescape(s->service);
if (!escaped) {
@ -302,7 +302,7 @@ int session_save(Session *s) {
}
if (s->desktop) {
_cleanup_free_ char *escaped;
_cleanup_free_ char *escaped = NULL;
escaped = cescape(s->desktop);
if (!escaped) {

6
src/machine/machine.c
View File

@ -134,7 +134,7 @@ int machine_save(Machine *m) {
m->name);
if (m->unit) {
_cleanup_free_ char *escaped;
_cleanup_free_ char *escaped = NULL;
escaped = cescape(m->unit);
if (!escaped) {
@ -149,7 +149,7 @@ int machine_save(Machine *m) {
fprintf(f, "SCOPE_JOB=%s\n", m->scope_job);
if (m->service) {
_cleanup_free_ char *escaped;
_cleanup_free_ char *escaped = NULL;
escaped = cescape(m->service);
if (!escaped) {
@ -160,7 +160,7 @@ int machine_save(Machine *m) {
}
if (m->root_directory) {
_cleanup_free_ char *escaped;
_cleanup_free_ char *escaped = NULL;
escaped = cescape(m->root_directory);
if (!escaped) {

2
src/network/netdev/tuntap.c
View File

@ -46,7 +46,7 @@ static int netdev_fill_tuntap_message(NetDev *netdev, struct ifreq *ifr) {
}
static int netdev_tuntap_add(NetDev *netdev, struct ifreq *ifr) {
_cleanup_close_ int fd;
_cleanup_close_ int fd = -1;
TunTap *t = NULL;
const char *user;
const char *group;

2
src/network/wait-online/wait-online.c
View File

@ -53,7 +53,7 @@ static int help(void) {
static int parse_interface_with_operstate_range(const char *str) {
_cleanup_free_ char *ifname = NULL;
_cleanup_free_ LinkOperationalStateRange *range;
_cleanup_free_ LinkOperationalStateRange *range = NULL;
const char *p;
int r;

2
src/portable/portable.c
View File

@ -861,7 +861,7 @@ static int find_profile(const char *name, const char *unit, char **ret) {
assert_se(dot = strrchr(unit, '.'));
NULSTR_FOREACH(p, profile_dirs) {
_cleanup_free_ char *joined;
_cleanup_free_ char *joined = NULL;
joined = strjoin(p, "/", name, "/", dot + 1, ".conf");
if (!joined)

2
src/portable/portablectl.c
View File

@ -341,7 +341,7 @@ static int inspect_image(int argc, char *argv[], void *userdata) {
nl = true;
} else {
_cleanup_free_ char *pretty_portable = NULL, *pretty_os = NULL;
_cleanup_fclose_ FILE *f;
_cleanup_fclose_ FILE *f = NULL;
f = fmemopen_unlocked((void*) data, sz, "re");
if (!f)

2
src/resolve/resolved-dns-scope.c
View File

@ -1447,7 +1447,7 @@ int dns_scope_announce(DnsScope *scope, bool goodbye) {
/* Since all the active services are in the zone make them discoverable now. */
SET_FOREACH(service_type, types) {
_cleanup_(dns_resource_record_unrefp) DnsResourceRecord *rr;
_cleanup_(dns_resource_record_unrefp) DnsResourceRecord *rr = NULL;
rr = dns_resource_record_new_full(DNS_CLASS_IN, DNS_TYPE_PTR,
"_services._dns-sd._udp.local");

6
src/shared/acl-util.c
View File

@ -211,7 +211,7 @@ int acl_search_groups(const char *path, char ***ret_groups) {
int parse_acl(const char *text, acl_t *acl_access, acl_t *acl_default, bool want_mask) {
_cleanup_free_ char **a = NULL, **d = NULL; /* strings are not freed */
_cleanup_strv_free_ char **split;
_cleanup_strv_free_ char **split = NULL;
char **entry;
int r = -EINVAL;
_cleanup_(acl_freep) acl_t a_acl = NULL, d_acl = NULL;
@ -233,7 +233,7 @@ int parse_acl(const char *text, acl_t *acl_access, acl_t *acl_default, bool want
}
if (!strv_isempty(a)) {
_cleanup_free_ char *join;
_cleanup_free_ char *join = NULL;
join = strv_join(a, ",");
if (!join)
@ -251,7 +251,7 @@ int parse_acl(const char *text, acl_t *acl_access, acl_t *acl_default, bool want
}
if (!strv_isempty(d)) {
_cleanup_free_ char *join;
_cleanup_free_ char *join = NULL;
join = strv_join(d, ",");
if (!join)

2
src/shared/bus-wait-for-jobs.c
View File

@ -184,7 +184,7 @@ static void log_job_error_with_service_result(const char* service, const char *r
service_shell_quoted = shell_maybe_quote(service, ESCAPE_BACKSLASH);
if (!strv_isempty((char**) extra_args)) {
_cleanup_free_ char *t;
_cleanup_free_ char *t = NULL;
t = strv_join((char**) extra_args, " ");
systemctl = strjoina("systemctl ", t ? : "<args>");

2
src/shared/clean-ipc.c
View File

@ -240,7 +240,7 @@ static int clean_posix_shm_internal(const char *dirname, DIR *dir, uid_t uid, gi
}
if (S_ISDIR(st.st_mode)) {
_cleanup_closedir_ DIR *kid;
_cleanup_closedir_ DIR *kid = NULL;
kid = xopendirat(dirfd(dir), de->d_name, O_NOFOLLOW|O_NOATIME);
if (!kid) {

2
src/shared/clock-util.c
View File

@ -55,7 +55,7 @@ int clock_set_hwclock(const struct tm *tm) {
}
int clock_is_localtime(const char* adjtime_path) {
_cleanup_fclose_ FILE *f;
_cleanup_fclose_ FILE *f = NULL;
int r;
if (!adjtime_path)

30
src/shared/format-table.c
View File

@ -1409,7 +1409,7 @@ static const char *table_data_format(Table *t, TableData *d, bool avoid_uppercas
case TABLE_TIMESTAMP:
case TABLE_TIMESTAMP_UTC:
case TABLE_TIMESTAMP_RELATIVE: {
_cleanup_free_ char *p;
_cleanup_free_ char *p = NULL;
char *ret;
p = new(char, FORMAT_TIMESTAMP_MAX);
@ -1431,7 +1431,7 @@ static const char *table_data_format(Table *t, TableData *d, bool avoid_uppercas
case TABLE_TIMESPAN:
case TABLE_TIMESPAN_MSEC: {
_cleanup_free_ char *p;
_cleanup_free_ char *p = NULL;
p = new(char, FORMAT_TIMESPAN_MAX);
if (!p)
@ -1446,7 +1446,7 @@ static const char *table_data_format(Table *t, TableData *d, bool avoid_uppercas
}
case TABLE_SIZE: {
_cleanup_free_ char *p;
_cleanup_free_ char *p = NULL;
p = new(char, FORMAT_BYTES_MAX);
if (!p)
@ -1460,7 +1460,7 @@ static const char *table_data_format(Table *t, TableData *d, bool avoid_uppercas
}
case TABLE_BPS: {
_cleanup_free_ char *p;
_cleanup_free_ char *p = NULL;
size_t n;
p = new(char, FORMAT_BYTES_MAX+2);
@ -1478,7 +1478,7 @@ static const char *table_data_format(Table *t, TableData *d, bool avoid_uppercas
}
case TABLE_INT: {
_cleanup_free_ char *p;
_cleanup_free_ char *p = NULL;
p = new(char, DECIMAL_STR_WIDTH(d->int_val) + 1);
if (!p)
@ -1490,7 +1490,7 @@ static const char *table_data_format(Table *t, TableData *d, bool avoid_uppercas
}
case TABLE_INT8: {
_cleanup_free_ char *p;
_cleanup_free_ char *p = NULL;
p = new(char, DECIMAL_STR_WIDTH(d->int8) + 1);
if (!p)
@ -1502,7 +1502,7 @@ static const char *table_data_format(Table *t, TableData *d, bool avoid_uppercas
}
case TABLE_INT16: {
_cleanup_free_ char *p;
_cleanup_free_ char *p = NULL;
p = new(char, DECIMAL_STR_WIDTH(d->int16) + 1);
if (!p)
@ -1514,7 +1514,7 @@ static const char *table_data_format(Table *t, TableData *d, bool avoid_uppercas
}
case TABLE_INT32: {
_cleanup_free_ char *p;
_cleanup_free_ char *p = NULL;
p = new(char, DECIMAL_STR_WIDTH(d->int32) + 1);
if (!p)
@ -1526,7 +1526,7 @@ static const char *table_data_format(Table *t, TableData *d, bool avoid_uppercas
}
case TABLE_INT64: {
_cleanup_free_ char *p;
_cleanup_free_ char *p = NULL;
p = new(char, DECIMAL_STR_WIDTH(d->int64) + 1);
if (!p)
@ -1538,7 +1538,7 @@ static const char *table_data_format(Table *t, TableData *d, bool avoid_uppercas
}
case TABLE_UINT: {
_cleanup_free_ char *p;
_cleanup_free_ char *p = NULL;
p = new(char, DECIMAL_STR_WIDTH(d->uint_val) + 1);
if (!p)
@ -1550,7 +1550,7 @@ static const char *table_data_format(Table *t, TableData *d, bool avoid_uppercas
}
case TABLE_UINT8: {
_cleanup_free_ char *p;
_cleanup_free_ char *p = NULL;
p = new(char, DECIMAL_STR_WIDTH(d->uint8) + 1);
if (!p)
@ -1562,7 +1562,7 @@ static const char *table_data_format(Table *t, TableData *d, bool avoid_uppercas
}
case TABLE_UINT16: {
_cleanup_free_ char *p;
_cleanup_free_ char *p = NULL;
p = new(char, DECIMAL_STR_WIDTH(d->uint16) + 1);
if (!p)
@ -1574,7 +1574,7 @@ static const char *table_data_format(Table *t, TableData *d, bool avoid_uppercas
}
case TABLE_UINT32: {
_cleanup_free_ char *p;
_cleanup_free_ char *p = NULL;
p = new(char, DECIMAL_STR_WIDTH(d->uint32) + 1);
if (!p)
@ -1586,7 +1586,7 @@ static const char *table_data_format(Table *t, TableData *d, bool avoid_uppercas
}
case TABLE_UINT64: {
_cleanup_free_ char *p;
_cleanup_free_ char *p = NULL;
p = new(char, DECIMAL_STR_WIDTH(d->uint64) + 1);
if (!p)
@ -1598,7 +1598,7 @@ static const char *table_data_format(Table *t, TableData *d, bool avoid_uppercas
}
case TABLE_PERCENT: {
_cleanup_free_ char *p;
_cleanup_free_ char *p = NULL;
p = new(char, DECIMAL_STR_WIDTH(d->percent) + 2);
if (!p)

2
src/shared/install.c
View File

@ -2950,7 +2950,7 @@ static int read_presets(UnitFileScope scope, const char *root_dir, UnitFilePrese
return r;
STRV_FOREACH(p, files) {
_cleanup_fclose_ FILE *f;
_cleanup_fclose_ FILE *f = NULL;
int n = 0;
f = fopen(*p, "re");

4
src/shared/logs-show.c
View File

@ -294,7 +294,7 @@ static bool print_multiline(
continuation * prefix, "",
color_on, len, pos, color_off);
else {
_cleanup_free_ char *e;
_cleanup_free_ char *e = NULL;
e = ellipsize_mem(pos, len, n_columns - prefix,
tail_line ? 100 : 90);
@ -1651,7 +1651,7 @@ int show_journal_by_unit(
return r;
if (DEBUG_LOGGING) {
_cleanup_free_ char *filter;
_cleanup_free_ char *filter = NULL;
filter = journal_make_match_string(j);
if (!filter)

2
src/shared/net-condition.c
View File

@ -147,7 +147,7 @@ bool net_match_config(
const char *ssid,
const struct ether_addr *bssid) {
_cleanup_free_ char *iftype_str;
_cleanup_free_ char *iftype_str = NULL;
const char *path = NULL;
assert(match);

2
src/shared/sleep-config.c
View File

@ -34,7 +34,7 @@
#include "time-util.h"
int parse_sleep_config(SleepConfig **ret_sleep_config) {
_cleanup_(free_sleep_configp) SleepConfig *sc;
_cleanup_(free_sleep_configp) SleepConfig *sc = NULL;
int allow_suspend = -1, allow_hibernate = -1,
allow_s2h = -1, allow_hybrid_sleep = -1;

2
src/systemctl/systemctl-edit.c
View File

@ -576,7 +576,7 @@ end:
/* Removing empty dropin dirs */
if (!arg_full) {
_cleanup_free_ char *dir;
_cleanup_free_ char *dir = NULL;
dir = dirname_malloc(*original);
if (!dir)

2
src/systemctl/systemctl-list-units.c
View File

@ -24,7 +24,7 @@ static int get_unit_list_recursive(
char ***ret_machines) {
_cleanup_free_ UnitInfo *unit_infos = NULL;
_cleanup_(message_set_freep) Set *replies;
_cleanup_(message_set_freep) Set *replies = NULL;
sd_bus_message *reply;
int c, r;

4
src/systemctl/systemctl-show.c
View File

@ -1282,7 +1282,7 @@ static int print_property(const char *name, const char *expected_value, sd_bus_m
while ((r = exec_status_info_deserialize(m, &info, is_ex_prop)) > 0) {
char timestamp1[FORMAT_TIMESTAMP_MAX], timestamp2[FORMAT_TIMESTAMP_MAX];
_cleanup_strv_free_ char **optv = NULL;
_cleanup_free_ char *tt, *o = NULL;
_cleanup_free_ char *tt = NULL, *o = NULL;
tt = strv_join(info.argv, " ");
@ -2129,7 +2129,7 @@ int show(int argc, char *argv[], void *userdata) {
return r;
STRV_FOREACH(name, names) {
_cleanup_free_ char *path;
_cleanup_free_ char *path = NULL;
path = unit_dbus_path_from_name(*name);
if (!path)

6
src/sysv-generator/sysv-generator.c
View File

@ -137,7 +137,7 @@ static int generate_unit_file(SysvStub *s) {
path_escaped);
if (s->description) {
_cleanup_free_ char *t;
_cleanup_free_ char *t = NULL;
t = specifier_escape(s->description);
if (!t)
@ -165,7 +165,7 @@ static int generate_unit_file(SysvStub *s) {
yes_no(!s->pid_file));
if (s->pid_file) {
_cleanup_free_ char *t;
_cleanup_free_ char *t = NULL;
t = specifier_escape(s->pid_file);
if (!t)
@ -419,7 +419,7 @@ static int handle_dependencies(SysvStub *s, unsigned line, const char *full_text
}
static int load_sysv(SysvStub *s) {
_cleanup_fclose_ FILE *f;
_cleanup_fclose_ FILE *f = NULL;
unsigned line = 0;
int r;
enum {

2
src/timesync/wait-sync.c
View File

@ -179,7 +179,7 @@ static int clock_state_update(
}
static int run(int argc, char * argv[]) {
_cleanup_(sd_event_unrefp) sd_event *event;
_cleanup_(sd_event_unrefp) sd_event *event = NULL;
_cleanup_(clock_state_release) ClockState state = {
.timerfd_fd = -1,
.inotify_fd = -1,

2
src/tty-ask-password-agent/tty-ask-password-agent.c
View File

@ -289,7 +289,7 @@ static int wall_tty_block(void) {
}
static int process_password_files(void) {
_cleanup_closedir_ DIR *d;
_cleanup_closedir_ DIR *d = NULL;
struct dirent *de;
int r = 0;

2
src/udev/scsi_id/scsi_id.c
View File

@ -106,7 +106,7 @@ static int get_file_options(const char *vendor, const char *model,
int *argc, char ***newargv) {
_cleanup_free_ char *vendor_in = NULL, *model_in = NULL, *options_in = NULL; /* read in from file */
_cleanup_strv_free_ char **options_argv = NULL;
_cleanup_fclose_ FILE *f;
_cleanup_fclose_ FILE *f = NULL;
int lineno, r;
f = fopen(config_file, "re");

4
src/vconsole/vconsole-setup.c
View File

@ -146,7 +146,7 @@ static int keyboard_load_and_wait(const char *vc, const char *map, const char *m
args[i++] = NULL;
if (DEBUG_LOGGING) {
_cleanup_free_ char *cmd;
_cleanup_free_ char *cmd = NULL;
cmd = strv_join((char**) args, " ");
log_debug("Executing \"%s\"...", strnull(cmd));
@ -189,7 +189,7 @@ static int font_load_and_wait(const char *vc, const char *font, const char *map,
args[i++] = NULL;
if (DEBUG_LOGGING) {
_cleanup_free_ char *cmd;
_cleanup_free_ char *cmd = NULL;
cmd = strv_join((char**) args, " ");
log_debug("Executing \"%s\"...", strnull(cmd));