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

sharkd: make the way it returns more similar to other apps.

Browse Source 
The clean_exit block allows deallocation of memory on exit.

Change-Id: I52078f0e4e851b6aa5f34cbbd15eba0a4f37cae0
Reviewed-on: https://code.wireshark.org/review/19940
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
This commit is contained in:
Dario Lombardo 2017-02-03 23:06:35 +01:00 committed by Michael Mann
parent 70381f774c
commit bfe07161a5
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sharkd.c
View File

@ -77,6 +77,9 @@
#include "sharkd.h" #include "sharkd.h"
#define INIT_FAILED 1
#define EPAN_INIT_FAIL 2
static guint32 cum_bytes; static guint32 cum_bytes;
static const frame_data *ref; static const frame_data *ref;
static frame_data ref_frame; static frame_data ref_frame;
@ -130,6 +133,7 @@ main(int argc, char *argv[])
int dp_open_errno, dp_read_errno; int dp_open_errno, dp_read_errno;
int cf_open_errno; int cf_open_errno;
e_prefs *prefs_p; e_prefs *prefs_p;
int ret = EXIT_SUCCESS;
cmdarg_err_init(failure_message, failure_message_cont); cmdarg_err_init(failure_message, failure_message_cont);
@ -170,7 +174,8 @@ main(int argc, char *argv[])
if (sharkd_init(argc, argv) < 0) if (sharkd_init(argc, argv) < 0)
{ {
printf("cannot initialize sharkd\n"); printf("cannot initialize sharkd\n");
return 1; ret = INIT_FAILED;
goto clean_exit;
} }
init_report_err(failure_message, open_failure_message, read_failure_message, init_report_err(failure_message, open_failure_message, read_failure_message,
@ -199,8 +204,10 @@ main(int argc, char *argv[])
dissectors, and we must do it before we read the preferences, in dissectors, and we must do it before we read the preferences, in
case any dissectors register preferences. */ case any dissectors register preferences. */
if (!epan_init(register_all_protocols, register_all_protocol_handoffs, NULL, if (!epan_init(register_all_protocols, register_all_protocol_handoffs, NULL,
NULL)) NULL)) {
return 2; ret = EPAN_INIT_FAIL;
goto clean_exit;
}
/* load the decode as entries of this profile */ /* load the decode as entries of this profile */
load_decode_as_entries(); load_decode_as_entries();
@ -288,7 +295,9 @@ main(int argc, char *argv[])
/* Build the column format array */ /* Build the column format array */
build_column_format_array(&cfile.cinfo, prefs_p->num_cols, TRUE); build_column_format_array(&cfile.cinfo, prefs_p->num_cols, TRUE);
return sharkd_loop(); ret = sharkd_loop();
clean_exit:
return ret;
} }
static const nstime_t * static const nstime_t *