Remove superfluous null-checks before strdup/free

[metze/wireshark/wip.git] / epan / dissectors / packet-ieee80211.c

diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c
index ed0e7d46cadb61435299f09da858d574f4d04c2f..574cb45f6c844ade9fd4d98edda6d56a84702acd 100644 (file)
--- a/epan/dissectors/packet-ieee80211.c
+++ b/epan/dissectors/packet-ieee80211.c
@@ -146,11 +146,7 @@ uat_wep_key_record_copy_cb(void* n, const void* o, size_t siz _U_)
   uat_wep_key_record_t* new_key = (uat_wep_key_record_t *)n;
   const uat_wep_key_record_t* old_key = (const uat_wep_key_record_t *)o;
 
-  if (old_key->string) {
-    new_key->string = g_strdup(old_key->string);
-  } else {
-    new_key->string = NULL;
-  }
+  new_key->string = g_strdup(old_key->string);
 
   return new_key;
 }
@@ -210,8 +206,7 @@ static void
 uat_wep_key_record_free_cb(void*r)
 {
   uat_wep_key_record_t* key = (uat_wep_key_record_t *)r;
-
-  if (key->string) g_free(key->string);
+  g_free(key->string);
 }
 
 UAT_VS_DEF(uat_wep_key_records, key, uat_wep_key_record_t, guint8, 0, STRING_KEY_TYPE_WEP)