Fixed some more malloc -> g_malloc, free -> g_free, strdup -> g_strdup.

svn path=/trunk/; revision=24180

4 files changed, 15 insertions, 15 deletions

diff --git a/epan/dissectors/packet-dcerpc-nt.c b/epan/dissectors/packet-dcerpc-nt.c
index a03c4c77b3..15f3a0149d 100644
--- a/epan/dissectors/packet-dcerpc-nt.c
+++ b/epan/dissectors/packet-dcerpc-nt.c
@@ -670,10 +670,10 @@ void dcerpc_store_polhnd_name(e_ctx_hnd *policy_hnd, packet_info *pinfo,
 			if (strcmp(pol->name, name) != 0)
 				g_warning("dcerpc_smb: pol_hash name collision %s/%s\n", value->name, name);
 #endif
-			free(pol->name);
+			g_free(pol->name);
 		}
 
-		pol->name = strdup(name);
+		pol->name = g_strdup(name);
 
 		return;
 	}
@@ -688,9 +688,9 @@ void dcerpc_store_polhnd_name(e_ctx_hnd *policy_hnd, packet_info *pinfo,
 	pol->last_frame = 0;
 	pol->type = 0;
 	if (name)
-		pol->name = strdup(name);
+		pol->name = g_strdup(name);
 	else
-		pol->name = strdup("<UNKNOWN>");
+		pol->name = g_strdup("<UNKNOWN>");
 
 	add_pol_handle(policy_hnd, pinfo->fd->num, pol, value);
 }
@@ -758,7 +758,7 @@ static void free_pol_keyvalue(gpointer key _U_, gpointer value_arg,
 	/* Free user data */
 
 	for (pol = value->list; pol != NULL; pol = pol->next) {
-		free(pol->name);
+		g_free(pol->name);
 		pol->name = NULL;
 	}
 }
diff --git a/epan/dissectors/packet-ssl-utils.c b/epan/dissectors/packet-ssl-utils.c
index 3bf475a7ef..1bc23fa634 100644
--- a/epan/dissectors/packet-ssl-utils.c
+++ b/epan/dissectors/packet-ssl-utils.c
@@ -2006,7 +2006,7 @@ ssl_load_pkcs12(FILE* fp, const gchar *cert_passwd) {
   private_key->sexp_pkey = 0;
     
   rest = 4096;
-  data.data = malloc(rest);
+  data.data = g_malloc(rest);
   data.size = rest;
   p = data.data;
   while ((len = fread(p, 1, rest, fp)) > 0) {
@@ -2014,7 +2014,7 @@ ssl_load_pkcs12(FILE* fp, const gchar *cert_passwd) {
     rest -= len;
     if (!rest) {
       rest = 1024;
-      data.data = realloc(data.data, data.size + rest);
+      data.data = g_realloc(data.data, data.size + rest);
       p = data.data + data.size;
       data.size += rest;
     }
@@ -2034,7 +2034,7 @@ ssl_load_pkcs12(FILE* fp, const gchar *cert_passwd) {
     return 0;
   }
   ret = gnutls_pkcs12_import(ssl_p12, &data, GNUTLS_X509_FMT_DER, 0);
-  free(data.data);
+  g_free(data.data);
   if (ret < 0) {
     ssl_debug_printf("gnutls_pkcs12_import(ssl_p12, &data, GNUTLS_X509_FMT_DER, 0) - %s\n", gnutls_strerror(ret));
     g_free(private_key);
@@ -2559,7 +2559,7 @@ ssl_parse_key_list(const gchar * keys_list, GHashTable *key_hash, GTree* associa
   Ssl_private_key_t * private_key, *tmp_private_key;
   FILE* fp;
 
-  start = strdup(keys_list);
+  start = g_strdup(keys_list);
   tmp = start;
   ssl_debug_printf("ssl_init keys string:\n%s\n", start);
   do {
@@ -2685,7 +2685,7 @@ ssl_parse_key_list(const gchar * keys_list, GHashTable *key_hash, GTree* associa
     ssl_association_add(associations, handle, service->port, protocol, tcp, TRUE);
 
   } while (end != NULL);
-  free(tmp);
+  g_free(tmp);
 }
 
 /* store master secret into session data cache */
diff --git a/plugins/wimax/mac_hd_generic_decoder.c b/plugins/wimax/mac_hd_generic_decoder.c
index bb17325cc6..f2bfb0899c 100644
--- a/plugins/wimax/mac_hd_generic_decoder.c
+++ b/plugins/wimax/mac_hd_generic_decoder.c
@@ -1368,11 +1368,11 @@ void wimax_defragment_init(void)
 	cid_adj_array_size = 0;
 	/* Free the array memory. */
 	if (cid_adj_array) {
-		free(cid_adj_array);
+		g_free(cid_adj_array);
 	}
 	cid_adj_array = NULL;
 	if (frag_num_array) {
-		free(frag_num_array);
+		g_free(frag_num_array);
 	}
 	frag_num_array = NULL;
 
diff --git a/wiretap/iseries.c b/wiretap/iseries.c
index 68c84046cd..10c0d39acf 100644
--- a/wiretap/iseries.c
+++ b/wiretap/iseries.c
@@ -774,9 +774,9 @@ iseries_parse_packet (wtap * wth, FILE_T fh,
 
   /* free buffers allocs and return */
   *err = 0;
-  free (asciibuf);
-  free (tcpdatabuf);
-  free (workbuf);
+  g_free (asciibuf);
+  g_free (tcpdatabuf);
+  g_free (workbuf);
   return wth->phdr.len;
 }