diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-05-09 05:18:49 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-05-09 05:21:01 +0000 |
| commit | a1b1c8bed54b1576e4f0e9e7f583844a12d142bf (patch) | |
| tree | fcadd72c61f9d936451163e83cc1be843073f3b4 /reordercap.c | |
| parent | a651f3e5edb2f148a0e5f495b5cba0e7fa43e002 (diff) | |
Revert "Refactor Wiretap"
This reverts commit 1abeb277f5e6bd27fbaebfecc8184e37ba9d008a.
This isn't building, and looks as if it requires significant work to fix.
Change-Id: I622b1bb243e353e874883a302ab419532b7601f2
Reviewed-on: https://code.wireshark.org/review/1568
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'reordercap.c')
| -rw-r--r-- | reordercap.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/reordercap.c b/reordercap.c index 09b5df1f8f..4b363b84b1 100644 --- a/reordercap.c +++ b/reordercap.c @@ -89,7 +89,7 @@ typedef struct FrameRecord_t { static void -frame_write(FrameRecord_t *frame, wftap *wth, wftap_dumper *pdh, Buffer *buf, +frame_write(FrameRecord_t *frame, wtap *wth, wtap_dumper *pdh, Buffer *buf, const char *infile) { int err; @@ -103,7 +103,7 @@ frame_write(FrameRecord_t *frame, wftap *wth, wftap_dumper *pdh, Buffer *buf, /* Re-read the first frame from the stored location */ - if (!wftap_seek_read(wth, frame->offset, &phdr, buf, &err, &err_info)) { + if (!wtap_seek_read(wth, frame->offset, &phdr, buf, &err, &err_info)) { if (err != 0) { /* Print a message noting that the read failed somewhere along the line. */ fprintf(stderr, @@ -174,8 +174,8 @@ frames_compare(gconstpointer a, gconstpointer b) /********************************************************************/ int main(int argc, char *argv[]) { - wftap *wth = NULL; - wftap_dumper *pdh = NULL; + wtap *wth = NULL; + wtap_dumper *pdh = NULL; Buffer buf; int err; gchar *err_info; @@ -241,13 +241,13 @@ int main(int argc, char *argv[]) } exit(1); } - DEBUG_PRINT("file_type_subtype is %u\n", wftap_file_type_subtype(wth)); + DEBUG_PRINT("file_type_subtype is %u\n", wtap_file_type_subtype(wth)); shb_hdr = wtap_file_get_shb_info(wth); idb_inf = wtap_file_get_idb_info(wth); /* Open outfile (same filetype/encap as input file) */ - pdh = wtap_dump_open_ng(outfile, wftap_file_type_subtype(wth), wftap_file_encap(wth), + pdh = wtap_dump_open_ng(outfile, wtap_file_type_subtype(wth), wtap_file_encap(wth), 65535, FALSE, shb_hdr, idb_inf, &err); g_free(idb_inf); if (pdh == NULL) { @@ -322,7 +322,7 @@ int main(int argc, char *argv[]) g_ptr_array_free(frames, TRUE); /* Close outfile */ - if (!wftap_dump_close(pdh, &err)) { + if (!wtap_dump_close(pdh, &err)) { fprintf(stderr, "reordercap: Error closing %s: %s\n", outfile, wtap_strerror(err)); g_free(shb_hdr); @@ -331,7 +331,7 @@ int main(int argc, char *argv[]) g_free(shb_hdr); /* Finally, close infile */ - wftap_fdclose(wth); + wtap_fdclose(wth); return 0; } |