diff options
| author | David Tardon <dtardon@redhat.com> | 2022-08-09 14:35:15 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2022-09-13 08:13:27 +0200 |
| commit | 995340074e554b4bf4a0fdb0cb7436692c5a4ffd (patch) | |
| tree | ca3ee001db3e608ee80478f42fea9c3b409f1b7b /src/sysupdate | |
| parent | 6d64cb0625691e2b9eda8babe07ac8281f9467ee (diff) | |
| download | systemd-995340074e554b4bf4a0fdb0cb7436692c5a4ffd.tar.gz | |
tree-wide: use ASSERT_PTR more
Diffstat (limited to 'src/sysupdate')
| -rw-r--r-- | src/sysupdate/sysupdate-transfer.c | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/src/sysupdate/sysupdate-transfer.c b/src/sysupdate/sysupdate-transfer.c index 7baadbad80..d6705cd12e 100644 --- a/src/sysupdate/sysupdate-transfer.c +++ b/src/sysupdate/sysupdate-transfer.c @@ -101,11 +101,10 @@ static int config_parse_protect_version( void *userdata) { _cleanup_free_ char *resolved = NULL; - char ***protected_versions = data; + char ***protected_versions = ASSERT_PTR(data); int r; assert(rvalue); - assert(data); r = specifier_printf(rvalue, NAME_MAX, specifier_table, arg_root, NULL, &resolved); if (r < 0) { @@ -140,11 +139,10 @@ static int config_parse_min_version( void *userdata) { _cleanup_free_ char *resolved = NULL; - char **version = data; + char **version = ASSERT_PTR(data); int r; assert(rvalue); - assert(data); r = specifier_printf(rvalue, NAME_MAX, specifier_table, arg_root, NULL, &resolved); if (r < 0) { @@ -175,11 +173,10 @@ static int config_parse_current_symlink( void *userdata) { _cleanup_free_ char *resolved = NULL; - char **current_symlink = data; + char **current_symlink = ASSERT_PTR(data); int r; assert(rvalue); - assert(data); r = specifier_printf(rvalue, NAME_MAX, specifier_table, arg_root, NULL, &resolved); if (r < 0) { @@ -247,11 +244,10 @@ static int config_parse_resource_pattern( void *data, void *userdata) { - char ***patterns = data; + char ***patterns = ASSERT_PTR(data); int r; assert(rvalue); - assert(data); if (isempty(rvalue)) { *patterns = strv_free(*patterns); @@ -303,11 +299,10 @@ static int config_parse_resource_path( void *userdata) { _cleanup_free_ char *resolved = NULL; - Resource *rr = data; + Resource *rr = ASSERT_PTR(data); int r; assert(rvalue); - assert(data); if (streq(rvalue, "auto")) { rr->path_auto = true; @@ -344,11 +339,10 @@ static int config_parse_resource_ptype( void *data, void *userdata) { - Resource *rr = data; + Resource *rr = ASSERT_PTR(data); int r; assert(rvalue); - assert(data); r = gpt_partition_type_uuid_from_string(rvalue, &rr->partition_type); if (r < 0) { @@ -373,11 +367,10 @@ static int config_parse_partition_uuid( void *data, void *userdata) { - Transfer *t = data; + Transfer *t = ASSERT_PTR(data); int r; assert(rvalue); - assert(data); r = sd_id128_from_string(rvalue, &t->partition_uuid); if (r < 0) { @@ -402,11 +395,10 @@ static int config_parse_partition_flags( void *data, void *userdata) { - Transfer *t = data; + Transfer *t = ASSERT_PTR(data); int r; assert(rvalue); - assert(data); r = safe_atou64(rvalue, &t->partition_flags); if (r < 0) { |