1berry/wireshark
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reordercap.c: remove exit()

Browse Source 
Replace exit() calls with function returns on error to cleanly exit from main()
This commit is contained in:
Michael Mann 2025-04-21 12:18:41 -04:00
parent 8decc80e00
commit 06ae8a7ce5
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
reordercap.c
View File

@ -77,7 +77,7 @@ typedef struct FrameRecord_t {
/**************************************************/ /**************************************************/
static void static bool
frame_write(FrameRecord_t *frame, wtap *wth, wtap_dumper *pdh, frame_write(FrameRecord_t *frame, wtap *wth, wtap_dumper *pdh,
wtap_rec *rec, const char *infile, const char *outfile) wtap_rec *rec, const char *infile, const char *outfile)
{ {
@ -96,7 +96,7 @@ frame_write(FrameRecord_t *frame, wtap *wth, wtap_dumper *pdh,
"reordercap: An error occurred while re-reading \"%s\".\n", "reordercap: An error occurred while re-reading \"%s\".\n",
infile); infile);
cfile_read_failure_message(infile, err, err_info); cfile_read_failure_message(infile, err, err_info);
exit(1); return false;
} }
} }
@ -109,9 +109,11 @@ frame_write(FrameRecord_t *frame, wtap *wth, wtap_dumper *pdh,
if (!wtap_dump(pdh, rec, &err, &err_info)) { if (!wtap_dump(pdh, rec, &err, &err_info)) {
cfile_write_failure_message(infile, outfile, err, err_info, frame->num, cfile_write_failure_message(infile, outfile, err, err_info, frame->num,
wtap_file_type_subtype(wth)); wtap_file_type_subtype(wth));
exit(1); return false;
} }
wtap_rec_reset(rec); wtap_rec_reset(rec);
return true;
} }
/* Comparing timestamps between 2 frames. /* Comparing timestamps between 2 frames.
@ -320,7 +322,8 @@ main(int argc, char *argv[])
for (i = 0; i < frames->len; i++) { for (i = 0; i < frames->len; i++) {
FrameRecord_t *frame = (FrameRecord_t *)frames->pdata[i]; FrameRecord_t *frame = (FrameRecord_t *)frames->pdata[i];
frame_write(frame, wth, pdh, &rec, infile, outfile); if (!frame_write(frame, wth, pdh, &rec, infile, outfile))
return EXIT_FAILURE;
g_slice_free(FrameRecord_t, frame); g_slice_free(FrameRecord_t, frame);
} }