about summary refs log tree commit diff
path: root/libnm-util/nm-utils.c
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2016-03-30 00:57:20 +0200
committerMichael Biebl <biebl@debian.org>2016-03-30 00:57:20 +0200
commitdb70f92a77334e84ca9a04379afd49ea55c53098 (patch)
treed91e6ec27d66ec3c5a20c9195a0eb1d834189618 /libnm-util/nm-utils.c
parent4a76b5857faa586add8d7ce28f7804ffb65f3c68 (diff)
parentd9c99a29a0d3384c9c3d2adce430f5cb1134ab6a (diff)
Merge tag 'upstream/1.1.92'
Upstream version 1.1.92
Diffstat (limited to 'libnm-util/nm-utils.c')
-rw-r--r--libnm-util/nm-utils.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/libnm-util/nm-utils.c b/libnm-util/nm-utils.c
index 7c9def1d..084f0f54 100644
--- a/libnm-util/nm-utils.c
+++ b/libnm-util/nm-utils.c
@@ -1514,20 +1514,14 @@ nm_utils_uuid_generate_from_string (const char *s)
 	g_return_val_if_fail (s && *s, NULL);
 
 	if (!nm_utils_init (&error)) {
-		g_warning ("error initializing crypto: (%d) %s",
-		           error ? error->code : 0,
-		           error ? error->message : "unknown");
-		if (error)
-			g_error_free (error);
+		g_warning ("error initializing crypto: %s", error->message);
+		g_error_free (error);
 		return NULL;
 	}
 
 	if (!crypto_md5_hash (NULL, 0, s, strlen (s), (char *) uuid, sizeof (uuid), &error)) {
-		g_warning ("error generating UUID: (%d) %s",
-		           error ? error->code : 0,
-		           error ? error->message : "unknown");
-		if (error)
-			g_error_free (error);
+		g_warning ("error generating UUID: %s", error->message);
+		g_error_free (error);
 		return NULL;
 	}