From: Karel Zak <kzak@redhat.com>
Date: Tue, 9 Jul 2013 12:45:41 +0000 (+0200)
Subject: uuidd: add missing initializer [clang-analyzer]
X-Git-Tag: v2.24-rc1~426
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=57a24292ff88569f6771f6dafbcf172b88dd431a;p=thirdparty%2Futil-linux.git

uuidd: add missing initializer [clang-analyzer]

Reported-by: Sami Kerola <kerolasa@iki.fi>
Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/misc-utils/uuidd.c b/misc-utils/uuidd.c
index d0ecb953c7..d381eea9ed 100644
--- a/misc-utils/uuidd.c
+++ b/misc-utils/uuidd.c
@@ -480,7 +480,7 @@ int main(int argc, char **argv)
 	const char	*socket_path = UUIDD_SOCKET_PATH;
 	const char	*pidfile_path = NULL;
 	const char	*pidfile_path_param = NULL;
-	const char	*err_context;
+	const char	*err_context = NULL;
 	char		buf[1024], *cp;
 	char		str[UUID_STR_LEN];
 	uuid_t		uu;
@@ -592,7 +592,7 @@ int main(int argc, char **argv)
 				  sizeof(buf), &num, &err_context);
 		if (ret < 0)
 			err(EXIT_FAILURE, _("error calling uuidd daemon (%s)"),
-					err_context);
+					err_context ? : _("unexpected error"));
 
 		if (do_type == UUIDD_OP_TIME_UUID) {
 			if (ret != sizeof(uu) + sizeof(num))
@@ -620,7 +620,7 @@ int main(int argc, char **argv)
 				  sizeof(uu), 0, &err_context);
 		if (ret < 0)
 			err(EXIT_FAILURE, _("error calling uuidd daemon (%s)"),
-					err_context);
+					err_context ? : _("unexpected error"));
 		if (ret != sizeof(uu))
 		        unexpected_size(ret);