diff options
author | Bill Meier <wmeier@newsguy.com> | 2014-02-25 15:42:35 -0500 |
---|---|---|
committer | Bill Meier <wmeier@newsguy.com> | 2014-02-25 20:46:49 +0000 |
commit | 11b5c15fdb815a2af400bfddef944dbac41a434a (patch) | |
tree | e7217ebcff4d4d9f7f95d0342b6776547e5537c3 /ui/cli | |
parent | c55c57ad72acda8cbce2841bc237f966bad5ae5b (diff) | |
download | wireshark-11b5c15fdb815a2af400bfddef944dbac41a434a.tar.gz |
Remove trailing whitespace
Change-Id: I8116f63ff88687c8db3fd6e8e23b22ab2f759af0
Reviewed-on: https://code.wireshark.org/review/385
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
Diffstat (limited to 'ui/cli')
-rw-r--r-- | ui/cli/tap-dcerpcstat.c | 2 | ||||
-rw-r--r-- | ui/cli/tap-funnel.c | 32 | ||||
-rw-r--r-- | ui/cli/tap-iousers.c | 4 | ||||
-rw-r--r-- | ui/cli/tap-rlcltestat.c | 2 | ||||
-rw-r--r-- | ui/cli/tap-rtspstat.c | 42 | ||||
-rw-r--r-- | ui/cli/tap-stats_tree.c | 28 |
6 files changed, 55 insertions, 55 deletions
diff --git a/ui/cli/tap-dcerpcstat.c b/ui/cli/tap-dcerpcstat.c index 71a8393844..5e05b0270e 100644 --- a/ui/cli/tap-dcerpcstat.c +++ b/ui/cli/tap-dcerpcstat.c @@ -152,7 +152,7 @@ dcerpcstat_draw(void *prs) printf("%s Major Version %u SRT Statistics:\n", rs->prog, rs->ver); printf("Filter: %s\n",rs->filter?rs->filter:""); printf("Procedure Calls Min SRT Max SRT Avg SRT\n"); - + for(i=0;i<rs->num_procedures;i++){ /* Only display procs with non-zero calls */ if(rs->procedures[i].num==0){ diff --git a/ui/cli/tap-funnel.c b/ui/cli/tap-funnel.c index b9a4982d18..71a6b915c0 100644 --- a/ui/cli/tap-funnel.c +++ b/ui/cli/tap-funnel.c @@ -23,7 +23,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include "config.h" @@ -49,18 +49,18 @@ static funnel_text_window_t* new_text_window(const gchar* title) { funnel_text_window_t* tw = g_new(funnel_text_window_t,1); tw->title = g_strdup(title); tw->text = g_string_new(""); - + if (!text_windows) text_windows = g_ptr_array_new(); - + g_ptr_array_add(text_windows,tw); - + return tw; } static void text_window_clear(funnel_text_window_t* tw) { g_string_free(tw->text,TRUE); - tw->text = g_string_new(""); + tw->text = g_string_new(""); } static void text_window_append(funnel_text_window_t* tw, const char *text ) { @@ -73,7 +73,7 @@ static void text_window_set_text(funnel_text_window_t* tw, const char* text) { } static void text_window_prepend(funnel_text_window_t* tw, const char *text) { - g_string_prepend(tw->text,text); + g_string_prepend(tw->text,text); } static const gchar* text_window_get_text(funnel_text_window_t* tw) { @@ -127,18 +127,18 @@ void initialize_funnel_ops(void) { void funnel_dump_all_text_windows(void) { guint i; - + if (!text_windows) return; - + for ( i = 0 ; i < text_windows->len; i++) { funnel_text_window_t* tw = (funnel_text_window_t*)g_ptr_array_index(text_windows,i); printf("\n========================== %s " "==========================\n%s\n",tw->title,tw->text->str); - + g_ptr_array_remove_index(text_windows,i); g_free(tw->title); g_string_free(tw->text,TRUE); - g_free(tw); + g_free(tw); } } @@ -152,18 +152,18 @@ typedef struct _menu_cb_t { static void init_funnel_cmd(const char *opt_arg, void* data ) { - gchar** args = g_strsplit(opt_arg,",",0); + gchar** args = g_strsplit(opt_arg,",",0); gchar** arg; menu_cb_t* mcb = data; - + for(arg = args; *arg ; arg++) { g_strstrip(*arg); } - + if (mcb->callback) { mcb->callback(mcb->callback_data); } - + } static void register_menu_cb(const char *name, @@ -172,7 +172,7 @@ static void register_menu_cb(const char *name, gpointer callback_data, gboolean retap _U_) { menu_cb_t* mcb = g_malloc(sizeof(menu_cb_t)); - + mcb->callback = callback; mcb->callback_data = callback_data; @@ -180,7 +180,7 @@ static void register_menu_cb(const char *name, menus = g_hash_table_new(g_str_hash,g_str_equal); g_hash_table_insert(menus,g_strdup(name),mcb); - + register_stat_cmd_arg(name,init_funnel_cmd,mcb); } diff --git a/ui/cli/tap-iousers.c b/ui/cli/tap-iousers.c index 4c7ebbf9e8..890598cc9a 100644 --- a/ui/cli/tap-iousers.c +++ b/ui/cli/tap-iousers.c @@ -129,7 +129,7 @@ iousers_process_name_packet_with_conv_id( } static void -iousers_process_address_packet(io_users_t *iu, const address *src, const address *dst, guint64 pkt_len, +iousers_process_address_packet(io_users_t *iu, const address *src, const address *dst, guint64 pkt_len, nstime_t *ts) { const address *addr1, *addr2; @@ -209,7 +209,7 @@ iousers_udpip_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, con } iousers_process_name_packet(iu, name1, name2, direction, pinfo->fd->pkt_len, &pinfo->rel_ts, &pinfo->fd->abs_ts); - + return 1; } diff --git a/ui/cli/tap-rlcltestat.c b/ui/cli/tap-rlcltestat.c index 70220df125..02291eb8ae 100644 --- a/ui/cli/tap-rlcltestat.c +++ b/ui/cli/tap-rlcltestat.c @@ -322,7 +322,7 @@ rlc_lte_stat_draw(void *phs) hs->common_stats.pcch_frames, hs->common_stats.pcch_bytes); /* Per-UE table entries */ - + /* Set title that shows how many UEs currently in table */ for (tmp = list; (tmp!=NULL); tmp=tmp->next, number_of_ues++); diff --git a/ui/cli/tap-rtspstat.c b/ui/cli/tap-rtspstat.c index 1a57e9488b..fbb52fe659 100644 --- a/ui/cli/tap-rtspstat.c +++ b/ui/cli/tap-rtspstat.c @@ -1,5 +1,5 @@ /* tap-rtspstat.c - * tap-rtspstat March 2011 + * tap-rtspstat March 2011 * * Stephane GORSE (Orange Labs / France Telecom) * Copied from Jean-Michel FAYARD's works (HTTP) @@ -9,17 +9,17 @@ * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. @@ -71,8 +71,8 @@ rtsp_init_hash( rtspstat_t *sp) { int i; - sp->hash_responses = g_hash_table_new( g_int_hash, g_int_equal); - + sp->hash_responses = g_hash_table_new( g_int_hash, g_int_equal); + for (i=0 ; rtsp_status_code_vals[i].strptr ; i++ ) { gint *key = g_new (gint,1); @@ -91,7 +91,7 @@ rtsp_draw_hash_requests( gchar *key _U_ , rtsp_request_methode_t *data, gchar * { if (data->packets==0) return; - printf( format, data->response, data->packets); + printf( format, data->response, data->packets); } static void @@ -106,9 +106,9 @@ rtsp_draw_hash_responses( gint * key _U_ , rtsp_response_code_t *data, char * fo /* " RTSP %3d %-35s %9d packets", */ printf(format, data->response_code, data->name, data->packets ); } - - + + /* NOT USED at this moment */ /* static void @@ -120,12 +120,12 @@ rtsp_free_hash( gpointer key, gpointer value, gpointer user_data _U_ ) */ static void rtsp_reset_hash_responses(gchar *key _U_ , rtsp_response_code_t *data, gpointer ptr _U_ ) -{ +{ data->packets = 0; } static void rtsp_reset_hash_requests(gchar *key _U_ , rtsp_request_methode_t *data, gpointer ptr _U_ ) -{ +{ data->packets = 0; } @@ -152,8 +152,8 @@ rtspstat_packet(void *psp , packet_info *pinfo _U_, epan_dissect_t *edt _U_, con rtsp_response_code_t *sc; *key=value->response_code; - sc = (rtsp_response_code_t *)g_hash_table_lookup( - sp->hash_responses, + sc = (rtsp_response_code_t *)g_hash_table_lookup( + sp->hash_responses, key); if (sc==NULL){ /* non standard status code ; we classify it as others @@ -178,19 +178,19 @@ rtspstat_packet(void *psp , packet_info *pinfo _U_, epan_dissect_t *edt _U_, con else{ *key=599; } - sc = (rtsp_response_code_t *)g_hash_table_lookup( - sp->hash_responses, + sc = (rtsp_response_code_t *)g_hash_table_lookup( + sp->hash_responses, key); if (sc==NULL) return 0; } sc->packets++; - } + } else if (value->request_method){ rtsp_request_methode_t *sc; - sc = (rtsp_request_methode_t *)g_hash_table_lookup( - sp->hash_requests, + sc = (rtsp_request_methode_t *)g_hash_table_lookup( + sp->hash_requests, value->request_method); if (sc==NULL){ sc=g_new(rtsp_request_methode_t,1); @@ -238,13 +238,13 @@ gtk_rtspstat_init(const char *opt_arg,void* userdata _U_) rtspstat_t *sp; const char *filter=NULL; GString *error_string; - + if (!strncmp (opt_arg, "rtsp,stat,", 10)){ filter=opt_arg+10; } else { filter=NULL; } - + sp = (rtspstat_t *)g_malloc( sizeof(rtspstat_t) ); if(filter){ sp->filter=g_strdup(filter); @@ -254,7 +254,7 @@ gtk_rtspstat_init(const char *opt_arg,void* userdata _U_) /*g_hash_table_foreach( rtsp_status, (GHFunc)rtsp_reset_hash_responses, NULL);*/ - error_string = register_tap_listener( + error_string = register_tap_listener( "rtsp", sp, filter, diff --git a/ui/cli/tap-stats_tree.c b/ui/cli/tap-stats_tree.c index 345e898579..722f1ff6fe 100644 --- a/ui/cli/tap-stats_tree.c +++ b/ui/cli/tap-stats_tree.c @@ -7,17 +7,17 @@ * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. @@ -46,7 +46,7 @@ struct _tree_pres { }; struct _tree_cfg_pres { - gchar *init_string; + gchar *init_string; }; static void @@ -54,12 +54,12 @@ draw_stats_tree(void *psp) { stats_tree *st = (stats_tree *)psp; GString *s; - + s= stats_tree_format_as_str(st, ST_FORMAT_PLAIN, stats_tree_get_default_sort_col(st), stats_tree_is_default_sort_DESC(st)); printf("%s",s->str); - g_string_free(s,TRUE); + g_string_free(s,TRUE); } static void @@ -69,7 +69,7 @@ init_stats_tree(const char *opt_arg, void *userdata _U_) GString *error_string; stats_tree_cfg *cfg = NULL; stats_tree *st = NULL; - + if (abbr) { cfg = stats_tree_get_cfg_by_abbr(abbr); @@ -84,14 +84,14 @@ init_stats_tree(const char *opt_arg, void *userdata _U_) report_failure("no such stats_tree (%s) found in stats_tree registry",abbr); return; } - + g_free(abbr); - + } else { - report_failure("could not obtain stats_tree abbr (%s) from arg '%s'",abbr,opt_arg); + report_failure("could not obtain stats_tree abbr (%s) from arg '%s'",abbr,opt_arg); return; } - + error_string = register_tap_listener(st->cfg->tapname, st, st->filter, @@ -99,7 +99,7 @@ init_stats_tree(const char *opt_arg, void *userdata _U_) stats_tree_reset, stats_tree_packet, draw_stats_tree); - + if (error_string) { report_failure("stats_tree for: %s failed to attach to the tap: %s",cfg->name,error_string->str); return; @@ -113,12 +113,12 @@ static void register_stats_tree_tap (gpointer k _U_, gpointer v, gpointer p _U_) { stats_tree_cfg *cfg = (stats_tree_cfg *)v; - + cfg->pr = (tree_cfg_pres *)g_malloc(sizeof(tree_cfg_pres)); cfg->pr->init_string = g_strdup_printf("%s,tree", cfg->abbr); register_stat_cmd_arg(cfg->pr->init_string, init_stats_tree, NULL); - + } static void |