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/shared/conf-parser.h | |
| parent | 6d64cb0625691e2b9eda8babe07ac8281f9467ee (diff) | |
| download | systemd-995340074e554b4bf4a0fdb0cb7436692c5a4ffd.tar.gz | |
tree-wide: use ASSERT_PTR more
Diffstat (limited to 'src/shared/conf-parser.h')
| -rw-r--r-- | src/shared/conf-parser.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/shared/conf-parser.h b/src/shared/conf-parser.h index 6d9d243492..e1765f5874 100644 --- a/src/shared/conf-parser.h +++ b/src/shared/conf-parser.h @@ -246,13 +246,12 @@ typedef enum ConfigParseStringFlags { #define DEFINE_CONFIG_PARSE_PTR(function, parser, type, msg) \ CONFIG_PARSER_PROTOTYPE(function) { \ - type *i = data; \ + type *i = ASSERT_PTR(data); \ int r; \ \ assert(filename); \ assert(lvalue); \ assert(rvalue); \ - assert(data); \ \ r = parser(rvalue, i); \ if (r < 0) \ @@ -312,7 +311,7 @@ typedef enum ConfigParseStringFlags { #define DEFINE_CONFIG_PARSE_ENUMV(function, name, type, invalid, msg) \ CONFIG_PARSER_PROTOTYPE(function) { \ - type **enums = data; \ + type **enums = ASSERT_PTR(data); \ _cleanup_free_ type *xs = NULL; \ size_t i = 0; \ int r; \ @@ -320,7 +319,6 @@ typedef enum ConfigParseStringFlags { assert(filename); \ assert(lvalue); \ assert(rvalue); \ - assert(data); \ \ xs = new0(type, 1); \ if (!xs) \ |