SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tree-wide: use free_and_strdup()

Browse Source 
Use free_and_strdup() where appropriate and replace equivalent,
open-coded versions.
This commit is contained in:
Daniel Mack
2015-07-30 13:09:01 +02:00
parent 5f17089ac1
commit 2fc09a9cdd
10 changed files with 40 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/firstboot/firstboot.c
+10 -16
View File
@@ -728,9 +728,8 @@ static int parse_argv(int argc, char *argv[]) {
return -EINVAL;
}
free(arg_locale);
arg_locale = strdup(optarg);
if (!arg_locale)
r = free_and_strdup(&arg_locale, optarg);
if (r < 0)
return log_oom();
break;
@@ -741,9 +740,8 @@ static int parse_argv(int argc, char *argv[]) {
return -EINVAL;
}
free(arg_locale_messages);
arg_locale_messages = strdup(optarg);
if (!arg_locale_messages)
r = free_and_strdup(&arg_locale_messages, optarg);
if (r < 0)
return log_oom();
break;
@@ -754,19 +752,16 @@ static int parse_argv(int argc, char *argv[]) {
return -EINVAL;
}
free(arg_timezone);
arg_timezone = strdup(optarg);
if (!arg_timezone)
r = free_and_strdup(&arg_timezone, optarg);
if (r < 0)
return log_oom();
break;
case ARG_ROOT_PASSWORD:
free(arg_root_password);
arg_root_password = strdup(optarg);
if (!arg_root_password)
r = free_and_strdup(&arg_root_password, optarg);
if (r < 0)
return log_oom();
break;
case ARG_ROOT_PASSWORD_FILE:
@@ -785,9 +780,8 @@ static int parse_argv(int argc, char *argv[]) {
return -EINVAL;
}
free(arg_hostname);
arg_hostname = strdup(optarg);
if (!arg_hostname)
r = free_and_strdup(&arg_hostname, optarg);
if (r < 0)
return log_oom();
break;