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

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@24179 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/editcap.c b/editcap.c
index c7ec2d71470e89460b5416a980ec5ccd8a11645f..0230aee34d84699f1c87017450a04c420df85fa0 100644 (file)
--- a/editcap.c
+++ b/editcap.c
@@ -618,7 +618,7 @@ int main(int argc, char *argv[])
       out_frame_type = wtap_file_encap(wth);
 
     if (split_packet_count > 0) {
-      filename = (char *) malloc(strlen(argv[optind+1]) + 20);
+      filename = (char *) g_malloc(strlen(argv[optind+1]) + 20);
       if (!filename) {
         exit(5);
       }

diff --git a/file.c b/file.c
index df6d6dcd223e27c8f2cf234623c4bce9c30e9886..4e5a12e8a74c7e5e6b00f9f360a9634f3c0b0bd7 100644 (file)
--- a/file.c
+++ b/file.c
@@ -1138,7 +1138,7 @@ cf_merge_files(char **out_filenamep, int in_file_count,
   /* open the input files */
   if (!merge_open_in_files(in_file_count, in_filenames, &in_files,
                            &open_err, &err_info, &err_fileno)) {
-    free(in_files);
+    g_free(in_files);
     cf_open_failure_alert_box(in_filenames[err_fileno], open_err, err_info,
                               FALSE, 0);
     return CF_ERROR;
@@ -1159,7 +1159,7 @@ cf_merge_files(char **out_filenamep, int in_file_count,
   if (out_fd == -1) {
     err_info = NULL;
     merge_close_in_files(in_file_count, in_files);
-    free(in_files);
+    g_free(in_files);
     cf_open_failure_alert_box(out_filename, open_err, NULL, TRUE, file_type);
     return CF_ERROR;
   }
@@ -1171,7 +1171,7 @@ cf_merge_files(char **out_filenamep, int in_file_count,
   if (pdh == NULL) {
     eth_close(out_fd);
     merge_close_in_files(in_file_count, in_files);
-    free(in_files);
+    g_free(in_files);
     cf_open_failure_alert_box(out_filename, open_err, err_info, TRUE,
                               file_type);
     return CF_ERROR;

diff --git a/mergecap.c b/mergecap.c
index 84fdbf3ee9c3847ac19270db78e5f09eab9e39f4..9099f39ba830f56a524043359c794221886ed722 100644 (file)
--- a/mergecap.c
+++ b/mergecap.c
@@ -325,7 +325,7 @@ main(int argc, char *argv[])
   pdh = wtap_dump_fdopen(out_fd, file_type, frame_type, snaplen, FALSE /* compressed */, &open_err);
   if (pdh == NULL) {
     merge_close_in_files(in_file_count, in_files);
-    free(in_files);
+    g_free(in_files);
     fprintf(stderr, "mergecap: Can't open or create %s: %s\n", out_filename,
             wtap_strerror(open_err));
     exit(1);
@@ -398,7 +398,7 @@ main(int argc, char *argv[])
             wtap_strerror(write_err));
   }
 
-  free(in_files);
+  g_free(in_files);
 
   return (!got_read_error && !got_write_error) ? 0 : 2;
 }

diff --git a/mkcap.c b/mkcap.c
index 0a912e402a783ebbaf6c46c7a22c59fcb068071b..6a02029317acc0ee782a894e93f82dd7fe6b1dc9 100644 (file)
--- a/mkcap.c
+++ b/mkcap.c
@@ -535,7 +535,7 @@ process_drop_list(char *drop_list)
     fprintf(stderr, "Strange drop list. NULL or an empty string. No drops!\n");
     return;
   }
-  save = (char *)strdup(drop_list);
+  save = (char *)g_strdup(drop_list);
 
   for (tok=(char *)strtok(drop_list, ","); tok; tok=(char *)strtok(NULL, ",")) {
     commas++;
@@ -544,11 +544,11 @@ process_drop_list(char *drop_list)
   /* Now, we have commas, divide by two and round up */
 
   seg_drop_count = (commas+1)/2;
-  drops = (seg_drop_t *)malloc(sizeof(seg_drop_t) * seg_drop_count);
+  drops = (seg_drop_t *)g_malloc(sizeof(seg_drop_t) * seg_drop_count);
   if (!drops) {
     fprintf(stderr, "Unable to allocate space for drops ... going without!\n");
     seg_drop_count = 0;
-    free(save);
+    g_free(save);
     return;
   }
 
@@ -563,8 +563,8 @@ process_drop_list(char *drop_list)
       fprintf(stderr, "Error in segment offset or count. Not all digits: %s\n",
              tok);
       fprintf(stderr, "No packet drops being performed!\n");
-      free(save);
-      free(drops);
+      g_free(save);
+      g_free(drops);
       seg_drop_count = 0; drops = NULL;
       return;
     }

diff --git a/tap-iostat.c b/tap-iostat.c
index 159ca6ed9084b3e9c506f12aefdf39e4434d716c..5833a46bf550f265a5f202752c9f15d77f1975e8 100644 (file)
--- a/tap-iostat.c
+++ b/tap-iostat.c
@@ -504,7 +504,7 @@ register_io_tap(io_stat_t *io, int i, const char *filter)
                                    calc_type_table[j].func_name);
                                exit(10);
                        }
-                       field=malloc(parenp-p+1);
+                       field=g_malloc(parenp-p+1);
                        if(!field){
                                fprintf(stderr, "tshark: Out of memory.\n");
                                exit(10);
@@ -517,7 +517,7 @@ register_io_tap(io_stat_t *io, int i, const char *filter)
                        if(!hfi){
                                fprintf(stderr, "tshark: There is no field named '%s'.\n",
                                    field);
-                               free(field);
+                               g_free(field);
                                exit(10);
                        }
        
@@ -583,7 +583,7 @@ register_io_tap(io_stat_t *io, int i, const char *filter)
                        }
                        break;
                }
-               free(field);
+               g_free(field);
        }
 
 /*