]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
shared/extension-release: drop unnecessary strna() wrapper
authorYu Watanabe <watanabe.yu+github@gmail.com>
Fri, 20 May 2022 07:49:14 +0000 (16:49 +0900)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Fri, 20 May 2022 12:26:47 +0000 (14:26 +0200)
These are not NULL.

src/shared/extension-release.c

index dccc9999079a267ee5d07036936878d9e920b24e..db87b23a71e1eeefd06fa7a4bc34159748ba716a 100644 (file)
@@ -51,13 +51,13 @@ int extension_release_validate(
         extension_release_id = strv_env_pairs_get(extension_release, "ID");
         if (isempty(extension_release_id)) {
                 log_debug("Extension '%s' does not contain ID in extension-release but requested to match '%s'",
-                          name, strna(host_os_release_id));
+                          name, host_os_release_id);
                 return 0;
         }
 
-        if (!streq_ptr(host_os_release_id, extension_release_id)) {
+        if (!streq(host_os_release_id, extension_release_id)) {
                 log_debug("Extension '%s' is for OS '%s', but deployed on top of '%s'.",
-                          name, strna(extension_release_id), strna(host_os_release_id));
+                          name, extension_release_id, host_os_release_id);
                 return 0;
         }