diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2008-01-24 19:09:30 +0000 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2008-01-24 19:09:30 +0000 |
| commit | 11a9f57c1a60168c6389b9d2cfc226694d9f715e (patch) | |
| tree | 68be99065f8dbc6765c69edb1379cebadcada67d /mergecap.c | |
| parent | 51060a1b5c1d5f6397353a6a7b29a4730d9d59d5 (diff) | |
| download | wireshark-11a9f57c1a60168c6389b9d2cfc226694d9f715e.tar.gz wireshark-11a9f57c1a60168c6389b9d2cfc226694d9f715e.tar.bz2 wireshark-11a9f57c1a60168c6389b9d2cfc226694d9f715e.zip | |
Fixed some malloc -> g_malloc, free -> g_free, strdup -> g_strdup.
svn path=/trunk/; revision=24179
Diffstat (limited to 'mergecap.c')
| -rw-r--r-- | mergecap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mergecap.c b/mergecap.c index 84fdbf3ee9..9099f39ba8 100644 --- 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; } |