aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--capture.c1
-rw-r--r--capture_opts.c1
-rw-r--r--gtk/capture_dlg.c7
-rw-r--r--gtk/mgcp_stat.c16
-rw-r--r--gtk/radius_stat.c16
-rw-r--r--gtk/tcp_graph.c4
-rw-r--r--tap-h225counter.c1
-rw-r--r--tap-h225rassrt.c1
-rw-r--r--tap-mgcpstat.c16
-rw-r--r--tap-radiusstat.c19
10 files changed, 28 insertions, 54 deletions
diff --git a/capture.c b/capture.c
index b0efea1672..d615a4e4bd 100644
--- a/capture.c
+++ b/capture.c
@@ -324,7 +324,6 @@ capture_input_new_file(capture_options *capture_opts, gchar *new_file)
g_free(capture_opts->save_file);
capture_opts->save_file = NULL;
return FALSE;
- break;
}
}
diff --git a/capture_opts.c b/capture_opts.c
index a72f6c88f0..600d8c0a8f 100644
--- a/capture_opts.c
+++ b/capture_opts.c
@@ -540,7 +540,6 @@ capture_opts_add_opt(capture_options *capture_opts, int opt, const char *optarg,
#endif
status = capture_opts_output_to_pipe(capture_opts->save_file, &capture_opts->output_to_pipe);
return status;
- break;
case 'y': /* Set the pcap data link type */
#ifdef HAVE_PCAP_DATALINK_NAME_TO_VAL
capture_opts->linktype = linktype_name_to_val(optarg);
diff --git a/gtk/capture_dlg.c b/gtk/capture_dlg.c
index ebe1f9c010..5d88d7869c 100644
--- a/gtk/capture_dlg.c
+++ b/gtk/capture_dlg.c
@@ -448,16 +448,12 @@ guint32 value)
switch(unit) {
case(TIME_UNIT_SECOND):
return value;
- break;
case(TIME_UNIT_MINUTE):
return value * 60;
- break;
case(TIME_UNIT_HOUR):
return value * 60 * 60;
- break;
case(TIME_UNIT_DAY):
return value * 60 * 60 * 24;
- break;
default:
g_assert_not_reached();
return 0;
@@ -543,21 +539,18 @@ guint32 value)
switch(unit) {
case(SIZE_UNIT_KILOBYTES):
return value;
- break;
case(SIZE_UNIT_MEGABYTES):
if(value > G_MAXINT / 1024) {
return 0;
} else {
return value * 1024;
}
- break;
case(SIZE_UNIT_GIGABYTES):
if(value > G_MAXINT / (1024 * 1024)) {
return 0;
} else {
return value * 1024 * 1024;
}
- break;
default:
g_assert_not_reached();
return 0;
diff --git a/gtk/mgcp_stat.c b/gtk/mgcp_stat.c
index 9c4b8b9b0d..7fe9f62a0d 100644
--- a/gtk/mgcp_stat.c
+++ b/gtk/mgcp_stat.c
@@ -118,6 +118,7 @@ mgcpstat_packet(void *pms, packet_info *pinfo, epan_dissect_t *edt _U_, const vo
mgcpstat_t *ms=(mgcpstat_t *)pms;
const mgcp_info_t *mi=pmi;
nstime_t delta;
+ int ret = 0;
switch (mi->mgcp_type) {
@@ -125,24 +126,20 @@ mgcpstat_packet(void *pms, packet_info *pinfo, epan_dissect_t *edt _U_, const vo
if(mi->is_duplicate){
/* Duplicate is ignored */
ms->req_dup_num++;
- return 0;
}
else {
ms->open_req_num++;
- return 0;
}
- break;
+ break;
case MGCP_RESPONSE:
if(mi->is_duplicate){
/* Duplicate is ignored */
ms->rsp_dup_num++;
- return 0;
}
else if (!mi->request_available) {
/* no request was seen */
ms->disc_rsp_num++;
- return 0;
}
else {
ms->open_req_num--;
@@ -180,14 +177,15 @@ mgcpstat_packet(void *pms, packet_info *pinfo, epan_dissect_t *edt _U_, const vo
time_stat_update(&(ms->rtd[9]),&delta, pinfo);
}
- return 1;
+ ret = 1;
}
- break;
+ break;
default:
- return 0;
- break;
+ break;
}
+
+ return ret;
}
static void
diff --git a/gtk/radius_stat.c b/gtk/radius_stat.c
index 3c1ba8a2a4..d1c25b1033 100644
--- a/gtk/radius_stat.c
+++ b/gtk/radius_stat.c
@@ -131,6 +131,7 @@ radiusstat_packet(void *prs, packet_info *pinfo, epan_dissect_t *edt _U_, const
const radius_info_t *ri=pri;
nstime_t delta;
radius_category radius_cat = OTHERS;
+ int ret = 0;
switch (ri->code) {
case RADIUS_ACCESS_REQUEST:
@@ -175,14 +176,12 @@ radiusstat_packet(void *prs, packet_info *pinfo, epan_dissect_t *edt _U_, const
/* Duplicate is ignored */
rs->radius_rtd[OVERALL].req_dup_num++;
rs->radius_rtd[radius_cat].req_dup_num++;
- return 0;
}
else {
rs->radius_rtd[OVERALL].open_req_num++;
rs->radius_rtd[radius_cat].open_req_num++;
- return 0;
}
- break;
+ break;
case RADIUS_ACCESS_ACCEPT:
case RADIUS_ACCESS_REJECT:
@@ -198,13 +197,11 @@ radiusstat_packet(void *prs, packet_info *pinfo, epan_dissect_t *edt _U_, const
/* Duplicate is ignored */
rs->radius_rtd[OVERALL].rsp_dup_num++;
rs->radius_rtd[radius_cat].rsp_dup_num++;
- return 0;
}
else if (!ri->request_available) {
/* no request was seen */
rs->radius_rtd[OVERALL].disc_rsp_num++;
rs->radius_rtd[radius_cat].disc_rsp_num++;
- return 0;
}
else {
rs->radius_rtd[OVERALL].open_req_num--;
@@ -215,14 +212,15 @@ radiusstat_packet(void *prs, packet_info *pinfo, epan_dissect_t *edt _U_, const
time_stat_update(&(rs->radius_rtd[OVERALL].stats),&delta, pinfo);
time_stat_update(&(rs->radius_rtd[radius_cat].stats),&delta, pinfo);
- return 1;
+ ret = 1;
}
- break;
+ break;
default:
- return 0;
- break;
+ break;
}
+
+ return ret;
}
static void
diff --git a/gtk/tcp_graph.c b/gtk/tcp_graph.c
index b423671aa4..4dca66611b 100644
--- a/gtk/tcp_graph.c
+++ b/gtk/tcp_graph.c
@@ -2561,7 +2561,6 @@ static int get_label_dim (struct axis *axis, int dir, double label)
default:
puts ("initialize axis: an axis must be either horizontal or vertical");
return -1;
- break;
}
return dim;
}
@@ -2571,13 +2570,10 @@ static double axis_zoom_get (struct axis *axis, int dir)
switch (dir) {
case AXIS_HORIZONTAL:
return axis->g->zoom.x;
- break;
case AXIS_VERTICAL:
return axis->g->zoom.y;
- break;
default:
return -1;
- break;
}
}
diff --git a/tap-h225counter.c b/tap-h225counter.c
index bafc80ba32..2f4b6e3af8 100644
--- a/tap-h225counter.c
+++ b/tap-h225counter.c
@@ -225,7 +225,6 @@ h225counter_packet(void *phs, packet_info *pinfo _U_, epan_dissect_t *edt _U_, c
default:
return 0;
- break;
}
return 1;
diff --git a/tap-h225rassrt.c b/tap-h225rassrt.c
index 385ccc4cf0..67a688794c 100644
--- a/tap-h225rassrt.c
+++ b/tap-h225rassrt.c
@@ -169,7 +169,6 @@ h225rassrt_packet(void *phs, packet_info *pinfo _U_, epan_dissect_t *edt _U_, co
default:
return 0;
- break;
}
return 1;
}
diff --git a/tap-mgcpstat.c b/tap-mgcpstat.c
index 967f9d9260..745dbd64e9 100644
--- a/tap-mgcpstat.c
+++ b/tap-mgcpstat.c
@@ -76,6 +76,7 @@ mgcpstat_packet(void *pms, packet_info *pinfo, epan_dissect_t *edt _U_, const vo
mgcpstat_t *ms=(mgcpstat_t *)pms;
const mgcp_info_t *mi=pmi;
nstime_t delta;
+ int ret = 0;
switch (mi->mgcp_type) {
@@ -83,24 +84,20 @@ mgcpstat_packet(void *pms, packet_info *pinfo, epan_dissect_t *edt _U_, const vo
if(mi->is_duplicate){
/* Duplicate is ignored */
ms->req_dup_num++;
- return 0;
}
else {
ms->open_req_num++;
- return 0;
}
- break;
+ break;
case MGCP_RESPONSE:
if(mi->is_duplicate){
/* Duplicate is ignored */
ms->rsp_dup_num++;
- return 0;
}
else if (!mi->request_available) {
/* no request was seen */
ms->disc_rsp_num++;
- return 0;
}
else {
ms->open_req_num--;
@@ -140,14 +137,15 @@ mgcpstat_packet(void *pms, packet_info *pinfo, epan_dissect_t *edt _U_, const vo
time_stat_update(&(ms->rtd[10]),&delta, pinfo);
}
- return 1;
+ ret = 1;
}
- break;
+ break;
default:
- return 0;
- break;
+ break;
}
+
+ return ret;
}
static void
diff --git a/tap-radiusstat.c b/tap-radiusstat.c
index 1730c04e42..fc560b94e9 100644
--- a/tap-radiusstat.c
+++ b/tap-radiusstat.c
@@ -70,6 +70,7 @@ radiusstat_packet(void *prs, packet_info *pinfo, epan_dissect_t *edt _U_, const
radiusstat_t *rs=(radiusstat_t *)prs;
const radius_info_t *ri=pri;
nstime_t delta;
+ int ret = 0;
switch (ri->code) {
@@ -82,13 +83,11 @@ radiusstat_packet(void *prs, packet_info *pinfo, epan_dissect_t *edt _U_, const
if(ri->is_duplicate){
/* Duplicate is ignored */
rs->req_dup_num++;
- return 0;
}
else {
rs->open_req_num++;
- return 0;
}
- break;
+ break;
case RADIUS_ACCESS_ACCEPT:
case RADIUS_ACCESS_REJECT:
@@ -103,12 +102,10 @@ radiusstat_packet(void *prs, packet_info *pinfo, epan_dissect_t *edt _U_, const
if(ri->is_duplicate){
/* Duplicate is ignored */
rs->rsp_dup_num++;
- return 0;
}
else if (!ri->request_available) {
/* no request was seen */
rs->disc_rsp_num++;
- return 0;
}
else {
rs->open_req_num--;
@@ -122,21 +119,19 @@ radiusstat_packet(void *prs, packet_info *pinfo, epan_dissect_t *edt _U_, const
else if (ri->code == RADIUS_ACCOUNTING_RESPONSE) {
time_stat_update(&(rs->rtd[2]),&delta, pinfo);
}
-
-
-
else {
time_stat_update(&(rs->rtd[7]),&delta, pinfo);
}
- return 1;
+ ret = 1;
}
- break;
+ break;
default:
- return 0;
- break;
+ break;
}
+
+ return ret;
}
static void
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-05 13:00:42 +0000