From b224ab8e568ab741c78cd03aedab526bbc9c0cd4 Mon Sep 17 00:00:00 2001
From: Kjartan Maraas <kmaraas@gnome.org>
Date: Tue, 15 Mar 2011 00:08:58 -0500
Subject: [PATCH] trivial: let g_free and g_strdup handle NULL (bgo #644763)

---
 libnm-glib/nm-access-point.c                     |  3 +--
 libnm-glib/nm-device-ethernet.c                  |  7 ++-----
 libnm-glib/nm-device-wifi.c                      |  7 ++-----
 libnm-glib/nm-vpn-connection.c                   |  4 +---
 libnm-util/nm-connection.c                       |  6 ++----
 libnm-util/nm-setting-ip6-config.c               |  4 +---
 src/bluez-manager/nm-bluez-device.c              |  2 +-
 src/nm-activation-request.c                      |  3 +--
 src/ppp-manager/nm-ppp-manager.c                 |  3 +--
 src/settings/plugins/ifcfg-rh/plugin.c           |  2 +-
 src/settings/plugins/ifcfg-rh/shvar.c            |  4 ++--
 src/settings/plugins/ifcfg-suse/plugin.c         |  2 +-
 src/settings/plugins/ifnet/connection_parser.c   |  3 +--
 src/settings/plugins/ifnet/nm-ifnet-connection.c |  3 +--
 src/settings/plugins/ifnet/plugin.c              |  9 +++------
 src/settings/plugins/ifupdown/plugin.c           |  4 +---
 src/settings/plugins/keyfile/plugin.c            |  2 +-
 src/vpn-manager/nm-vpn-connection.c              | 15 +++++----------
 18 files changed, 28 insertions(+), 55 deletions(-)

diff --git a/libnm-glib/nm-access-point.c b/libnm-glib/nm-access-point.c
index e57f078670..2712f36ce1 100644
--- a/libnm-glib/nm-access-point.c
+++ b/libnm-glib/nm-access-point.c
@@ -508,8 +508,7 @@ finalize (GObject *object)
 	if (priv->ssid)
 		g_byte_array_free (priv->ssid, TRUE);
 
-	if (priv->bssid)
-		g_free (priv->bssid);
+	g_free (priv->bssid);
 
 	G_OBJECT_CLASS (nm_access_point_parent_class)->finalize (object);
 }
diff --git a/libnm-glib/nm-device-ethernet.c b/libnm-glib/nm-device-ethernet.c
index 6584a3f96c..932c6bda3f 100644
--- a/libnm-glib/nm-device-ethernet.c
+++ b/libnm-glib/nm-device-ethernet.c
@@ -322,11 +322,8 @@ finalize (GObject *object)
 {
 	NMDeviceEthernetPrivate *priv = NM_DEVICE_ETHERNET_GET_PRIVATE (object);
 
-	if (priv->hw_address)
-		g_free (priv->hw_address);
-
-	if (priv->perm_hw_address)
-		g_free (priv->perm_hw_address);
+	g_free (priv->hw_address);
+	g_free (priv->perm_hw_address);
 
 	G_OBJECT_CLASS (nm_device_ethernet_parent_class)->finalize (object);
 }
diff --git a/libnm-glib/nm-device-wifi.c b/libnm-glib/nm-device-wifi.c
index c0a366dd93..621c22f183 100644
--- a/libnm-glib/nm-device-wifi.c
+++ b/libnm-glib/nm-device-wifi.c
@@ -763,11 +763,8 @@ finalize (GObject *object)
 {
 	NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (object);
 
-	if (priv->hw_address)
-		g_free (priv->hw_address);
-
-	if (priv->perm_hw_address)
-		g_free (priv->perm_hw_address);
+	g_free (priv->hw_address);
+	g_free (priv->perm_hw_address);
 
 	G_OBJECT_CLASS (nm_device_wifi_parent_class)->finalize (object);
 }
diff --git a/libnm-glib/nm-vpn-connection.c b/libnm-glib/nm-vpn-connection.c
index c803f120bf..dd219b2a14 100644
--- a/libnm-glib/nm-vpn-connection.c
+++ b/libnm-glib/nm-vpn-connection.c
@@ -186,9 +186,7 @@ finalize (GObject *object)
 {
 	NMVPNConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (object);
 
-	if (priv->banner)
-		g_free (priv->banner);
-
+	g_free (priv->banner);
 	g_object_unref (priv->proxy);
 
 	G_OBJECT_CLASS (nm_vpn_connection_parent_class)->finalize (object);
diff --git a/libnm-util/nm-connection.c b/libnm-util/nm-connection.c
index 473acd24bb..cb2d358904 100644
--- a/libnm-util/nm-connection.c
+++ b/libnm-util/nm-connection.c
@@ -1024,10 +1024,8 @@ nm_connection_set_path (NMConnection *connection, const char *path)
 
 	priv = NM_CONNECTION_GET_PRIVATE (connection);
 
-	if (priv->path) {
-		g_free (priv->path);
-		priv->path = NULL;
-	}
+	g_free (priv->path);
+	priv->path = NULL;
 
 	if (path)
 		priv->path = g_strdup (path);
diff --git a/libnm-util/nm-setting-ip6-config.c b/libnm-util/nm-setting-ip6-config.c
index 54c84313e0..1adbbdcba1 100644
--- a/libnm-util/nm-setting-ip6-config.c
+++ b/libnm-util/nm-setting-ip6-config.c
@@ -502,9 +502,7 @@ finalize (GObject *object)
 	NMSettingIP6ConfigPrivate *priv = NM_SETTING_IP6_CONFIG_GET_PRIVATE (object);
 
 	g_free (priv->method);
-
-	if (priv->dns)
-		g_slist_free (priv->dns);
+	g_slist_free (priv->dns);
 
 	nm_utils_slist_free (priv->dns_search, g_free);
 	nm_utils_slist_free (priv->addresses, g_free);
diff --git a/src/bluez-manager/nm-bluez-device.c b/src/bluez-manager/nm-bluez-device.c
index 72acaa6906..ecb6ce5136 100644
--- a/src/bluez-manager/nm-bluez-device.c
+++ b/src/bluez-manager/nm-bluez-device.c
@@ -195,7 +195,7 @@ property_changed (DBusGProxy *proxy,
 		    || (priv->name && !str)
 		    || (priv->name && str && strcmp (priv->name, str))) {
 			g_free (priv->name);
-			priv->name = str ? g_strdup (str) : NULL;
+			priv->name = g_strdup (str);
 			g_object_notify (G_OBJECT (self), NM_BLUEZ_DEVICE_NAME);
 		}
 	} else if (!strcmp (property, "RSSI")) {
diff --git a/src/nm-activation-request.c b/src/nm-activation-request.c
index ed4ae596b0..4051d57fde 100644
--- a/src/nm-activation-request.c
+++ b/src/nm-activation-request.c
@@ -216,8 +216,7 @@ nm_act_request_set_specific_object (NMActRequest *req,
 
 	priv = NM_ACT_REQUEST_GET_PRIVATE (req);
 
-	if (priv->specific_object)
-		g_free (priv->specific_object);
+	g_free (priv->specific_object);
 	priv->specific_object = g_strdup (specific_object);
 }
 
diff --git a/src/ppp-manager/nm-ppp-manager.c b/src/ppp-manager/nm-ppp-manager.c
index 29a77cea8a..dd7fefdd77 100644
--- a/src/ppp-manager/nm-ppp-manager.c
+++ b/src/ppp-manager/nm-ppp-manager.c
@@ -192,8 +192,7 @@ set_property (GObject *object, guint prop_id,
 
 	switch (prop_id) {
 	case PROP_PARENT_IFACE:
-		if (priv->parent_iface)
-			g_free (priv->parent_iface);
+		g_free (priv->parent_iface);
 		priv->parent_iface = g_value_dup_string (value);
 		break;
 	default:
diff --git a/src/settings/plugins/ifcfg-rh/plugin.c b/src/settings/plugins/ifcfg-rh/plugin.c
index 24cad38237..ae40b90a96 100644
--- a/src/settings/plugins/ifcfg-rh/plugin.c
+++ b/src/settings/plugins/ifcfg-rh/plugin.c
@@ -501,7 +501,7 @@ plugin_set_hostname (SCPluginIfcfg *plugin, const char *hostname)
 	svCloseFile (network);
 
 	g_free (priv->hostname);
-	priv->hostname = hostname ? g_strdup (hostname) : NULL;
+	priv->hostname = g_strdup (hostname);
 	return TRUE;
 }
 
diff --git a/src/settings/plugins/ifcfg-rh/shvar.c b/src/settings/plugins/ifcfg-rh/shvar.c
index 1e15d76ff0..0481e1f6c1 100644
--- a/src/settings/plugins/ifcfg-rh/shvar.c
+++ b/src/settings/plugins/ifcfg-rh/shvar.c
@@ -90,8 +90,8 @@ svOpenFile(const char *name, gboolean create)
 
 bail:
     if (s->fd != -1) close(s->fd);
-    if (s->arena) g_free (s->arena);
-    if (s->fileName) g_free (s->fileName);
+    g_free (s->arena);
+    g_free (s->fileName);
     g_free (s);
     return NULL;
 }
diff --git a/src/settings/plugins/ifcfg-suse/plugin.c b/src/settings/plugins/ifcfg-suse/plugin.c
index 26c73d2d5e..78db56e50e 100644
--- a/src/settings/plugins/ifcfg-suse/plugin.c
+++ b/src/settings/plugins/ifcfg-suse/plugin.c
@@ -195,7 +195,7 @@ plugin_set_hostname (SCPluginIfcfg *plugin, const char *hostname)
 	}
 
 	g_free (priv->hostname);
-	priv->hostname = hostname ? g_strdup (hostname) : NULL;
+	priv->hostname = g_strdup (hostname);
 }
 
 static void
diff --git a/src/settings/plugins/ifnet/connection_parser.c b/src/settings/plugins/ifnet/connection_parser.c
index 982bf7c3bb..1bfae153d3 100644
--- a/src/settings/plugins/ifnet/connection_parser.c
+++ b/src/settings/plugins/ifnet/connection_parser.c
@@ -470,8 +470,7 @@ eap_ttls_reader (const char *eap_method,
       done:
 	if (list)
 		g_strfreev (list);
-	if (inner_auth)
-		g_free (inner_auth);
+	g_free (inner_auth);
 	return success;
 }
 
diff --git a/src/settings/plugins/ifnet/nm-ifnet-connection.c b/src/settings/plugins/ifnet/nm-ifnet-connection.c
index 16a21bafa2..29de991c89 100644
--- a/src/settings/plugins/ifnet/nm-ifnet-connection.c
+++ b/src/settings/plugins/ifnet/nm-ifnet-connection.c
@@ -158,8 +158,7 @@ finalize (GObject * object)
 	    NM_IFNET_CONNECTION_GET_PRIVATE (object);
 	g_return_if_fail (priv);
 
-	if (priv->conn_name)
-		g_free (priv->conn_name);
+	g_free (priv->conn_name);
 	G_OBJECT_CLASS (nm_ifnet_connection_parent_class)->finalize (object);
 }
 
diff --git a/src/settings/plugins/ifnet/plugin.c b/src/settings/plugins/ifnet/plugin.c
index f71acf6cf1..a6b6e4183b 100644
--- a/src/settings/plugins/ifnet/plugin.c
+++ b/src/settings/plugins/ifnet/plugin.c
@@ -90,8 +90,7 @@ update_system_hostname (gpointer config)
 
 	PLUGIN_PRINT (IFNET_PLUGIN_NAME, "Updating hostname");
 
-	if (priv->hostname)
-		g_free (priv->hostname);
+	g_free (priv->hostname);
 	priv->hostname = read_hostname (IFNET_SYSTEM_HOSTNAME_FILE);
 
 	g_object_notify (G_OBJECT (config),
@@ -110,8 +109,7 @@ write_system_hostname (NMSystemConfigInterface * config,
 	PLUGIN_PRINT (IFNET_PLUGIN_NAME, "Write system hostname: %s",
 		      newhostname);
 	if (write_hostname (newhostname, IFNET_SYSTEM_HOSTNAME_FILE)) {
-		if (priv->hostname)
-			g_free (priv->hostname);
+		g_free (priv->hostname);
 		priv->hostname = g_strdup (newhostname);
 		g_object_notify (G_OBJECT (config),
 				 NM_SYSTEM_CONFIG_INTERFACE_HOSTNAME);
@@ -512,8 +510,7 @@ dispose (GObject * object)
 		g_hash_table_destroy (priv->config_connections);
 	}
 
-	if (priv->hostname)
-		g_free (priv->hostname);
+	g_free (priv->hostname);
 	ifnet_destroy ();
 	wpa_parser_destroy ();
 	G_OBJECT_CLASS (sc_plugin_ifnet_parent_class)->dispose (object);
diff --git a/src/settings/plugins/ifupdown/plugin.c b/src/settings/plugins/ifupdown/plugin.c
index b62285eea6..9679edeaca 100644
--- a/src/settings/plugins/ifupdown/plugin.c
+++ b/src/settings/plugins/ifupdown/plugin.c
@@ -600,9 +600,7 @@ update_system_hostname(NMInotifyHelper *inotify_helper,
 		return;
 	}
 
-	if (priv->hostname)
-		g_free(priv->hostname);
-
+	g_free(priv->hostname);
 	priv->hostname = g_strstrip(hostname_file);
 
 	/* We shouldn't return a zero-length hostname, but NULL */
diff --git a/src/settings/plugins/keyfile/plugin.c b/src/settings/plugins/keyfile/plugin.c
index 175e59a8c0..ffc614bc5a 100644
--- a/src/settings/plugins/keyfile/plugin.c
+++ b/src/settings/plugins/keyfile/plugin.c
@@ -493,7 +493,7 @@ plugin_set_hostname (SCPluginKeyfile *plugin, const char *hostname)
 			g_free (data);
 
 			g_free (priv->hostname);
-			priv->hostname = hostname ? g_strdup (hostname) : NULL;
+			priv->hostname = g_strdup (hostname);
 			result = TRUE;
 		}
 
diff --git a/src/vpn-manager/nm-vpn-connection.c b/src/vpn-manager/nm-vpn-connection.c
index e84c353207..a844293d7f 100644
--- a/src/vpn-manager/nm-vpn-connection.c
+++ b/src/vpn-manager/nm-vpn-connection.c
@@ -474,8 +474,7 @@ nm_vpn_connection_ip4_config_get (DBusGProxy *proxy,
 
 	val = (GValue *) g_hash_table_lookup (config_hash, NM_VPN_PLUGIN_IP4_CONFIG_BANNER);
 	if (val) {
-		if (priv->banner)
-			g_free (priv->banner);
+		g_free (priv->banner);
 		priv->banner = g_strdup (g_value_get_string (val));
 	}
 
@@ -954,15 +953,11 @@ vpn_cleanup (NMVPNConnection *connection)
 		priv->gw_route = NULL;
 	}
 
-	if (priv->banner) {
-		g_free (priv->banner);
-		priv->banner = NULL;
-	}
+	g_free (priv->banner);
+	priv->banner = NULL;
 
-	if (priv->ip_iface) {
-		g_free (priv->ip_iface);
-		priv->ip_iface = NULL;
-	}
+	g_free (priv->ip_iface);
+	priv->ip_iface = NULL;
 
 	/* Clear out connection secrets to ensure that the settings service
 	 * gets asked for them next time the connection is activated.