diff options
| author | Guy Harris <guy@alum.mit.edu> | 2018-11-12 15:43:10 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2018-11-13 03:37:29 +0000 |
| commit | 3faa45d4ec9214fbe4b15c3b6d9bc875f8fb780c (patch) | |
| tree | 98cc11031a83c66e6bbbd22ebe6c3581ca9392be /file.c | |
| parent | f070ad2c1eb2813be5d7e27b1e1bb7b844d8467e (diff) | |
Don't have _ng versions of the dumper open routines.
Have the routines always take a parameters pointer; pass either null or
a pointer to an initialized-to-nothing structure in cases where we were
calling the non-_ng versions.
Change-Id: I23b779d87f3fbd29306ebe1df568852be113d3b2
Reviewed-on: https://code.wireshark.org/review/30590
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'file.c')
| -rw-r--r-- | file.c | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -4466,11 +4466,11 @@ cf_save_records(capture_file *cf, const char *fname, guint save_format, we *HAVE* to do that, otherwise we're overwriting the file from which we're reading the packets that we're writing!) */ fname_new = g_strdup_printf("%s~", fname); - pdh = wtap_dump_open_ng(fname_new, save_format, encap, cf->snap, - compressed, &ng_params, &err); + pdh = wtap_dump_open(fname_new, save_format, encap, cf->snap, + compressed, &ng_params, &err); } else { - pdh = wtap_dump_open_ng(fname, save_format, encap, cf->snap, - compressed, &ng_params, &err); + pdh = wtap_dump_open(fname, save_format, encap, cf->snap, + compressed, &ng_params, &err); } /* XXX idb_inf is documented to be used until wtap_dump_close. */ g_free(ng_params.idb_inf); @@ -4720,11 +4720,11 @@ cf_export_specified_packets(capture_file *cf, const char *fname, we *HAVE* to do that, otherwise we're overwriting the file from which we're reading the packets that we're writing!) */ fname_new = g_strdup_printf("%s~", fname); - pdh = wtap_dump_open_ng(fname_new, save_format, encap, cf->snap, - compressed, &ng_params, &err); + pdh = wtap_dump_open(fname_new, save_format, encap, cf->snap, + compressed, &ng_params, &err); } else { - pdh = wtap_dump_open_ng(fname, save_format, encap, cf->snap, - compressed, &ng_params, &err); + pdh = wtap_dump_open(fname, save_format, encap, cf->snap, + compressed, &ng_params, &err); } /* XXX idb_inf is documented to be used until wtap_dump_close. */ g_free(ng_params.idb_inf); |