diff options
231 files changed, 892 insertions, 892 deletions
diff --git a/capture_ui_utils.c b/capture_ui_utils.c index b0dd741382..16a456ed19 100644 --- a/capture_ui_utils.c +++ b/capture_ui_utils.c @@ -492,7 +492,7 @@ get_if_name(const char *if_text) */ if ((strncmp(if_name, "://", 3) != 0) && !isdigit(if_name[1])) { /* - * OK, we've found a colon followed neither by "//" nor by digit. + * OK, we've found a colon followed neither by "//" nor by digit. * Skip blanks following it. */ if_name++; diff --git a/codecs/codecs.h b/codecs/codecs.h index 29ec7e7faa..396586075f 100644 --- a/codecs/codecs.h +++ b/codecs/codecs.h @@ -6,17 +6,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. diff --git a/echld/echld-util.c b/echld/echld-util.c index 9a3716ef80..31d858c40d 100644 --- a/echld/echld-util.c +++ b/echld/echld-util.c @@ -50,7 +50,7 @@ static gboolean pong(echld_msg_type_t type, GByteArray* ba _U_, void* data) { long ret = -1; gettimeofday(&t,NULL); - + switch (type) { case ECHLD_PONG: ret = timevaldiff(&(p->tv),&t); @@ -95,7 +95,7 @@ static gboolean got_param(echld_msg_type_t type, GByteArray* ba _U_, void* data) char* err_msg; switch (type) { - case ECHLD_PARAM: + case ECHLD_PARAM: if (g->cb) { char* param; char* value; @@ -123,7 +123,7 @@ static gboolean got_param(echld_msg_type_t type, GByteArray* ba _U_, void* data) extern echld_state_t echld_get_param(int chld_id, const char* param, echld_param_cb_t acb, void* cb_data) { struct _get_param* g = g_new0(struct _get_param,1); - echld_parent_encoder_t* enc; + echld_parent_encoder_t* enc; parent_decoder_t* dec; enc_msg_t* em; @@ -142,7 +142,7 @@ extern echld_state_t echld_get_param(int chld_id, const char* param, echld_param extern echld_state_t echld_set_param(int chld_id, const char* param, const char* value, echld_param_cb_t acb, void* cb_data) { struct _get_param* g = g_new0(struct _get_param,1); - echld_parent_encoder_t* enc; + echld_parent_encoder_t* enc; parent_decoder_t* dec; enc_msg_t* em; @@ -200,7 +200,7 @@ static gboolean closed(echld_msg_type_t type, GByteArray* ba, void* data) { return TRUE; } - + echld_state_t echld_close(int child_id, echld_close_cb_t pcb, void* cb_data) { close_t* c = g_new0(close_t,1); c->cb = pcb; diff --git a/echld_test.c b/echld_test.c index 5aa5db376d..8fb7d310ed 100644 --- a/echld_test.c +++ b/echld_test.c @@ -98,7 +98,7 @@ static char* psadd_cmd(char** params _U_, char** err) { echld_new_child_params_add_params(paramsets[ps_id], params[2], params[3], NULL); return g_strdup_printf("PSAdd ps_id=%d %s='%s'", ps_id, params[2], params[3]); -} +} static char* psmerge_cmd(char** params, char** err) { int ps1_id = (int) strtol(params[1], NULL, 10); @@ -352,12 +352,12 @@ static int invoke_cmd(FILE* in_fp) { fprintf(stdout, "%s\n", str); g_free(str); } - + g_strfreev(params); return TRUE; } } - + fprintf(stdout, "Error: no such command %s\n", cmd_line); return TRUE; } else { @@ -380,7 +380,7 @@ int main(int argc _U_, char** argv _U_) { struct timeval tv; int tot_cycles = 0; echld_init_t init = {ECHLD_ENCODING_JSON,argv[0],main,NULL,NULL,NULL,NULL}; - + tv.tv_sec = 5; tv.tv_usec = 0; diff --git a/epan/addr_resolv.c b/epan/addr_resolv.c index c0ccb6ea99..35bbd2d303 100644 --- a/epan/addr_resolv.c +++ b/epan/addr_resolv.c @@ -302,10 +302,10 @@ static hashether_t *add_eth_name(const guint8 *addr, const gchar *name); static void add_serv_port_cb(const guint32 port); -/* http://eternallyconfuzzled.com/tuts/algorithms/jsw_tut_hashing.aspx#existing +/* http://eternallyconfuzzled.com/tuts/algorithms/jsw_tut_hashing.aspx#existing * One-at-a-Time hash */ -static guint32 +static guint32 ipv6_oat_hash(gconstpointer key) { int len = 16; diff --git a/epan/addr_resolv.h b/epan/addr_resolv.h index dd06b63821..3999be2266 100644 --- a/epan/addr_resolv.h +++ b/epan/addr_resolv.h @@ -74,7 +74,7 @@ typedef struct serv_port { } serv_port_t; /* - * + * */ #define DUMMY_ADDRESS_ENTRY 1<<0 #define TRIED_RESOLVE_ADDRESS 1<<1 diff --git a/epan/app_mem_usage.c b/epan/app_mem_usage.c index 55093ae847..7bc5a20079 100644 --- a/epan/app_mem_usage.c +++ b/epan/app_mem_usage.c @@ -1,4 +1,4 @@ -/* +/* * app_mem_usage.c * * $Id$ @@ -161,7 +161,7 @@ static const ws_mem_usage_t total_usage = { "Total", get_total_mem_used_by_app, static const ws_mem_usage_t rss_usage = { "RSS", get_rss_mem_used_by_app, NULL }; #endif -static const ws_mem_usage_t *memory_components[MAX_COMPONENTS] = { +static const ws_mem_usage_t *memory_components[MAX_COMPONENTS] = { #ifdef get_total_mem_used_by_app &total_usage, #endif diff --git a/epan/app_mem_usage.h b/epan/app_mem_usage.h index fa320984ba..064313d6e5 100644 --- a/epan/app_mem_usage.h +++ b/epan/app_mem_usage.h @@ -1,4 +1,4 @@ -/* +/* * app_mem_usage.h * * $Id$ diff --git a/epan/arcnet_pids.h b/epan/arcnet_pids.h index 59016331a4..eea647b48e 100644 --- a/epan/arcnet_pids.h +++ b/epan/arcnet_pids.h @@ -12,12 +12,12 @@ * 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. diff --git a/epan/asn1.c b/epan/asn1.c index 4ff44bb28e..d7a90d19fb 100644 --- a/epan/asn1.c +++ b/epan/asn1.c @@ -176,7 +176,7 @@ void rose_ctx_clean_data(rose_ctx_t *rctx) { asn1_ctx_t *get_asn1_ctx(void *ptr) { asn1_ctx_t *actx = (asn1_ctx_t*)ptr; - if (!asn1_ctx_check_signature(actx)) + if (!asn1_ctx_check_signature(actx)) actx = NULL; return actx; @@ -186,13 +186,13 @@ rose_ctx_t *get_rose_ctx(void *ptr) { rose_ctx_t *rctx = (rose_ctx_t*)ptr; asn1_ctx_t *actx = (asn1_ctx_t*)ptr; - if (!asn1_ctx_check_signature(actx)) + if (!asn1_ctx_check_signature(actx)) actx = NULL; if (actx) rctx = actx->rose_ctx; - if (!rose_ctx_check_signature(rctx)) + if (!rose_ctx_check_signature(rctx)) rctx = NULL; return rctx; diff --git a/epan/asn1.h b/epan/asn1.h index b6d46bfbd2..5dd63c0f3d 100644 --- a/epan/asn1.h +++ b/epan/asn1.h @@ -92,11 +92,11 @@ typedef struct _asn1_ctx_t { tvbuff_t *data_value_descriptor; const char *direct_reference; gint32 indirect_reference; - gint encoding; - /* - 0 : single-ASN1-type, - 1 : octet-aligned, - 2 : arbitrary + gint encoding; + /* + 0 : single-ASN1-type, + 1 : octet-aligned, + 2 : arbitrary */ tvbuff_t *single_asn1_type; tvbuff_t *octet_aligned; @@ -120,9 +120,9 @@ typedef struct _asn1_ctx_t { gboolean data_value_descr_present; tvbuff_t *data_value_descriptor; gint identification; - /* - 0 : syntaxes, - 1 : syntax, + /* + 0 : syntaxes, + 1 : syntax, 2 : presentation-context-id, 3 : context-negotiation, 4 : transfer-syntax, @@ -149,11 +149,11 @@ typedef struct _asn1_ctx_t { typedef struct _rose_ctx_t { guint32 signature; dissector_table_t arg_global_dissector_table; - dissector_table_t arg_local_dissector_table; + dissector_table_t arg_local_dissector_table; dissector_table_t res_global_dissector_table; - dissector_table_t res_local_dissector_table; + dissector_table_t res_local_dissector_table; dissector_table_t err_global_dissector_table; - dissector_table_t err_local_dissector_table; + dissector_table_t err_local_dissector_table; /* filling in description into tree, info column, any buffer */ int apdu_depth; gboolean fillin_info; @@ -161,17 +161,17 @@ typedef struct _rose_ctx_t { gsize fillin_buf_size; struct { /* "dynamic" data */ gint pdu; - /* - 1 : invoke, - 2 : returnResult, + /* + 1 : invoke, + 2 : returnResult, 3 : returnError, 4 : reject */ - gint code; - /* + gint code; + /* -1 : none (optional in ReturnResult) - 0 : local, - 1 : global + 0 : local, + 1 : global */ gint32 code_local; const char *code_global; diff --git a/epan/conversation.c b/epan/conversation.c index 7d9375d169..8d557315bb 100644 --- a/epan/conversation.c +++ b/epan/conversation.c @@ -180,7 +180,7 @@ conversation_create_from_template(conversation_t *conversation, const address *a * Compute the hash value for two given address/port pairs if the match * is to be exact. */ -/* http://eternallyconfuzzled.com/tuts/algorithms/jsw_tut_hashing.aspx#existing +/* http://eternallyconfuzzled.com/tuts/algorithms/jsw_tut_hashing.aspx#existing * One-at-a-Time hash */ static guint @@ -691,7 +691,7 @@ conversation_new(const guint32 setup_frame, const address *addr1, const address new_key->port1 = port1; new_key->port2 = port2; - conversation = se_new(conversation_t); + conversation = se_new(conversation_t); memset(conversation, 0, sizeof(conversation_t)); conversation->index = new_index; diff --git a/epan/crc16-tvb.c b/epan/crc16-tvb.c index b3f98179f8..40fac739e7 100644 --- a/epan/crc16-tvb.c +++ b/epan/crc16-tvb.c @@ -99,7 +99,7 @@ guint16 crc16_plain_tvb_offset(tvbuff_t *tvb, guint offset, guint len) buf = tvb_get_ptr(tvb, offset, len); crc = crc16_plain_update(crc, buf, len); - + return crc16_plain_finalize(crc); } @@ -111,7 +111,7 @@ guint16 crc16_plain_tvb_offset_seed(tvbuff_t *tvb, guint offset, guint len, guin buf = tvb_get_ptr(tvb, offset, len); crc = crc16_plain_update(crc, buf, len); - + return crc16_plain_finalize(crc); } diff --git a/epan/crc16-tvb.h b/epan/crc16-tvb.h index bd6cec2512..30bf03cd7a 100644 --- a/epan/crc16-tvb.h +++ b/epan/crc16-tvb.h @@ -108,12 +108,12 @@ WS_DLL_PUBLIC guint16 crc16_plain_tvb_offset_seed(tvbuff_t *tvb, guint offset, g /** Compute CRC16 checksum of a tv buffer using the parameters * Width = 16 bits * Poly = 0x9949 - * Reflection = true - * Algorithm = table-driven + * Reflection = true + * Algorithm = table-driven @param tvb The tv buffer containing the data. @param offset The offset into the tv buffer. @param len The number of bytes to include in the computation. - @param seed The seed to use. + @param seed The seed to use. @return The CRC16 checksum. */ WS_DLL_PUBLIC guint16 crc16_0x9949_tvb_offset_seed(tvbuff_t *tvb, guint offset, guint len, guint16 seed); diff --git a/epan/crc32-tvb.h b/epan/crc32-tvb.h index c08919486a..e5422a4aa4 100644 --- a/epan/crc32-tvb.h +++ b/epan/crc32-tvb.h @@ -103,14 +103,14 @@ WS_DLL_PUBLIC guint32 crc32_mpeg2_tvb_offset_seed(tvbuff_t *tvb, guint offset, /** Compute CRC32 checksum of a tv buffer using the parameters * Width = 32 bits * Poly = 0x0AA725CF - * Reflection = true - * Algorithm = table-driven + * Reflection = true + * Algorithm = table-driven @param tvb The tv buffer containing the data. @param offset The offset into the tv buffer. @param len The number of bytes to include in the computation. - @param seed The seed to use. + @param seed The seed to use. @return The CRC32 checksum. */ -WS_DLL_PUBLIC guint32 crc32_0x0AA725CF_tvb_offset_seed(tvbuff_t *tvb, +WS_DLL_PUBLIC guint32 crc32_0x0AA725CF_tvb_offset_seed(tvbuff_t *tvb, guint offset, guint len, guint32 seed); #ifdef __cplusplus diff --git a/epan/crypt/airpdcap_system.h b/epan/crypt/airpdcap_system.h index 7833f51909..810f5960f1 100644 --- a/epan/crypt/airpdcap_system.h +++ b/epan/crypt/airpdcap_system.h @@ -126,7 +126,7 @@ typedef struct _AIRPDCAP_SEC_ASSOCIATION_ID { } AIRPDCAP_SEC_ASSOCIATION_ID, *PAIRPDCAP_SEC_ASSOCIATION_ID; typedef struct _AIRPDCAP_SEC_ASSOCIATION { - /* This is for reassociations. A linked list of old security + /* This is for reassociations. A linked list of old security * associations is kept. GCS */ struct _AIRPDCAP_SEC_ASSOCIATION* next; diff --git a/epan/crypt/airpdcap_user.h b/epan/crypt/airpdcap_user.h index fa7ec714cb..ecb0cfa08e 100644 --- a/epan/crypt/airpdcap_user.h +++ b/epan/crypt/airpdcap_user.h @@ -211,7 +211,7 @@ typedef struct _AIRPDCAP_KEYS_COLLECTION { * - 01020304... (WPA + 256-bit raw key) * @param key_type [IN] Type of key used for string. Possibilities include: * - AIRPDCAP_KEY_TYPE_WEP (40/64-bit and 104/128-bit WEP) - * - AIRPDCAP_KEY_TYPE_WPA_PWD (WPA + plaintext password + "wildcard" SSID or + * - AIRPDCAP_KEY_TYPE_WPA_PWD (WPA + plaintext password + "wildcard" SSID or * WPA + plaintext password + specific SSID) * - AIRPDCAP_KEY_TYPE_WPA_PSK (WPA + 256-bit raw key) * @return A pointer to a freshly-g_malloc()ed decryption_key_t struct on diff --git a/epan/decode_as.h b/epan/decode_as.h index 248cdf23bf..423ada8be8 100644 --- a/epan/decode_as.h +++ b/epan/decode_as.h @@ -34,7 +34,7 @@ extern "C" { #endif /* __cplusplus */ -/** @file +/** @file */ #define MAX_DECODE_AS_PROMPT_LEN 200 diff --git a/epan/dfilter/dfilter-macro.h b/epan/dfilter/dfilter-macro.h index 9e1700d336..453c1429aa 100644 --- a/epan/dfilter/dfilter-macro.h +++ b/epan/dfilter/dfilter-macro.h @@ -5,17 +5,17 @@ * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> * Copyright 2001 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. diff --git a/epan/dfilter/dfunctions.c b/epan/dfilter/dfunctions.c index 90bd167866..1be94d0230 100644 --- a/epan/dfilter/dfunctions.c +++ b/epan/dfilter/dfunctions.c @@ -2,7 +2,7 @@ * $Id$ * * Wireshark - Network traffic analyzer - * + * * Copyright 2006 Gilbert Ramirez <gram@alumni.rice.edu> * * This program is free software; you can redistribute it and/or @@ -62,7 +62,7 @@ string_walk(GList* arg1list, GList **retval, gchar(*conv_func)(gchar)) arg1 = arg1list; while (arg1) { - arg_fvalue = (fvalue_t *)arg1->data; + arg_fvalue = (fvalue_t *)arg1->data; switch (fvalue_type_ftenum(arg_fvalue)) { case FT_STRING: case FT_STRINGZ: @@ -82,7 +82,7 @@ string_walk(GList* arg1list, GList **retval, gchar(*conv_func)(gchar)) default: break; - } + } arg1 = arg1->next; } @@ -113,7 +113,7 @@ df_func_len(GList* arg1list, GList *arg2junk _U_, GList **retval) arg1 = arg1list; while (arg1) { - arg_fvalue = (fvalue_t *)arg1->data; + arg_fvalue = (fvalue_t *)arg1->data; switch (fvalue_type_ftenum(arg_fvalue)) { case FT_STRING: case FT_STRINGZ: @@ -127,7 +127,7 @@ df_func_len(GList* arg1list, GList *arg2junk _U_, GList **retval) default: break; - } + } arg1 = arg1->next; } @@ -144,7 +144,7 @@ df_func_size(GList* arg1list, GList *arg2junk _U_, GList **retval) arg1 = arg1list; while (arg1) { - arg_fvalue = (fvalue_t *)arg1->data; + arg_fvalue = (fvalue_t *)arg1->data; ft_len = fvalue_new(FT_UINT32); fvalue_set_uinteger(ft_len, fvalue_length(arg_fvalue)); diff --git a/epan/dfilter/dfunctions.h b/epan/dfilter/dfunctions.h index 2483d732ad..0289ca94cf 100644 --- a/epan/dfilter/dfunctions.h +++ b/epan/dfilter/dfunctions.h @@ -2,7 +2,7 @@ * $Id$ * * Wireshark - Network traffic analyzer - * + * * Copyright 2006 Gilbert Ramirez <gram@alumni.rice.edu> * * This program is free software; you can redistribute it and/or diff --git a/epan/dfilter/dfvm.c b/epan/dfilter/dfvm.c index a2500e1ad3..3385bcabb5 100644 --- a/epan/dfilter/dfvm.c +++ b/epan/dfilter/dfvm.c @@ -99,7 +99,7 @@ dfvm_dump(FILE *f, dfilter_t *df) char *value_str; GSList *range_list; drange_node *range_item; - + /* First dump the constant initializations */ fprintf(f, "Constants:\n"); length = df->consts->len; diff --git a/epan/dfilter/drange.c b/epan/dfilter/drange.c index d33dfc5e61..eb972b4d2d 100644 --- a/epan/dfilter/drange.c +++ b/epan/dfilter/drange.c @@ -48,7 +48,7 @@ drange_node_dup(drange_node *org) if (!org) return NULL; - + new_range_node = g_new(drange_node,1); new_range_node->start_offset = org->start_offset; new_range_node->length = org->length; diff --git a/epan/dfilter/gencode.h b/epan/dfilter/gencode.h index ae2b027b9b..3260ce61b3 100644 --- a/epan/dfilter/gencode.h +++ b/epan/dfilter/gencode.h @@ -5,17 +5,17 @@ * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> * Copyright 2001 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. diff --git a/epan/dissector_filters.h b/epan/dissector_filters.h index 6f383888bc..819e317a42 100644 --- a/epan/dissector_filters.h +++ b/epan/dissector_filters.h @@ -31,7 +31,7 @@ extern "C" { #endif /* __cplusplus */ -/** @file +/** @file */ /** callback function definition: is a filter available for this packet? */ diff --git a/epan/dtd.h b/epan/dtd.h index 5d1a6e2740..b6bda1160c 100644 --- a/epan/dtd.h +++ b/epan/dtd.h @@ -1,7 +1,7 @@ /* * dtd.h * - * XML dissector for Wireshark + * XML dissector for Wireshark * DTD import declarations * * Copyright 2005, Luis E. Garcia Ontanon <luis@ontanon.org> @@ -16,12 +16,12 @@ * 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. diff --git a/epan/dtd_parse.h b/epan/dtd_parse.h index d00ad01b4b..11011c726f 100644 --- a/epan/dtd_parse.h +++ b/epan/dtd_parse.h @@ -1,5 +1,5 @@ /* dtd_parse.h -* an XML dissector for Wireshark +* an XML dissector for Wireshark * header file to declare functions defined in lexer and used in parser, * or vice versa * @@ -15,12 +15,12 @@ * 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. @@ -29,5 +29,5 @@ extern void DtdParse(void*,int,dtd_token_data_t*,dtd_build_data_t*); extern void *DtdParseAlloc(void *(*)(gsize)); extern void DtdParseFree( void*, void(*)(void*) ); -extern void DtdParseTrace(FILE *TraceFILE, char *zTracePrompt); +extern void DtdParseTrace(FILE *TraceFILE, char *zTracePrompt); extern int Dtd_Parse_lex(void); diff --git a/epan/ex-opt.c b/epan/ex-opt.c index 9922078432..ec9dd9dc41 100644 --- a/epan/ex-opt.c +++ b/epan/ex-opt.c @@ -1,6 +1,6 @@ /* * ex-opt.c - * + * * Extension command line options * * (c) 2006, Luis E. Garcia Ontanon <luis@ontanon.org> @@ -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" @@ -35,15 +35,15 @@ static GHashTable* ex_opts = NULL; gboolean ex_opt_add(const gchar* optarg) { gchar** splitted; - - if (!ex_opts) + + if (!ex_opts) ex_opts = g_hash_table_new(g_str_hash,g_str_equal); - + splitted = g_strsplit(optarg,":",2); - + if (splitted[0] && splitted[1]) { GPtrArray* this_opts = (GPtrArray *)g_hash_table_lookup(ex_opts,splitted[0]); - + if (this_opts) { g_ptr_array_add(this_opts,splitted[1]); g_free(splitted[0]); @@ -52,9 +52,9 @@ gboolean ex_opt_add(const gchar* optarg) { g_ptr_array_add(this_opts,splitted[1]); g_hash_table_insert(ex_opts,splitted[0],this_opts); } - + g_free(splitted); - + return TRUE; } else { g_strfreev(splitted); @@ -64,12 +64,12 @@ gboolean ex_opt_add(const gchar* optarg) { gint ex_opt_count(const gchar* key) { GPtrArray* this_opts; - + if (! ex_opts) return 0; - + this_opts = (GPtrArray *)g_hash_table_lookup(ex_opts,key); - + if (this_opts) { return this_opts->len; } else { @@ -79,12 +79,12 @@ gint ex_opt_count(const gchar* key) { const gchar* ex_opt_get_nth(const gchar* key, guint index) { GPtrArray* this_opts; - + if (! ex_opts) return 0; - + this_opts = (GPtrArray *)g_hash_table_lookup(ex_opts,key); - + if (this_opts) { if (this_opts->len > index) { return (const gchar *)g_ptr_array_index(this_opts,index); @@ -95,21 +95,21 @@ const gchar* ex_opt_get_nth(const gchar* key, guint index) { } else { return NULL; } - + } extern const gchar* ex_opt_get_next(const gchar* key) { GPtrArray* this_opts; - + if (! ex_opts) return 0; - + this_opts = (GPtrArray *)g_hash_table_lookup(ex_opts,key); - + if (this_opts) { if (this_opts->len) return (const gchar *)g_ptr_array_remove_index(this_opts,0); - else + else return NULL; } else { return NULL; diff --git a/epan/expert.c b/epan/expert.c index bca9de9785..f05f0fe255 100644 --- a/epan/expert.c +++ b/epan/expert.c @@ -324,7 +324,7 @@ expert_set_info_vformat(packet_info *pinfo, proto_item *pi, int group, int sever expert_set_item_flags(pi, group, severity); } - if ((pi == NULL) || (PITEM_FINFO(pi) == NULL) || + if ((pi == NULL) || (PITEM_FINFO(pi) == NULL) || ((guint)severity >= FI_GET_FLAG(PITEM_FINFO(pi), PI_SEVERITY_MASK))) { col_add_str(pinfo->cinfo, COL_EXPERT, val_to_str(severity, expert_severity_vals, "Unknown (%u)")); } diff --git a/epan/expert.h b/epan/expert.h index 91216d844a..057d970e9f 100644 --- a/epan/expert.h +++ b/epan/expert.h @@ -143,7 +143,7 @@ expert_add_info_format(packet_info *pinfo, proto_item *pi, expert_field *eiindex /** Add an expert info associated with some byte data Add an expert info tree to a protocol item using registered expert info item. - This function is intended to replace places where + This function is intended to replace places where proto_tree_add_text or proto_tree_add_none_format + expert_add_info would be used. @param tree Current protocol item (or NULL) @@ -162,7 +162,7 @@ proto_tree_add_expert(proto_tree *tree, packet_info *pinfo, expert_field* eiinde /** Add an expert info associated with some byte data Add an expert info tree to a protocol item, using registered expert info item, but with a formatted message. - This function is intended to replace places where + This function is intended to replace places where proto_tree_add_text or proto_tree_add_none_format + expert_add_info_format would be used. @param tree Current protocol item (or NULL) diff --git a/epan/exported_pdu.c b/epan/exported_pdu.c index b8ea067a7d..9f0286b90d 100644 --- a/epan/exported_pdu.c +++ b/epan/exported_pdu.c @@ -1,4 +1,4 @@ -/* +/* * exported_pdu.c * exported_pdu helper functions * Copyright 2013, Anders Broman <anders-broman@ericsson.com> diff --git a/epan/exported_pdu.h b/epan/exported_pdu.h index 34d136a54b..1a14adb6db 100644 --- a/epan/exported_pdu.h +++ b/epan/exported_pdu.h @@ -1,4 +1,4 @@ -/* +/* * exported_pdu.h * Routines for exported_pdu dissection * Copyright 2013, Anders Broman <anders-broman@ericsson.com> @@ -72,10 +72,10 @@ #define EXP_PDU_TAG_END_OF_OPT 0 /**< End-of-options Tag. */ /* 1 - 9 reserved */ #define EXP_PDU_TAG_OPTIONS_LENGTH 10 /**< Total length of the options excluding this TLV */ -#define EXP_PDU_TAG_LINKTYPE 11 /**< The value part is the linktype value defined by tcpdump +#define EXP_PDU_TAG_LINKTYPE 11 /**< The value part is the linktype value defined by tcpdump * http://www.tcpdump.org/linktypes.html - */ -#define EXP_PDU_TAG_PROTO_NAME 12 /**< The value part should be an ASCII non NULL terminated string + */ +#define EXP_PDU_TAG_PROTO_NAME 12 /**< The value part should be an ASCII non NULL terminated string * of the short protocol name used by Wireshark e.g "sip" * Will be used to call the next dissector. */ @@ -140,7 +140,7 @@ typedef struct _exp_pdu_data_t { * * The tags in the tag buffer SHOULD be added in numerical order. */ -WS_DLL_PUBLIC exp_pdu_data_t *load_export_pdu_tags(packet_info *pinfo, +WS_DLL_PUBLIC exp_pdu_data_t *load_export_pdu_tags(packet_info *pinfo, const char* proto_name, int wtap_encap, guint32 wanted_exp_tags); #endif /* EXPORTED_PDU_H */ diff --git a/epan/follow.c b/epan/follow.c index fe17c1740c..1ca59c8cff 100644 --- a/epan/follow.c +++ b/epan/follow.c @@ -108,7 +108,7 @@ build_follow_conv_filter( packet_info *pi ) { } else if (!strcmp(proto_name, "udp")) { is_udp = TRUE; } - + protos = wmem_list_frame_next(protos); } @@ -249,8 +249,8 @@ static guint src_port[2] = { 0, 0 }; void reassemble_tcp( guint32 tcp_stream, guint32 sequence, guint32 acknowledgement, - guint32 length, const char* data, guint32 data_length, - int synflag, address *net_src, address *net_dst, + guint32 length, const char* data, guint32 data_length, + int synflag, address *net_src, address *net_dst, guint srcport, guint dstport, guint32 packet_num) { guint8 srcx[MAX_IPADDR_LEN], dstx[MAX_IPADDR_LEN]; int src_index, j, first = 0, len; @@ -337,7 +337,7 @@ reassemble_tcp( guint32 tcp_stream, guint32 sequence, guint32 acknowledgement, /* Before adding data for this flow to the data_out_file, check whether * this frame acks fragments that were already seen. This happens when - * frames are not in the capture file, but were actually seen by the + * frames are not in the capture file, but were actually seen by the * receiving host (Fixes bug 592). */ if( frags[1-src_index] ) { @@ -453,7 +453,7 @@ check_fragments( int idx, tcp_stream_chunk *sc, guint32 acknowledged ) { guint32 new_pos; /* this one has more than we have seen. let's get the - payload that we have not seen. This happens when + payload that we have not seen. This happens when part of this frame has been retransmitted */ new_pos = seq[idx] - current->seq; @@ -464,10 +464,10 @@ check_fragments( int idx, tcp_stream_chunk *sc, guint32 acknowledged ) { } seq[idx] += (current->len - new_pos); - } + } /* Remove the fragment from the list as the "new" part of it - * has been processed or its data has been seen already in + * has been processed or its data has been seen already in * another packet. */ if( prev ) { prev->next = current->next; @@ -511,7 +511,7 @@ check_fragments( int idx, tcp_stream_chunk *sc, guint32 acknowledged ) { seq[idx] = lowest_seq; return 1; } - } + } return 0; } @@ -551,7 +551,7 @@ write_packet_data( int idx, tcp_stream_chunk *sc, const char *data ) ret = fwrite( sc, 1, sizeof(tcp_stream_chunk), data_out_file ); DISSECTOR_ASSERT(sizeof(tcp_stream_chunk) == ret); - + ret = fwrite( data, 1, sc->dlen, data_out_file ); DISSECTOR_ASSERT(sc->dlen == ret); diff --git a/epan/ftypes/ftype-guid.c b/epan/ftypes/ftype-guid.c index 205ffc453d..68ba119d48 100644 --- a/epan/ftypes/ftype-guid.c +++ b/epan/ftypes/ftype-guid.c @@ -62,17 +62,17 @@ get_guid(const char *s, e_guid_t *guid) return FALSE; } } - + p = s; - strncpy(digits, p, 8); + strncpy(digits, p, 8); digits[8] = '\0'; guid->data1 = (guint32)strtoul(digits, NULL, 16); p += 9; - strncpy(digits, p, 4); + strncpy(digits, p, 4); digits[4] = '\0'; guid->data2 = (guint16)strtoul(digits, NULL, 16); p += 5; - strncpy(digits, p, 4); + strncpy(digits, p, 4); digits[4] = '\0'; guid->data3 = (guint16)strtoul(digits, NULL, 16); p += 5; diff --git a/epan/ftypes/ftype-ipv6.c b/epan/ftypes/ftype-ipv6.c index 47a6624319..42ed6d1ff0 100644 --- a/epan/ftypes/ftype-ipv6.c +++ b/epan/ftypes/ftype-ipv6.c @@ -99,7 +99,7 @@ value_get(fvalue_t *fv) return fv->value.ipv6.addr.bytes; } -static const guint8 bitmasks[9] = +static const guint8 bitmasks[9] = { 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfe, 0xff }; static gint diff --git a/epan/funnel.c b/epan/funnel.c index 13cf9743db..26b2874f12 100644 --- a/epan/funnel.c +++ b/epan/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" @@ -57,7 +57,7 @@ void funnel_register_menu(const char *name, m->callback_data = callback_data; m->retap = retap; m->next = NULL; - + if (!menus) { menus = m; } else { diff --git a/epan/garrayfix.h b/epan/garrayfix.h index 70a4bedcbd..906bae34ba 100644 --- a/epan/garrayfix.h +++ b/epan/garrayfix.h @@ -9,17 +9,17 @@ * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> * Copyright 2007 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. diff --git a/epan/gcp.h b/epan/gcp.h index 71859b49e2..9383d5048e 100644 --- a/epan/gcp.h +++ b/epan/gcp.h @@ -148,7 +148,7 @@ typedef enum _gcp_wildcard_t { typedef struct _gcp_term_t { const gchar* str; - + const guint8* buffer; guint len; @@ -157,7 +157,7 @@ typedef struct _gcp_term_t { gchar* nsap; gcp_msg_t* start; - + } gcp_term_t; typedef struct _gcp_terms_t { diff --git a/epan/golay.c b/epan/golay.c index b805700fdf..84c6b0d3a3 100644 --- a/epan/golay.c +++ b/epan/golay.c @@ -169,7 +169,7 @@ gint32 golay_errors(guint32 codeword) syndrome = received_parity ^ (golay_coding(received_data)); w = weight12(syndrome); - + /* * The properties of the golay code are such that the Hamming distance (ie, * the minimum distance between codewords) is 8; that means that one bit of @@ -184,14 +184,14 @@ gint32 golay_errors(guint32 codeword) if( w <= 3 ) { return ((gint32) syndrome)<<12; } - + /* the next thing to try is one error in the data bits. * we try each bit in turn and see if an error in that bit would have given * us anything like the parity bits we got. At this point, we tolerate two * errors in the parity bits, but three or more errors would give a total * error weight of 4 or more, which means it's actually uncorrectable or * closer to another codeword. */ - + for( i = 0; i<12; i++ ) { guint error = 1<<i; guint coding_error = golay_encode_matrix[i]; @@ -237,7 +237,7 @@ gint32 golay_errors(guint32 codeword) /* uncorrectable error */ return -1; } - + /* decode a received codeword. Up to 3 errors are corrected for; 4 @@ -249,7 +249,7 @@ gint golay_decode(guint32 w) guint data = (guint)w & 0xfff; gint32 errors = golay_errors(w); guint data_errors; - + if( errors == -1 ) return -1; data_errors = (guint)errors & 0xfff; diff --git a/epan/next_tvb.h b/epan/next_tvb.h index 5e8ca5f04c..f809a17178 100644 --- a/epan/next_tvb.h +++ b/epan/next_tvb.h @@ -21,8 +21,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -/* The buffers returned by these functions are all allocated with a - * packet lifetime or are static buffers and does not have have to be freed. +/* The buffers returned by these functions are all allocated with a + * packet lifetime or are static buffers and does not have have to be freed. * However, take into account that when the packet dissection * completes, these buffers will be automatically reclaimed/freed. * If you need the buffer to remain for a longer scope than packet lifetime diff --git a/epan/oids.c b/epan/oids.c index fcc748977e..8d095aa6b6 100644 --- a/epan/oids.c +++ b/epan/oids.c @@ -109,7 +109,7 @@ static void prepopulate_oids(void) { } } - + static oid_info_t* add_oid(const char* name, oid_kind_t kind, const oid_value_type_t* type, oid_key_t* key, guint oid_len, guint32 *subids) { guint i = 0; @@ -1085,7 +1085,7 @@ guint oid_subid2encoded(guint subids_len, guint32* subids, guint8** bytes_p) { } else { bytelen += 5; } - } + } *bytes_p = b = (guint8 *)ep_alloc(bytelen); @@ -1107,7 +1107,7 @@ guint oid_subid2encoded(guint subids_len, guint32* subids, guint8** bytes_p) { case 2: *(b++) = ((subid & 0x00003F80) >> 7) | 0x80; case 1: *(b++) = subid & 0x0000007F ; break; } - } + } return bytelen; } diff --git a/epan/packet.c b/epan/packet.c index e89ab312df..49acde4d25 100644 --- a/epan/packet.c +++ b/epan/packet.c @@ -452,7 +452,7 @@ dissect_packet(epan_dissect_t *edt, struct wtap_pkthdr *phdr, frame_delta_abs_time(edt->session, fd, fd->frame_ref_num, &edt->pi.rel_ts); /* pkt comment use first user, later from phdr */ - if (fd->flags.has_user_comment) + if (fd->flags.has_user_comment) edt->pi.pkt_comment = epan_get_user_comment(edt->session, fd); else if (fd->flags.has_phdr_comment) edt->pi.pkt_comment = phdr->opt_comment; @@ -517,7 +517,7 @@ dissect_file(epan_dissect_t *edt, struct wtap_pkthdr *phdr, frame_delta_abs_time(edt->session, fd, fd->frame_ref_num, &edt->pi.rel_ts); /* pkt comment use first user, later from phdr */ - if (fd->flags.has_user_comment) + if (fd->flags.has_user_comment) edt->pi.pkt_comment = epan_get_user_comment(edt->session, fd); else if (fd->flags.has_phdr_comment) edt->pi.pkt_comment = phdr->opt_comment; diff --git a/epan/prefs.c b/epan/prefs.c index b4e7dc4dee..73bc2322f2 100644 --- a/epan/prefs.c +++ b/epan/prefs.c @@ -1115,7 +1115,7 @@ prefs_register_uat_preference_qt(module_t *module, const char *name, pref_t* preference = register_preference(module, name, title, description, PREF_UAT); preference->varp.uat = uat; - + preference->gui = GUI_QT; } @@ -2529,7 +2529,7 @@ prefs_register_modules(void) "measured. Longer window relative to burst rate resolution increases " "processing overhead. Will be truncated to a multiple of burst resolution.", 10,&prefs.st_burst_windowlen); - + prefs_register_enum_preference(stats_module, "st_sort_defcolflag", "Default sort column for stats_tree stats", "Sets the default column by which stats based on the stats_tree " @@ -2548,7 +2548,7 @@ prefs_register_modules(void) "system will be sorted taking case into account. Else the case of the name " "will be ignored.", &prefs.st_sort_casesensitve); - + prefs_register_bool_preference(stats_module, "st_sort_rng_nameonly", "Always sort 'range' nodes by name", "When selected, the stats_tree nodes representing a range of values " @@ -2564,7 +2564,7 @@ prefs_register_modules(void) "the sort direction of the tree. Only effective if \"Always sort " "'range' nodes by name\" is also selected.", &prefs.st_sort_rng_fixorder); - + prefs_register_bool_preference(stats_module, "st_sort_showfullname", "Display the full stats_tree plug-in name", "When selected, the full name (including menu path) of the stats_tree " diff --git a/epan/prefs.h b/epan/prefs.h index 6060c94cbb..97983afbd1 100644 --- a/epan/prefs.h +++ b/epan/prefs.h @@ -128,7 +128,7 @@ typedef enum { pref_current } pref_source_t; -/* +/* * Update channel. */ typedef enum { @@ -209,7 +209,7 @@ typedef struct _e_prefs { software_update_channel_e gui_update_channel; gint gui_update_interval; gchar *saved_at_version; - gboolean unknown_prefs; /* unknown or obsolete pref(s) */ + gboolean unknown_prefs; /* unknown or obsolete pref(s) */ gboolean unknown_colorfilters; /* unknown or obsolete color filter(s) */ guint gui_qt_language; /* Qt Translation language selection */ gboolean gui_packet_editor; /* Enable Packet Editor */ @@ -471,8 +471,8 @@ WS_DLL_PUBLIC void prefs_register_uat_preference_qt(module_t *module, /* * Register a color preference. Currently does not have any "GUI Dialog" support - * so the color data needs to be managed independently. Currently used by the - * "GUI preferences" to aid in reading/writing the preferences file, but the + * so the color data needs to be managed independently. Currently used by the + * "GUI preferences" to aid in reading/writing the preferences file, but the * "data" is still managed by the specific "GUI preferences" dialog. */ void prefs_register_color_preference(module_t *module, const char *name, @@ -480,8 +480,8 @@ void prefs_register_color_preference(module_t *module, const char *name, /* * Register a custom preference. Currently does not have any "GUI Dialog" support - * so data needs to be managed independently. Currently used by the - * "GUI preferences" to aid in reading/writing the preferences file, but the + * so data needs to be managed independently. Currently used by the + * "GUI preferences" to aid in reading/writing the preferences file, but the * "data" is still managed by the specific "GUI preferences" dialog. */ void prefs_register_custom_preference(module_t *module, const char *name, diff --git a/epan/proto.h b/epan/proto.h index afc9f26005..b61d8d7569 100644 --- a/epan/proto.h +++ b/epan/proto.h @@ -412,7 +412,7 @@ struct _header_field_info { hf.hfinfo.parent = 0; \ hf.hfinfo.ref_type = HF_REF_TYPE_NONE; \ hf.hfinfo.same_name_prev_id = -1; \ - hf.hfinfo.same_name_next = NULL; + hf.hfinfo.same_name_next = NULL; /** Used when registering many fields at once, using proto_register_field_array() */ typedef struct hf_register_info { diff --git a/epan/range.c b/epan/range.c index b546ceb463..30e06b2e78 100644 --- a/epan/range.c +++ b/epan/range.c @@ -108,7 +108,7 @@ range_convert_str_work(range_t **rangep, const gchar *es, guint32 max_value, if ( (rangep == NULL) || (es == NULL) ) return CVT_SYNTAX_ERROR; - + /* Allocate a range; this has room for one subrange. */ range = (range_t *)g_malloc(RANGE_HDR_SIZE + sizeof (range_admin_t)); range->nranges = 0; @@ -293,7 +293,7 @@ ranges_are_equal(range_t *a, range_t *b) if ( (a == NULL) || (b == NULL) ) return FALSE; - + if (a->nranges != b->nranges) return FALSE; @@ -316,7 +316,7 @@ void range_foreach(range_t *range, void (*callback)(guint32 val)) { guint32 i, j; - + if (range && callback) { for (i=0; i < range->nranges; i++) { for (j = range->ranges[i].low; j <= range->ranges[i].high; j++) @@ -357,7 +357,7 @@ range_copy(range_t *src) if (src == NULL) return NULL; - + range_size = RANGE_HDR_SIZE + src->nranges*sizeof (range_admin_t); dst = (range_t *)g_malloc(range_size); memcpy(dst, src, range_size); diff --git a/epan/reassemble.c b/epan/reassemble.c index 1523c1d3bd..ab90e03265 100644 --- a/epan/reassemble.c +++ b/epan/reassemble.c @@ -589,7 +589,7 @@ fragment_delete(reassembly_table *table, const packet_info *pinfo, return NULL; } - fd_tvb_data=fd_head->tvb_data; + fd_tvb_data=fd_head->tvb_data; /* loop over all partial fragments and free any tvbuffs */ for(fd=fd_head->next;fd;){ fragment_item *tmp_fd; @@ -920,7 +920,7 @@ fragment_add_work(fragment_head *fd_head, tvbuff_t *tvb, const int offset, * or later). */ g_slice_free(fragment_item, fd); - + /* * This is an attempt to add a fragment to a * reassembly that had already completed. @@ -1795,7 +1795,7 @@ fragment_add_seq_work(fragment_head *fd_head, tvbuff_t *tvb, const int offset, static fragment_head * fragment_add_seq_common(reassembly_table *table, tvbuff_t *tvb, const int offset, const packet_info *pinfo, - const guint32 id, const void *data, + const guint32 id, const void *data, guint32 frag_number, const guint32 frag_data_len, const gboolean more_frags, const guint32 flags, gpointer *orig_keyp) @@ -1922,7 +1922,7 @@ fragment_add_seq_common(reassembly_table *table, tvbuff_t *tvb, fragment_head * fragment_add_seq(reassembly_table *table, tvbuff_t *tvb, const int offset, - const packet_info *pinfo, const guint32 id, const void *data, + const packet_info *pinfo, const guint32 id, const void *data, const guint32 frag_number, const guint32 frag_data_len, const gboolean more_frags, const guint32 flags) { @@ -1968,7 +1968,7 @@ fragment_add_seq(reassembly_table *table, tvbuff_t *tvb, const int offset, static fragment_head * fragment_add_seq_check_work(reassembly_table *table, tvbuff_t *tvb, const int offset, const packet_info *pinfo, - const guint32 id, const void *data, + const guint32 id, const void *data, const guint32 frag_number, const guint32 frag_data_len, const gboolean more_frags, const guint32 flags) @@ -1987,7 +1987,7 @@ fragment_add_seq_check_work(reassembly_table *table, tvbuff_t *tvb, return (fragment_head *)g_hash_table_lookup(table->reassembled_table, &reass_key); } - fd_head = fragment_add_seq_common(table, tvb, offset, pinfo, id, data, + fd_head = fragment_add_seq_common(table, tvb, offset, pinfo, id, data, frag_number, frag_data_len, more_frags, flags|REASSEMBLE_FLAGS_CHECK_DATA_PRESENT, @@ -2062,7 +2062,7 @@ fragment_add_seq_next(reassembly_table *table, tvbuff_t *tvb, const int offset, void fragment_start_seq_check(reassembly_table *table, const packet_info *pinfo, - const guint32 id, const void *data, + const guint32 id, const void *data, const guint32 tot_len) { fragment_head *fd_head; diff --git a/epan/reassemble.h b/epan/reassemble.h index 59e7e20851..94252ffd57 100644 --- a/epan/reassemble.h +++ b/epan/reassemble.h @@ -241,7 +241,7 @@ fragment_add_check(reassembly_table *table, tvbuff_t *tvb, const int offset, */ WS_DLL_PUBLIC fragment_head * fragment_add_seq(reassembly_table *table, tvbuff_t *tvb, const int offset, - const packet_info *pinfo, const guint32 id, const void *data, + const packet_info *pinfo, const guint32 id, const void *data, const guint32 frag_number, const guint32 frag_data_len, const gboolean more_frags, const guint32 flags); @@ -275,7 +275,7 @@ fragment_add_seq_next(reassembly_table *table, tvbuff_t *tvb, const int offset, WS_DLL_PUBLIC void fragment_start_seq_check(reassembly_table *table, const packet_info *pinfo, - const guint32 id, const void *data, + const guint32 id, const void *data, const guint32 tot_len); WS_DLL_PUBLIC fragment_head * diff --git a/epan/reassemble_test.c b/epan/reassemble_test.c index afa3a3f3af..eed8f0df55 100644 --- a/epan/reassemble_test.c +++ b/epan/reassemble_test.c @@ -99,8 +99,8 @@ static char *data; static tvbuff_t *tvb; static packet_info pinfo; -/* fragment_table maps from datagram ids to fragment_head - reassembled_table maps from <packet number,datagram id> to +/* fragment_table maps from datagram ids to fragment_head + reassembled_table maps from <packet number,datagram id> to fragment_head */ static reassembly_table test_reassembly_table; diff --git a/epan/reedsolomon.c b/epan/reedsolomon.c index 012d4c3aaa..6fabd3b0bb 100644 --- a/epan/reedsolomon.c +++ b/epan/reedsolomon.c @@ -256,7 +256,7 @@ gen_ldec(void) a(0) + a(1) @ + a(2) @^2 + ... + a(m-1) @^(m-1) we consider the integer "i" whose binary representation with a(0) being LSB and a(m-1) MSB is (a(0),a(1),...,a(m-1)) and locate the entry - "index_of[i]". Now, @^index_of[i] is that element whose polynomial + "index_of[i]". Now, @^index_of[i] is that element whose polynomial representation is (a(0),a(1),a(2),...,a(m-1)). NOTE: The element alpha_to[2^m-1] = 0 always signifying that the @@ -264,7 +264,7 @@ gen_ldec(void) Similarily, the element index_of[0] = A0 always signifying that the power of alpha which has the polynomial representation (0,0,...,0) is "infinity". - + */ static void @@ -404,7 +404,7 @@ encode_rs(dtype data[KK], dtype bb[NN-KK]) * Return number of symbols corrected, or -1 if codeword is illegal * or uncorrectable. If eras_pos is non-null, the detected error locations * are written back. NOTE! This array must be at least NN-KK elements long. - * + * * First "no_eras" erasures are declared by the calling program. Then, the * maximum # of errors correctable is t_after_eras = floor((NN-KK-no_eras)/2). * If the number of channel errors is not greater than "t_after_eras" the @@ -453,7 +453,7 @@ eras_dec_rs(dtype data[NN], int eras_pos[NN-KK], int no_eras) if(RECEIVED(j) == 0) continue; tmp = Index_of[RECEIVED(j)]; - + /* s[i] ^= Alpha_to[modnn(tmp + (B0+i-1)*j)]; */ for(i=1;i<=NN-KK;i++) s[i] ^= Alpha_to[modnn(tmp + (B0+i-1)*PRIM*j)]; @@ -465,7 +465,7 @@ eras_dec_rs(dtype data[NN], int eras_pos[NN-KK], int no_eras) /*printf("syndrome %d = %x\n",i,s[i]);*/ s[i] = Index_of[s[i]]; } - + if (!syn_error) { /* if syndrome is zero, data[] is a codeword and there are no * errors to correct. So return data[] unmodified @@ -490,7 +490,7 @@ eras_dec_rs(dtype data[NN], int eras_pos[NN-KK], int no_eras) #if DEBUG >= 1 /* Test code that verifies the erasure locator polynomial just constructed Needed only for decoder debugging. */ - + /* find roots of the erasure location polynomial */ for(i=1;i<=no_eras;i++) reg[i] = Index_of[lambda[i]]; @@ -524,7 +524,7 @@ eras_dec_rs(dtype data[NN], int eras_pos[NN-KK], int no_eras) } for(i=0;i<NN-KK+1;i++) b[i] = Index_of[lambda[i]]; - + /* * Begin Berlekamp-Massey algorithm to determine error+erasure * locator polynomial @@ -627,7 +627,7 @@ eras_dec_rs(dtype data[NN], int eras_pos[NN-KK], int no_eras) omega[i] = Index_of[tmp]; } omega[NN-KK] = A0; - + /* * Compute error values in poly-form. num1 = omega(inv(X(l))), num2 = * inv(X(l))**(B0-1) and den = lambda_pr(inv(X(l))) all in poly-form @@ -640,7 +640,7 @@ eras_dec_rs(dtype data[NN], int eras_pos[NN-KK], int no_eras) } num2 = Alpha_to[modnn(root[j] * (B0 - 1) + NN)]; den = 0; - + /* lambda[i+1] for i even is the formal derivative lambda_pr of lambda[i] */ for (i = min_(deg_lambda,NN-KK-1) & ~1; i >= 0; i -=2) { if(lambda[i+1] != A0) diff --git a/epan/sigcomp-udvm.h b/epan/sigcomp-udvm.h index 8fcd792e17..15a7119b5d 100644 --- a/epan/sigcomp-udvm.h +++ b/epan/sigcomp-udvm.h @@ -13,12 +13,12 @@ * 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. @@ -36,7 +36,7 @@ #define UDVM_MEMORY_SIZE 65536 extern tvbuff_t* decompress_sigcomp_message(tvbuff_t *bytecode_tvb, tvbuff_t *message_tvb, packet_info *pinfo, - proto_tree *tree, gint destination, + proto_tree *tree, gint destination, gint print_flags, gint hf_id, gint header_len, gint byte_code_state_len, gint byte_code_id_len, gint udvm_start_ip); @@ -44,6 +44,6 @@ extern tvbuff_t* decompress_sigcomp_message(tvbuff_t *bytecode_tvb, tvbuff_t *me /* example: extern const value_string q931_cause_location_vals[]; */ -#endif +#endif /* SIGCOMP_UDVM_H */ diff --git a/epan/sigcomp_state_hdlr.h b/epan/sigcomp_state_hdlr.h index 4492b5ab0a..5d7c82a4dc 100644 --- a/epan/sigcomp_state_hdlr.h +++ b/epan/sigcomp_state_hdlr.h @@ -1,5 +1,5 @@ /* sigcomp_state_hdlr.c - * Routines making up the State handler of the Univerasl Decompressor Virtual Machine (UDVM) + * Routines making up the State handler of the Univerasl Decompressor Virtual Machine (UDVM) * used for Signaling Compression (SigComp) dissection. * Copyright 2004, Anders Broman <anders.broman@ericsson.com> * @@ -13,12 +13,12 @@ * 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. @@ -34,7 +34,7 @@ #define SIGCOMP_STATE_HDLR_H extern const value_string result_code_vals[]; -extern int udvm_state_access(tvbuff_t *tvb, proto_tree *tree,guint8 *buff,guint16 p_id_start, guint16 p_id_length, guint16 state_begin, guint16 *state_length, +extern int udvm_state_access(tvbuff_t *tvb, proto_tree *tree,guint8 *buff,guint16 p_id_start, guint16 p_id_length, guint16 state_begin, guint16 *state_length, guint16 *state_address, guint16 *state_instruction, gint hf_id); extern void udvm_state_create(guint8 *state_buff,guint8 *state_identifier_buff,guint16 p_id_length); @@ -45,5 +45,5 @@ extern void sigcomp_init_udvm(void); #define STATE_BUFFER_SIZE 20 #define STATE_MIN_ACCESS_LEN 6 -#endif +#endif /* SIGCOMP_STATE_HDLR_H */ diff --git a/epan/stat_cmd_args.h b/epan/stat_cmd_args.h index b3f6fb0dfa..f7fac1d7a7 100644 --- a/epan/stat_cmd_args.h +++ b/epan/stat_cmd_args.h @@ -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. diff --git a/epan/stats_tree.c b/epan/stats_tree.c index 83713c2064..43f537b0ff 100644 --- a/epan/stats_tree.c +++ b/epan/stats_tree.c @@ -811,7 +811,7 @@ stats_tree_create_range_node(stats_tree *st, const gchar *name, int parent_id, . return rng_root->id; } -extern int +extern int stats_tree_create_range_node_string(stats_tree *st, const gchar *name, int parent_id, int num_str_ranges, gchar** str_ranges) diff --git a/epan/stats_tree_priv.h b/epan/stats_tree_priv.h index bc79d4df59..19385a37e7 100644 --- a/epan/stats_tree_priv.h +++ b/epan/stats_tree_priv.h @@ -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. @@ -69,7 +69,7 @@ struct _burst_bucket { struct _stat_node { gchar* name; int id; - + /** the counter it keeps */ gint counter; /** total of all values submitted - for computing averages */ @@ -86,10 +86,10 @@ struct _stat_node { /** children nodes by name */ GHashTable *hash; - + /** the owner of this node */ stats_tree *st; - + /** relatives */ stat_node *parent; stat_node *children; @@ -97,7 +97,7 @@ struct _stat_node { /** used to check if value is within range */ range_pair_t *rng; - + /** node presentation data */ st_node_pres *pr; }; @@ -105,9 +105,9 @@ struct _stat_node { struct _stats_tree { /** the "class" from which it's derived */ stats_tree_cfg *cfg; - + char *filter; - + /* times */ double start; double elapsed; @@ -122,16 +122,16 @@ struct _stats_tree { * value: parent node */ GHashTable *names; - + /** used for quicker lookups of parent nodes */ GPtrArray *parents; - + /** * tree representation * to be defined (if needed) by the implementations */ tree_pres *pr; - + /** every tree in nature has one */ stat_node root; }; @@ -141,7 +141,7 @@ struct _stats_tree_cfg { gchar* name; gchar* tapname; register_stat_group_t stat_group; - + gboolean in_use; gboolean plugin; @@ -152,27 +152,27 @@ struct _stats_tree_cfg { /** tap listener flags for the per-packet callback */ guint flags; - + /* * node presentation callbacks */ /** last to be called at node creation */ void (*setup_node_pr)(stat_node*); - + /** last to be called at node destruction */ void (*free_node_pr)(stat_node*); - + /** to be called for every node in the tree */ void (*draw_node)(stat_node*); void (*reset_node)(stat_node*); - + /** * tree presentation callbacks */ tree_cfg_pres *pr; - - + + tree_pres *(*new_tree_pr)(stats_tree*); void (*free_tree_pr)(stats_tree*); void (*draw_tree)(stats_tree*); @@ -215,7 +215,7 @@ WS_DLL_PUBLIC gchar *stats_tree_get_abbr(const gchar *optarg); /** obtains a stats tree from the registry given its abbr */ WS_DLL_PUBLIC stats_tree_cfg *stats_tree_get_cfg_by_abbr(const char *abbr); -/** obtains a stats tree list from the registry +/** obtains a stats tree list from the registry caller should free returned list with g_list_free() */ WS_DLL_PUBLIC GList *stats_tree_get_cfg_list(void); diff --git a/epan/stream.c b/epan/stream.c index f7df235ce3..74e541e224 100644 --- a/epan/stream.c +++ b/epan/stream.c @@ -361,7 +361,7 @@ stream_t *find_stream_conv ( const struct conversation *conv, int p2p_dir ) /* cleanup the stream routines */ /* Note: stream_cleanup must only be called when seasonal memory - * is also freed since the hash tables countain pointers to + * is also freed since the hash tables countain pointers to * se_alloc'd memory. */ void stream_cleanup( void ) diff --git a/epan/strutil.c b/epan/strutil.c index 0df9b515c9..b983b5cc9a 100644 --- a/epan/strutil.c +++ b/epan/strutil.c @@ -381,13 +381,13 @@ format_text_chr(const guchar *string, const size_t len, const guchar chr) fmtbuf_len[idx] = INITIAL_FMTBUF_SIZE; } column = 0; - while (string < stringend) + while (string < stringend) { /* - * Is there enough room for this character, + * Is there enough room for this character, * and also enough room for a terminating '\0'? */ - if (column+1 >= fmtbuf_len[idx]) + if (column+1 >= fmtbuf_len[idx]) { /* * Double the buffer's size if it's not big enough. @@ -400,17 +400,17 @@ format_text_chr(const guchar *string, const size_t len, const guchar chr) } c = *string++; - if (g_ascii_isprint(c)) + if (g_ascii_isprint(c)) { fmtbuf[idx][column] = c; column++; - } - else if (isspace(c)) + } + else if (isspace(c)) { fmtbuf[idx][column] = ' '; column++; - } - else + } + else { fmtbuf[idx][column] = chr; column++; diff --git a/epan/t35.c b/epan/t35.c index 112be50886..9c22e59506 100644 --- a/epan/t35.c +++ b/epan/t35.c @@ -304,24 +304,24 @@ const value_string H221ManufacturerCode_vals[] = { { 0xb4001d00, "GPT Video Systems" }, /* From Ref. 2 */ { 0xb4001e00, "GPT Video Systems" }, /* From Ref. 2 */ { 0xb4001f00, "GPT Video Systems" }, /* From Ref. 2 */ - { 0xb4002000, "Marconi Communications" }, /* From Ref. 2 */ - { 0xb4002100, "Indigo Active Vision Systems" }, /* From Ref. 2 */ - { 0xb4002200, "LiveWorks Limited" }, /* From Ref. 2 */ - { 0xb4002300, "ATL Telecom Limited" }, /* From Ref. 2 */ - { 0xb4002a00, "Network Alchemy Limited" }, /* From Ref. 2 */ - { 0xb4004200, "Motion Media Technology" }, /* From Ref. 2 */ - { 0xb4004400, "Data Connection" }, /* From Ref. 2 */ - { 0xb4004500, "Westbay Engineers" }, /* From Ref. 2 */ - { 0xb4004600, "FarSite Communications" }, /* From Ref. 2 */ - { 0xb4004900, "ImageCom" }, /* From Ref. 2 */ - { 0xb4004d00, "Madge Networks" }, /* From Ref. 2 */ - { 0xb4005200, "Ridgeway Systems and Software" }, /* From Ref. 2 */ - { 0xb4005300, "SpliceCom" }, /* From Ref. 2 */ - { 0xb4005400, "TeleWare" }, /* From Ref. 2 */ - { 0xb4005600, "Vegastream" }, /* From Ref. 2 */ - { 0xb4006600, "Westell" }, /* From Ref. 2 */ - { 0xb4006900, "ISDN Communications" }, /* From Ref. 2 */ - { 0xb400c000, "Codian" }, /* From Ref. 2 */ + { 0xb4002000, "Marconi Communications" }, /* From Ref. 2 */ + { 0xb4002100, "Indigo Active Vision Systems" }, /* From Ref. 2 */ + { 0xb4002200, "LiveWorks Limited" }, /* From Ref. 2 */ + { 0xb4002300, "ATL Telecom Limited" }, /* From Ref. 2 */ + { 0xb4002a00, "Network Alchemy Limited" }, /* From Ref. 2 */ + { 0xb4004200, "Motion Media Technology" }, /* From Ref. 2 */ + { 0xb4004400, "Data Connection" }, /* From Ref. 2 */ + { 0xb4004500, "Westbay Engineers" }, /* From Ref. 2 */ + { 0xb4004600, "FarSite Communications" }, /* From Ref. 2 */ + { 0xb4004900, "ImageCom" }, /* From Ref. 2 */ + { 0xb4004d00, "Madge Networks" }, /* From Ref. 2 */ + { 0xb4005200, "Ridgeway Systems and Software" }, /* From Ref. 2 */ + { 0xb4005300, "SpliceCom" }, /* From Ref. 2 */ + { 0xb4005400, "TeleWare" }, /* From Ref. 2 */ + { 0xb4005600, "Vegastream" }, /* From Ref. 2 */ + { 0xb4006600, "Westell" }, /* From Ref. 2 */ + { 0xb4006900, "ISDN Communications" }, /* From Ref. 2 */ + { 0xb400c000, "Codian" }, /* From Ref. 2 */ { 0xb5000000, "Compression Labs" }, /* From Ref. 1 */ { 0xb5000001, "PictureTel" }, /* From Ref. 1 */ diff --git a/epan/t35.h b/epan/t35.h index de2f8fad57..1ed2aa88cc 100644 --- a/epan/t35.h +++ b/epan/t35.h @@ -24,7 +24,7 @@ */ #ifndef __T35_H__ -#define __T35_H__ +#define __T35_H__ #include <epan/value_string.h> diff --git a/epan/tap-voip.h b/epan/tap-voip.h index fe6d0e3c2a..476397dbf9 100644 --- a/epan/tap-voip.h +++ b/epan/tap-voip.h @@ -6,17 +6,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. diff --git a/epan/tpg.c b/epan/tpg.c index aad97e5f19..596be07762 100644 --- a/epan/tpg.c +++ b/epan/tpg.c @@ -2,7 +2,7 @@ * helper functions for TPG * * (c) 2005, Luis E. Garcia Ontanon <luis@ontanon.org> - * + * * $Id$ * * Wireshark - Network traffic analyzer @@ -31,7 +31,7 @@ #include <epan/wmem/wmem.h> #include <epan/packet.h> -extern guint32 tpg_ipv4(tvbparse_elem_t* e _U_) { +extern guint32 tpg_ipv4(tvbparse_elem_t* e _U_) { /* XXX TO DO */ return 0; } diff --git a/epan/tpg.h b/epan/tpg.h index fbe2a05ab6..7701162e51 100644 --- a/epan/tpg.h +++ b/epan/tpg.h @@ -2,7 +2,7 @@ * Definitions of helper functions for TPG * * (c) 2005, Luis E. Garcia Ontanon <luis@ontanon.org> - * + * * $Id$ * * Wireshark - Network traffic analyzer diff --git a/epan/tvbuff.c b/epan/tvbuff.c index 123e7ec473..945ab95f9c 100644 --- a/epan/tvbuff.c +++ b/epan/tvbuff.c @@ -1815,7 +1815,7 @@ tvb_format_stringzpad_wsp(tvbuff_t *tvb, const gint offset, const gint size) /* * All string functions below take a scope as an argument. * - * + * * If scope is NULL, memory is allocated with g_malloc() and user must * explicitly free it with g_free(). * If scope is not NULL, memory is allocated with the corresponding pool @@ -2054,7 +2054,7 @@ tvb_extract_utf_16_string(wmem_allocator_t *scope, tvbuff_t *tvb, const gint off } else { /* * Not a trail surrogate. - * Ignore the entire pair. + * Ignore the entire pair. * XXX - insert "substitute" character? * Report the error in some other * fashion? diff --git a/epan/uat-int.h b/epan/uat-int.h index 9132d53552..0c65bc9f23 100644 --- a/epan/uat-int.h +++ b/epan/uat-int.h @@ -12,17 +12,17 @@ * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> * Copyright 2001 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. diff --git a/epan/value_string.h b/epan/value_string.h index 1e2c6713b4..c62a758cf6 100644 --- a/epan/value_string.h +++ b/epan/value_string.h @@ -27,7 +27,7 @@ #ifdef __cplusplus extern "C" { -#endif /* __cplusplus */ +#endif /* __cplusplus */ #include <glib.h> #include "ws_symbol_export.h" diff --git a/epan/wslua/wslua.h b/epan/wslua/wslua.h index 1b6011b8bc..25d317ad71 100644 --- a/epan/wslua/wslua.h +++ b/epan/wslua/wslua.h @@ -233,7 +233,7 @@ typedef struct _wslua_distbl_t* DissectorTable; typedef dissector_handle_t Dissector; typedef GByteArray* ByteArray; typedef struct _wslua_tvb* Tvb; -typedef struct _wslua_tvbrange* TvbRange; +typedef struct _wslua_tvbrange* TvbRange; typedef struct _wslua_col_info* Column; typedef struct _wslua_cols* Columns; typedef struct _wslua_pinfo* Pinfo; @@ -392,19 +392,19 @@ extern int wslua_reg_attributes(lua_State *L, const wslua_attribute_table *t, gb #endif -#define WSLUA_FUNCTION extern int +#define WSLUA_FUNCTION extern int #define WSLUA_REGISTER_FUNCTION(name) { lua_pushcfunction(L, wslua_## name); lua_setglobal(L, #name); } #define WSLUA_REGISTER extern int -#define WSLUA_METHOD static int -#define WSLUA_CONSTRUCTOR static int -#define WSLUA_ATTR_SET static int -#define WSLUA_ATTR_GET static int +#define WSLUA_METHOD static int +#define WSLUA_CONSTRUCTOR static int +#define WSLUA_ATTR_SET static int +#define WSLUA_ATTR_GET static int #define WSLUA_METAMETHOD static int -#define WSLUA_METHODS static const luaL_Reg +#define WSLUA_METHODS static const luaL_Reg #define WSLUA_META static const luaL_Reg #define WSLUA_CLASS_FNREG(class,name) { #name, class##_##name } #define WSLUA_CLASS_FNREG_ALIAS(class,aliasname,name) { #aliasname, class##_##name } @@ -502,7 +502,7 @@ extern int wslua_reg_attributes(lua_State *L, const wslua_attribute_table *t, gb g_free(p); \ } \ } \ -} +} #define WSLUA_CLASS_DECLARE(C) \ extern C to##C(lua_State* L, int idx); \ diff --git a/epan/wslua/wslua_field.c b/epan/wslua/wslua_field.c index b6d1b3d606..335bb67f53 100644 --- a/epan/wslua/wslua_field.c +++ b/epan/wslua/wslua_field.c @@ -214,7 +214,7 @@ static int FieldInfo_get_display(lua_State* L) { if (!fi->ws_fi->rep) { label_ptr = label_str; proto_item_fill_label(fi->ws_fi, label_str); - } else + } else label_ptr = fi->ws_fi->rep->representation; if (!label_ptr) return 0; @@ -235,7 +235,7 @@ static int FieldInfo_get_display(lua_State* L) { static int FieldInfo_get_range(lua_State* L) { /* The TvbRange covering this field */ FieldInfo fi = checkFieldInfo(L,1); - + if (push_TvbRange (L, fi->ws_fi->ds_tvb, fi->ws_fi->start, fi->ws_fi->length)) { return 1; } @@ -247,7 +247,7 @@ static int FieldInfo_get_range(lua_State* L) { static int FieldInfo_get_generated(lua_State* L) { /* Whether this field was marked as generated. */ FieldInfo fi = checkFieldInfo(L,1); - + lua_pushboolean(L,FI_GET_FLAG(fi->ws_fi, FI_GENERATED)); return 1; } @@ -256,7 +256,7 @@ static int FieldInfo_get_generated(lua_State* L) { static int FieldInfo_get_name(lua_State* L) { /* The filter name of this field. */ FieldInfo fi = checkFieldInfo(L,1); - + lua_pushstring(L,fi->ws_fi->hfinfo->abbrev); return 1; } @@ -381,7 +381,7 @@ WSLUA_FUNCTION wslua_all_field_infos(lua_State* L) { FieldInfo fi = (FieldInfo)g_malloc(sizeof(struct _wslua_field_info)); fi->ws_fi = (field_info *)g_ptr_array_index(found,i); fi->expired = FALSE; - + PUSH_FIELDINFO(L,fi); items_found++; } @@ -400,9 +400,9 @@ WSLUA_CLASS_DEFINE(Field,FAIL_ON_NULL("Field"),NOP); static GPtrArray* wanted_fields = NULL; static dfilter_t* wslua_dfilter = NULL; -/* We use a fake dfilter for Lua field extractors, so that +/* We use a fake dfilter for Lua field extractors, so that * epan_dissect_run() will populate the fields. This won't happen - * if the passed-in edt->tree is NULL, which it will be if the + * if the passed-in edt->tree is NULL, which it will be if the * proto_tree isn't created by epan_dissect_init(). But that's by * design - if shark doesn't pass in a proto_tree, it's probably for * a good reason and we shouldn't override that. (right?) @@ -518,7 +518,7 @@ WSLUA_METAMETHOD Field__call (lua_State* L) { FieldInfo fi = (FieldInfo)g_malloc(sizeof(struct _wslua_field_info)); fi->ws_fi = (field_info *)g_ptr_array_index(found,i); fi->expired = FALSE; - + PUSH_FIELDINFO(L,fi); items_found++; } diff --git a/epan/wslua/wslua_struct.c b/epan/wslua/wslua_struct.c index b809831ded..3f26d8755d 100644 --- a/epan/wslua/wslua_struct.c +++ b/epan/wslua/wslua_struct.c @@ -26,7 +26,7 @@ ** $Id: struct.c,v 1.4 2012/07/04 18:54:29 roberto Exp $ ** See Copyright Notice above. ** -** Small changes were made by Hadriel Kaplan - those changes +** Small changes were made by Hadriel Kaplan - those changes ** are in the Public Domain. ** ** Some changes are based on a patch to struct.h from @@ -94,8 +94,8 @@ /* The following line is here so that make-reg.pl does the right thing. This 'Struct' class isn't really a class, so it doesn't have the checkStruct/pushStruct/etc. functions - the following macro would generate; but it does need to be registered and such. - WSLUA_CLASS_DEFINE_BASE(Struct,NOP,NOP,0); + the following macro would generate; but it does need to be registered and such. + WSLUA_CLASS_DEFINE_BASE(Struct,NOP,NOP,0); */ /* basic integer type - yes this is system-specific size - it's meant to be */ @@ -257,7 +257,7 @@ static void putinteger (lua_State *L, luaL_Buffer *b, int arg, int endian, luaL_addlstring(b, buff, size); } -/* corrects endiannes - usually done by other functions themselves, but is +/* corrects endiannes - usually done by other functions themselves, but is * used for float/doubles, since on some platforms they're endian'ed as well */ static void correctbytes (gchar *b, int size, int endian) { @@ -353,7 +353,7 @@ WSLUA_CONSTRUCTOR Struct_pack (lua_State *L) { return poscnt + 1; } -/* Decodes an integer from a string struct into a Lua number, based on +/* Decodes an integer from a string struct into a Lua number, based on * given endianess and size. If the integer type is signed, this makes * the Lua number be +/- correctly as well. */ @@ -386,7 +386,7 @@ static lua_Number getinteger (const gchar *buff, int endian, #define b_pushnumber(n) { if (!h.noassign) lua_pushnumber(L, (lua_Number)(n)); } WSLUA_CONSTRUCTOR Struct_unpack (lua_State *L) { - /* Unpacks/decodes multiple Lua values from a given struct-like binary Lua string. + /* Unpacks/decodes multiple Lua values from a given struct-like binary Lua string. The number of returned values depends on the format given, plus an addtional value of the position where it stopped reading is returned. */ #define WSLUA_ARG_Struct_unpack_FORMAT 1 /* The format string */ #define WSLUA_ARG_Struct_unpack_STRUCT 2 /* The binary Lua string to unpack */ diff --git a/epan/wslua/wslua_tree.c b/epan/wslua/wslua_tree.c index 0440fe85e5..e84ada62b5 100644 --- a/epan/wslua/wslua_tree.c +++ b/epan/wslua/wslua_tree.c @@ -318,7 +318,7 @@ WSLUA_METHOD TreeItem_append_text(lua_State *L) { #define WSLUA_ARG_TreeItem_append_text_TEXT 2 /* The text to be appended. */ TreeItem ti = checkTreeItem(L,1); const gchar* s = luaL_checkstring(L,WSLUA_ARG_TreeItem_append_text_TEXT); - + proto_item_append_text(ti->item,"%s",s); return 0; diff --git a/epan/wslua/wslua_tvb.c b/epan/wslua/wslua_tvb.c index 2a2c5bcdc7..45bbd36cbf 100644 --- a/epan/wslua/wslua_tvb.c +++ b/epan/wslua/wslua_tvb.c @@ -243,7 +243,7 @@ WSLUA_METHOD ByteArray_base64_decode(lua_State* L) { data = (gchar*)g_malloc (ba->len + 1); memcpy(data, ba->data, ba->len); data[ba->len] = '\0'; - + len = ws_base64_decode_inplace(data); g_byte_array_append(ba2,data,(int)len); g_free(data); @@ -1303,7 +1303,7 @@ static int TvbRange_uncompress(lua_State* L) { tvbuff_t *uncompr_tvb; if (!(tvbr && tvbr->tvb)) return 0; - + if (tvbr->tvb->expired) { luaL_error(L,"expired tvb"); return 0; diff --git a/filetap/file_access.c b/filetap/file_access.c index 53a5c078d3..8a946982ba 100644 --- a/filetap/file_access.c +++ b/filetap/file_access.c @@ -421,7 +421,7 @@ static char *get_file_extension(const char *pathname) extensionp = g_strdup(extensionp); g_strfreev(components); return extensionp; -} +} static gboolean heuristic_uses_extension(unsigned int i, const char *extension) { diff --git a/frame_tvbuff.c b/frame_tvbuff.c index 7682f10d2a..be99d8c324 100644 --- a/frame_tvbuff.c +++ b/frame_tvbuff.c @@ -212,7 +212,7 @@ frame_tvbuff_new(const frame_data *fd, const guint8 *buf) frame_tvb = (struct tvb_frame *) tvb; /* XXX, wtap_can_seek() */ - if (cfile.wth && cfile.wth->random_fh + if (cfile.wth && cfile.wth->random_fh #ifdef WANT_PACKET_EDITOR && fd->file_off != -1 /* generic clone for modified packets */ #endif @@ -317,7 +317,7 @@ file_tvbuff_new(const frame_data *fd, const guint8 *buf) frame_tvb = (struct tvb_frame *) tvb; /* XXX, wtap_can_seek() */ - if (cfile.wth && cfile.wth->random_fh + if (cfile.wth && cfile.wth->random_fh #ifdef WANT_PACKET_EDITOR && fd->file_off != -1 /* generic clone for modified packets */ #endif @@ -4,7 +4,7 @@ * * $Id$ * - * By Ronnie Sahlberg and Richard Sharpe. From a program initially + * By Ronnie Sahlberg and Richard Sharpe. From a program initially * written by Ronnie. * Copyright 2003 Ronnie Sahlberg and Richard Sharpe * @@ -86,7 +86,7 @@ int ack_delay = 5000; int tcp_nodelay = 0; int tcp_delay_time = 1000; /* What is the real time here? */ /* - * If tcp_nodelay is set, then this is the amount of data left ... + * If tcp_nodelay is set, then this is the amount of data left ... */ int remaining_data = 0; int snap_len = 1500; @@ -106,7 +106,7 @@ struct seg_hist_s { int seg_num; /* Segment number sent. This can change */ /* but a retransmit will have a new seg */ int flags; /* Flags as above for ack and seg loss */ - int acks_first_seq; /* How many times we have seen an ack + int acks_first_seq; /* How many times we have seen an ack for the first seq number in this seg */ }; @@ -127,7 +127,7 @@ makeseg(char *eth1, char *eth2, char *ip1, char *ip2, char *p1, char *p2, int *s printf("2002/01/07 00:00:%02d.%06d\n", ts/1000000, ts%1000000); printf("0000 %s %s 08 00\n", eth1, eth2); printf("000e 45 00 %02x %02x 00 00 00 00 40 06 00 00 %s %s\n", (len+40)>>8, (len+40)&0xff, ip1, ip2); - printf("0022 %s %s %02x %02x %02x %02x %02x %02x %02x %02x 50 %s 80 00 00 00 00 00", p1, p2, + printf("0022 %s %s %02x %02x %02x %02x %02x %02x %02x %02x 50 %s 80 00 00 00 00 00", p1, p2, ((*s1)>>24)&0xff, ((*s1)>>16)&0xff, ((*s1)>>8)&0xff, @@ -154,13 +154,13 @@ int next_ack_due() int slot = next_slot; int ack_lost = 0, seg_lost = 0; - if (next_slot == first_slot) + if (next_slot == first_slot) return (((unsigned int)(1<<31)) - 1); /* * Figure out if we need to issue an ACK. We skip all outstanding packets * that are marked as ack lost or packet lost. - * + * * We would not usually come in here with a frame marked as lost or ack lost * rather, we will come in here and specify that the ack was due at a * certain time, and gen_next_ack would then determine that the ack @@ -179,10 +179,10 @@ int next_ack_due() slot = (slot + 1) % SEG_HIST_SIZE; } - if (slot == next_slot) + if (slot == next_slot) return (((unsigned int)(1<<31)) - 1); - /* + /* * If there is only one slot occupied, or a segment was lost then * an ACK is due after the last [good] segment left plus ack_delay */ @@ -190,7 +190,7 @@ int next_ack_due() if (slot == first_slot && next_slot == ((first_slot + 1) % SEG_HIST_SIZE)) return (seg_hist[first_slot].ts + ack_delay + jitter); - if (seg_lost) + if (seg_lost) return (seg_hist[slot].ts + ack_delay + jitter); /* @@ -209,7 +209,7 @@ int next_ack_due() /* XXX: FIXME, what about when the window is closed */ /* XXX: FIXME, use the correct value for this */ return (((unsigned int)(1<<31)) - 1); - else + else return seg_hist[(first_slot + 1 + 2 * ack_lost) % SEG_HIST_SIZE].ts + ack_delay + jitter; } @@ -230,7 +230,7 @@ int next_ack_due() add_seg_sent(int seq, int len) { - /* + /* * Should check we have not wrapped around and run into the unacked * stuff ... */ @@ -250,7 +250,7 @@ add_seg_sent(int seq, int len) */ next_slot = (next_slot + 1) % SEG_HIST_SIZE; - + } /* @@ -269,7 +269,7 @@ gen_next_ack(int force, int spacing) { int seq_to_ack, new_ts, data_acked; - /* + /* * We need to check if the segment that we are about to generate an * ack for is a segment that should be dropped ... or an ack that should * be dropped. @@ -299,7 +299,7 @@ gen_next_ack(int force, int spacing) */ if (new_ts + jitter <= ts) ts++; - else + else ts = new_ts + jitter; jitter = (rand() % 10 - 5); /* Update jitter ... */ @@ -311,13 +311,13 @@ gen_next_ack(int force, int spacing) if (cwnd >= ssthresh) cwnd += (1460*data_acked)/cwnd; /* is this right? */ else - cwnd = cwnd + data_acked; - if (verbose) fprintf(stderr, "Ack rcvd. ts: %d, data_acked: %d, cwnd: %d, window: %d\n", + cwnd = cwnd + data_acked; + if (verbose) fprintf(stderr, "Ack rcvd. ts: %d, data_acked: %d, cwnd: %d, window: %d\n", ts, data_acked, cwnd, window); if (cwnd > window) cwnd = window; } -void +void makeackedrun(int len, int spacing, int ackdelay) { int next_ack_ts=0; @@ -351,7 +351,7 @@ makeackedrun(int len, int spacing, int ackdelay) * Now, if the window is closed, then we have to eject an * ack, otherwise we can eject more data. * Also, the other end will tend to ack two segments at - * a time ... and that ack might fall between two + * a time ... and that ack might fall between two * outgoing segments */ jitter = (rand()%10) - 5; /* What if spacing too small */ @@ -369,7 +369,7 @@ makeackedrun(int len, int spacing, int ackdelay) if (verbose) fprintf(stderr, "Non forced ACK ...ts + spacing + jitter:%d, jitter: %d\n", ts + spacing + jitter, jitter); gen_next_ack(NO_FORCE_ACK, spacing); /* - * We don't want time to go backwards ... + * We don't want time to go backwards ... */ if (old_ts + spacing + jitter <= ts) ts++; @@ -377,9 +377,9 @@ makeackedrun(int len, int spacing, int ackdelay) ts = old_ts + spacing + jitter; } else if (used_win == cwnd) { - + /* - * We need an ACK, so generate it and retire the + * We need an ACK, so generate it and retire the * segments and advance the ts to the time of the ack */ @@ -399,7 +399,7 @@ makeackedrun(int len, int spacing, int ackdelay) } -void +void makeackedrundroppedtail8kb(int len, int spacing, int ackdelay) { int old_seq1; @@ -508,7 +508,7 @@ all_digits(char *str) if (!str || !(*str)) { return 0; } - + for (i = 0; str[i]; i++) { if (!isdigit(str[i])) return 0; @@ -522,7 +522,7 @@ all_digits(char *str) * * first_seg,seg_count[,first_seg,seg_count]* */ -void +void process_drop_list(char *drop_list) { int commas=0; @@ -566,17 +566,17 @@ process_drop_list(char *drop_list) return; } if (num == 0) num = 1; - if (commas % 2) + if (commas % 2) drops[commas / 2].drop_seg_count = num; else drops[commas / 2].drop_seg_start = num; } - + g_free(save); } -int +int main(int argc, char *argv[]) { int i; @@ -31,13 +31,13 @@ Returns TRUE on success, FALSE on failure. Sets "*err" to an error code, or 0 for a short write, on failure*/ extern gboolean -libpcap_write_file_header(FILE* pfile, int linktype, int snaplen, +libpcap_write_file_header(FILE* pfile, int linktype, int snaplen, gboolean ts_nsecs, guint64 *bytes_written, int *err); /** Write a record for a packet to a dump file. Returns TRUE on success, FALSE on failure. */ extern gboolean -libpcap_write_packet(FILE* pfile, +libpcap_write_packet(FILE* pfile, time_t sec, guint32 usec, guint32 caplen, guint32 len, const guint8 *pd, diff --git a/plugins/asn1/asn1.c b/plugins/asn1/asn1.c index 9d6bf9fb51..25e4b780dd 100644 --- a/plugins/asn1/asn1.c +++ b/plugins/asn1/asn1.c @@ -417,7 +417,7 @@ asn1_null_decode ( ASN1_SCK *asn1, int enc_len) asn1->offset += enc_len; /* - * Check for integer overflows. + * Check for integer overflows. * XXX - ASN1_ERR_LENGTH_MISMATCH seemed like the most appropriate * error from the ones available. Should we make a new one? */ diff --git a/plugins/asn1/asn1.h b/plugins/asn1/asn1.h index 49cdbc7317..826ac2fff8 100644 --- a/plugins/asn1/asn1.h +++ b/plugins/asn1/asn1.h @@ -55,7 +55,7 @@ #define BER_UNI_TAG_EMBEDDED_PDV 11 #define BER_UNI_TAG_UTF8String 12 #define BER_UNI_TAG_RELATIVE_OID 13 -/* UNIVERSAL 14-15 +/* UNIVERSAL 14-15 * Reserved for future editions of this * Recommendation | International Standard */ diff --git a/plugins/docsis/packet-dccack.c b/plugins/docsis/packet-dccack.c index 64bfd32443..95f17d5370 100644 --- a/plugins/docsis/packet-dccack.c +++ b/plugins/docsis/packet-dccack.c @@ -117,10 +117,10 @@ proto_register_docsis_dccack (void) static hf_register_info hf[] = { {&hf_docsis_dccack_tran_id , { - "Transaction ID", + "Transaction ID", "docsis_dccack.tran_id", FT_UINT16, BASE_DEC, NULL, 0x0, - NULL, + NULL, HFILL } }, diff --git a/plugins/docsis/packet-dccreq.c b/plugins/docsis/packet-dccreq.c index e2900fbff4..2fc800956e 100644 --- a/plugins/docsis/packet-dccreq.c +++ b/plugins/docsis/packet-dccreq.c @@ -122,12 +122,12 @@ dissect_dccreq_ds_params (tvbuff_t * tvb, proto_tree * tree, int start, guint16 pos = start; dcc_item = proto_tree_add_text ( tree, tvb, start, len, "2 DCC-REQ Downstream Params Encodings (Length = %u)", len); dcc_tree = proto_item_add_subtree ( dcc_item , ett_docsis_dccreq_ds_params); - - while ( pos < ( start + len) ) + + while ( pos < ( start + len) ) { type = tvb_get_guint8 (tvb, pos++); length = tvb_get_guint8 (tvb, pos++); - + switch (type) { case DCCREQ_DS_FREQ: @@ -147,7 +147,7 @@ dissect_dccreq_ds_params (tvbuff_t * tvb, proto_tree * tree, int start, guint16 proto_tree_add_item (dcc_tree, hf_docsis_dccreq_ds_mod_type, tvb, pos, length, ENC_BIG_ENDIAN); } - else + else { THROW (ReportedBoundsError); } @@ -158,7 +158,7 @@ dissect_dccreq_ds_params (tvbuff_t * tvb, proto_tree * tree, int start, guint16 proto_tree_add_item (dcc_tree, hf_docsis_dccreq_ds_sym_rate, tvb, pos, length, ENC_BIG_ENDIAN); } - else + else { THROW (ReportedBoundsError); } @@ -171,7 +171,7 @@ dissect_dccreq_ds_params (tvbuff_t * tvb, proto_tree * tree, int start, guint16 proto_tree_add_item (dcc_tree, hf_docsis_dccreq_ds_intlv_depth_j, tvb, pos + 1, 1, ENC_BIG_ENDIAN); } - else + else { THROW (ReportedBoundsError); } @@ -182,7 +182,7 @@ dissect_dccreq_ds_params (tvbuff_t * tvb, proto_tree * tree, int start, guint16 proto_tree_add_item (dcc_tree, hf_docsis_dccreq_ds_chan_id, tvb, pos, length, ENC_BIG_ENDIAN); } - else + else { THROW (ReportedBoundsError); } @@ -203,16 +203,16 @@ dissect_dccreq_sf_sub (tvbuff_t * tvb, proto_tree * tree, int start, guint16 len proto_item *dcc_item; proto_tree *dcc_tree; int pos; - + pos = start; dcc_item = proto_tree_add_text ( tree, tvb, start, len, "7 DCC-REQ Service Flow Substitution Encodings (Length = %u)", len); dcc_tree = proto_item_add_subtree ( dcc_item , ett_docsis_dccreq_sf_sub); - - while ( pos < ( start + len) ) + + while ( pos < ( start + len) ) { type = tvb_get_guint8 (tvb, pos++); length = tvb_get_guint8 (tvb, pos++); - + switch (type) { case DCCREQ_SF_SFID: @@ -384,64 +384,64 @@ proto_register_docsis_dccreq (void) static hf_register_info hf[] = { {&hf_docsis_dccreq_tran_id , { - "Transaction ID", + "Transaction ID", "docsis_dccreq.tran_id", FT_UINT16, BASE_DEC, NULL, 0x0, - NULL, + NULL, HFILL } }, {&hf_docsis_dccreq_up_chan_id , { - "Up Channel ID", + "Up Channel ID", "docsis_dccreq.up_chan_id", FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, + NULL, HFILL } }, {&hf_docsis_dccreq_ds_freq , { - "Frequency", + "Frequency", "docsis_dccreq.ds_freq", FT_UINT32, BASE_DEC, NULL, 0x0, - NULL, + NULL, HFILL } }, {&hf_docsis_dccreq_ds_mod_type , { - "Modulation Type", + "Modulation Type", "docsis_dccreq.ds_mod_type", FT_UINT8, BASE_DEC, VALS (ds_mod_type_vals), 0x0, - NULL, + NULL, HFILL } }, {&hf_docsis_dccreq_ds_sym_rate , { - "Symbol Rate", + "Symbol Rate", "docsis_dccreq.ds_sym_rate", FT_UINT8, BASE_DEC, VALS (ds_sym_rate_vals), 0x0, - NULL, + NULL, HFILL } }, {&hf_docsis_dccreq_ds_intlv_depth_i , { - "Interleaver Depth I Value", + "Interleaver Depth I Value", "docsis_dccreq.ds_intlv_depth_i", FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, + NULL, HFILL } }, {&hf_docsis_dccreq_ds_intlv_depth_j , { - "Interleaver Depth J Value", + "Interleaver Depth J Value", "docsis_dccreq.ds_intlv_depth_j", FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, + NULL, HFILL } }, @@ -465,19 +465,19 @@ proto_register_docsis_dccreq (void) }, {&hf_docsis_dccreq_init_tech , { - "Initialization Technique", + "Initialization Technique", "docsis_dccreq.init_tech", FT_UINT8, BASE_DEC, VALS (init_tech_vals), 0x0, - NULL, + NULL, HFILL } }, {&hf_docsis_dccreq_ucd_sub , { - "UCD Substitution", + "UCD Substitution", "docsis_dccreq.ucd_sub", FT_BYTES, BASE_NONE, NULL, 0x0, - NULL, + NULL, HFILL } }, diff --git a/plugins/docsis/packet-dccrsp.c b/plugins/docsis/packet-dccrsp.c index 90cc8d46f4..5af91e2143 100644 --- a/plugins/docsis/packet-dccrsp.c +++ b/plugins/docsis/packet-dccrsp.c @@ -64,16 +64,16 @@ dissect_dccrsp_cm_jump_time (tvbuff_t * tvb, proto_tree * tree, int start, guint proto_item *dcc_item; proto_tree *dcc_tree; int pos; - + pos = start; dcc_item = proto_tree_add_text ( tree, tvb, start, len, "2 DCC-RSP CM Time Jump Encodings (Length = %u)", len); dcc_tree = proto_item_add_subtree ( dcc_item , ett_docsis_dccrsp_cm_jump_time); - - while ( pos < ( start + len) ) + + while ( pos < ( start + len) ) { type = tvb_get_guint8 (tvb, pos++); length = tvb_get_guint8 (tvb, pos++); - + switch (type) { case DCCRSP_CM_JUMP_TIME_LENGTH: @@ -93,7 +93,7 @@ dissect_dccrsp_cm_jump_time (tvbuff_t * tvb, proto_tree * tree, int start, guint proto_tree_add_item (dcc_tree, hf_docsis_dccrsp_cm_jump_time_start, tvb, pos, length, ENC_BIG_ENDIAN); } - else + else { THROW (ReportedBoundsError); } @@ -177,37 +177,37 @@ proto_register_docsis_dccrsp (void) static hf_register_info hf[] = { {&hf_docsis_dccrsp_tran_id , { - "Transaction ID", + "Transaction ID", "docsis_dccrsp.tran_id", FT_UINT16, BASE_DEC, NULL, 0x0, - NULL, + NULL, HFILL } }, {&hf_docsis_dccrsp_conf_code , { - "Confirmation Code", + "Confirmation Code", "docsis_dccrsp.conf_code", FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, + NULL, HFILL } }, {&hf_docsis_dccrsp_cm_jump_time_length , { - "Jump Time Length", + "Jump Time Length", "docsis_dccrsp.cm_jump_time_length", FT_UINT32, BASE_DEC, NULL, 0x0, - NULL, + NULL, HFILL } }, {&hf_docsis_dccrsp_cm_jump_time_start , { - "Jump Time Start", + "Jump Time Start", "docsis_dccrsp.cm_jump_time_start", FT_UINT64, BASE_DEC, NULL, 0x0, - NULL, + NULL, HFILL } }, diff --git a/plugins/docsis/packet-dcd.c b/plugins/docsis/packet-dcd.c index 8369253bf9..14669d3b46 100644 --- a/plugins/docsis/packet-dcd.c +++ b/plugins/docsis/packet-dcd.c @@ -134,16 +134,16 @@ dissect_dcd_dsg_cfg (tvbuff_t * tvb, proto_tree * tree, int start, guint16 len) proto_item *dcd_item; proto_tree *dcd_tree; int pos; - + pos = start; dcd_item = proto_tree_add_text ( tree, tvb, start, len, "51 DCD DSG Config Encodings (Length = %u)", len); dcd_tree = proto_item_add_subtree ( dcd_item , ett_docsis_dcd_cfg); - - while ( pos < ( start + len) ) + + while ( pos < ( start + len) ) { type = tvb_get_guint8 (tvb, pos++); length = tvb_get_guint8 (tvb, pos++); - + switch (type) { case DCD_CFG_CHAN_LST: @@ -163,7 +163,7 @@ dissect_dcd_dsg_cfg (tvbuff_t * tvb, proto_tree * tree, int start, guint16 len) proto_tree_add_item (dcd_tree, hf_docsis_dcd_cfg_tdsg1, tvb, pos, length, ENC_BIG_ENDIAN); } - else + else { THROW (ReportedBoundsError); } @@ -174,7 +174,7 @@ dissect_dcd_dsg_cfg (tvbuff_t * tvb, proto_tree * tree, int start, guint16 len) proto_tree_add_item (dcd_tree, hf_docsis_dcd_cfg_tdsg2, tvb, pos, length, ENC_BIG_ENDIAN); } - else + else { THROW (ReportedBoundsError); } @@ -185,7 +185,7 @@ dissect_dcd_dsg_cfg (tvbuff_t * tvb, proto_tree * tree, int start, guint16 len) proto_tree_add_item (dcd_tree, hf_docsis_dcd_cfg_tdsg3, tvb, pos, length, ENC_BIG_ENDIAN); } - else + else { THROW (ReportedBoundsError); } @@ -196,7 +196,7 @@ dissect_dcd_dsg_cfg (tvbuff_t * tvb, proto_tree * tree, int start, guint16 len) proto_tree_add_item (dcd_tree, hf_docsis_dcd_cfg_tdsg4, tvb, pos, length, ENC_BIG_ENDIAN); } - else + else { THROW (ReportedBoundsError); } @@ -217,16 +217,16 @@ dissect_dcd_down_classifier_ip (tvbuff_t * tvb, proto_tree * tree, int start, gu proto_item *dcd_item; proto_tree *dcd_tree; int pos; - + pos = start; dcd_item = proto_tree_add_text ( tree, tvb, start, len, "23.9 DCD_CFR_IP Encodings (Length = %u)", len); dcd_tree = proto_item_add_subtree ( dcd_item , ett_docsis_dcd_cfr_ip); - - while ( pos < ( start + len) ) + + while ( pos < ( start + len) ) { type = tvb_get_guint8 (tvb, pos++); length = tvb_get_guint8 (tvb, pos++); - + switch (type) { case DCD_CFR_IP_SOURCE_ADDR: @@ -328,16 +328,16 @@ dissect_dcd_clid (tvbuff_t * tvb, proto_tree * tree, int start, guint16 len) proto_item *dcd_item; proto_tree *dcd_tree; int pos; - + pos = start; dcd_item = proto_tree_add_text ( tree, tvb, start, len, "50.4 DCD Rule ClientID Encodings (Length = %u)", len); dcd_tree = proto_item_add_subtree ( dcd_item , ett_docsis_dcd_clid); - - while ( pos < ( start + len) ) + + while ( pos < ( start + len) ) { type = tvb_get_guint8 (tvb, pos++); length = tvb_get_guint8 (tvb, pos++); - + switch (type) { case DCD_CLID_BCAST_ID: @@ -394,16 +394,16 @@ dissect_dcd_dsg_rule (tvbuff_t * tvb, proto_tree * tree, int start, guint16 len) proto_item *dcd_item; proto_tree *dcd_tree; int pos; - + pos = start; dcd_item = proto_tree_add_text ( tree, tvb, start, len, "50 DCD DSG Rule Encodings (Length = %u)", len); dcd_tree = proto_item_add_subtree ( dcd_item , ett_docsis_dcd_rule); - - while ( pos < ( start + len) ) + + while ( pos < ( start + len) ) { type = tvb_get_guint8 (tvb, pos++); length = tvb_get_guint8 (tvb, pos++); - + switch (type) { case DCD_RULE_ID: @@ -423,7 +423,7 @@ dissect_dcd_dsg_rule (tvbuff_t * tvb, proto_tree * tree, int start, guint16 len) proto_tree_add_item (dcd_tree, hf_docsis_dcd_rule_pri, tvb, pos, length, ENC_BIG_ENDIAN); } - else + else { THROW (ReportedBoundsError); } @@ -441,7 +441,7 @@ dissect_dcd_dsg_rule (tvbuff_t * tvb, proto_tree * tree, int start, guint16 len) proto_tree_add_item (dcd_tree, hf_docsis_dcd_rule_tunl_addr, tvb, pos, length, ENC_NA); } - else + else { THROW (ReportedBoundsError); } @@ -452,7 +452,7 @@ dissect_dcd_dsg_rule (tvbuff_t * tvb, proto_tree * tree, int start, guint16 len) proto_tree_add_item (dcd_tree, hf_docsis_dcd_rule_cfr_id, tvb, pos, length, ENC_BIG_ENDIAN); } - else + else { THROW (ReportedBoundsError); } @@ -473,16 +473,16 @@ dissect_dcd_down_classifier (tvbuff_t * tvb, proto_tree * tree, int start, guint proto_item *dcd_item; proto_tree *dcd_tree; int pos; - + pos = start; dcd_item = proto_tree_add_text ( tree, tvb, start, len, "23 DCD_CFR Encodings (Length = %u)", len); dcd_tree = proto_item_add_subtree ( dcd_item , ett_docsis_dcd_cfr); - - while ( pos < ( start + len) ) + + while ( pos < ( start + len) ) { type = tvb_get_guint8 (tvb, pos++); length = tvb_get_guint8 (tvb, pos++); - + switch (type) { case DCD_CFR_ID: @@ -502,7 +502,7 @@ dissect_dcd_down_classifier (tvbuff_t * tvb, proto_tree * tree, int start, guint proto_tree_add_item (dcd_tree, hf_docsis_dcd_cfr_rule_pri, tvb, pos, length, ENC_BIG_ENDIAN); } - else + else { THROW (ReportedBoundsError); } @@ -575,145 +575,145 @@ proto_register_docsis_dcd (void) static hf_register_info hf[] = { {&hf_docsis_dcd_config_ch_cnt, { - "Configuration Change Count", + "Configuration Change Count", "docsis_dcd.config_ch_cnt", FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, + NULL, HFILL } }, {&hf_docsis_dcd_num_of_frag, { - "Number of Fragments", + "Number of Fragments", "docsis_dcd.num_of_frag", FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, + NULL, HFILL } }, {&hf_docsis_dcd_frag_sequence_num, { - "Fragment Sequence Number", + "Fragment Sequence Number", "docsis_dcd.frag_sequence_num", FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, + NULL, HFILL } }, {&hf_docsis_dcd_cfr_id, { - "Downstream Classifier Id", + "Downstream Classifier Id", "docsis_dcd.cfr_id", FT_UINT16, BASE_DEC, NULL, 0x0, - NULL, + NULL, HFILL } }, {&hf_docsis_dcd_cfr_rule_pri, { - "Downstream Classifier Rule Priority", + "Downstream Classifier Rule Priority", "docsis_dcd.cfr_rule_pri", FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, + NULL, HFILL } }, {&hf_docsis_dcd_cfr_ip_source_addr, { - "Downstream Classifier IP Source Address", + "Downstream Classifier IP Source Address", "docsis_dcd.cfr_ip_source_addr", FT_IPv4, BASE_NONE, NULL, 0x0, - NULL, + NULL, HFILL } }, {&hf_docsis_dcd_cfr_ip_source_mask, { - "Downstream Classifier IP Source Mask", + "Downstream Classifier IP Source Mask", "docsis_dcd.cfr_ip_source_mask", FT_IPv4, BASE_NONE, NULL, 0x0, - NULL, + NULL, HFILL } }, {&hf_docsis_dcd_cfr_ip_dest_addr, { - "Downstream Classifier IP Destination Address", + "Downstream Classifier IP Destination Address", "docsis_dcd.cfr_ip_dest_addr", FT_IPv4, BASE_NONE, NULL, 0x0, - NULL, + NULL, HFILL } }, {&hf_docsis_dcd_cfr_ip_dest_mask, { - "Downstream Classifier IP Destination Mask", + "Downstream Classifier IP Destination Mask", "docsis_dcd.cfr_ip_dest_mask", FT_IPv4, BASE_NONE, NULL, 0x0, - "Downstream Classifier IP Destination Address", + "Downstream Classifier IP Destination Address", HFILL } }, {&hf_docsis_dcd_cfr_tcpudp_srcport_start, { - "Downstream Classifier IP TCP/UDP Source Port Start", + "Downstream Classifier IP TCP/UDP Source Port Start", "docsis_dcd.cfr_ip_tcpudp_srcport_start", FT_UINT16, BASE_DEC, NULL, 0x0, - NULL, + NULL, HFILL } }, {&hf_docsis_dcd_cfr_tcpudp_srcport_end, { - "Downstream Classifier IP TCP/UDP Source Port End", + "Downstream Classifier IP TCP/UDP Source Port End", "docsis_dcd.cfr_ip_tcpudp_srcport_end", FT_UINT16, BASE_DEC, NULL, 0x0, - NULL, + NULL, HFILL } }, {&hf_docsis_dcd_cfr_tcpudp_dstport_start, { - "Downstream Classifier IP TCP/UDP Destination Port Start", + "Downstream Classifier IP TCP/UDP Destination Port Start", "docsis_dcd.cfr_ip_tcpudp_dstport_start", FT_UINT16, BASE_DEC, NULL, 0x0, - NULL, + NULL, HFILL } }, {&hf_docsis_dcd_cfr_tcpudp_dstport_end, { - "Downstream Classifier IP TCP/UDP Destination Port End", + "Downstream Classifier IP TCP/UDP Destination Port End", "docsis_dcd.cfr_ip_tcpudp_dstport_end", FT_UINT16, BASE_DEC, NULL, 0x0, - NULL, + NULL, HFILL } }, {&hf_docsis_dcd_rule_id, { - "DSG Rule Id", + "DSG Rule Id", "docsis_dcd.rule_id", FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, + NULL, HFILL } }, {&hf_docsis_dcd_rule_pri, { - "DSG Rule Priority", + "DSG Rule Priority", "docsis_dcd.rule_pri", FT_UINT8, BASE_DEC, NULL, 0x0, - NULL, + NULL, HFILL } }, {&hf_docsis_dcd_rule_ucid_list, { - "DSG Rule UCID Range", + "DSG Rule UCID Range", "docsis_dcd.rule_ucid_list", FT_BYTES, BASE_NONE, NULL, 0x0, - NULL, + NULL, HFILL } }, @@ -728,109 +728,109 @@ proto_register_docsis_dcd (void) }, {&hf_docsis_dcd_clid_known_mac_addr, { - "DSG Rule Client ID Known MAC Address", + "DSG Rule Client ID Known MAC Address", "docsis_dcd.clid_known_mac_addr", FT_ETHER, BASE_NONE, NULL, 0x0, - NULL, + NULL, HFILL } }, {&hf_docsis_dcd_clid_ca_sys_id, { - "DSG Rule Client ID CA System ID", + "DSG Rule Client ID CA System ID", "docsis_dcd.clid_ca_sys_id", FT_UINT16, BASE_DEC, NULL, 0x0, - NULL, + NULL, HFILL } }, {&hf_docsis_dcd_clid_app_id, { - "DSG Rule Client ID Application ID", + "DSG Rule Client ID Application ID", "docsis_dcd.clid_app_id", FT_UINT16, BASE_DEC, NULL, 0x0, - NULL, + NULL, HFILL } }, {&hf_docsis_dcd_rule_tunl_addr, { - "DSG Rule Tunnel MAC Address", + "DSG Rule Tunnel MAC Address", "docsis_dcd.rule_tunl_addr", FT_ETHER, BASE_NONE, NULL, 0x0, - NULL, + NULL, HFILL } }, {&hf_docsis_dcd_rule_cfr_id, { - "DSG Rule Classifier ID", + "DSG Rule Classifier ID", "docsis_dcd.rule_cfr_id", FT_UINT16, BASE_DEC, NULL, 0x0, - NULL, + NULL, HFILL } }, {&hf_docsis_dcd_rule_vendor_spec, { - "DSG Rule Vendor Specific Parameters", + "DSG Rule Vendor Specific Parameters", "docsis_dcd.rule_vendor_spec", FT_BYTES, BASE_NONE, NULL, 0x0, - NULL, + NULL, HFILL } }, {&hf_docsis_dcd_cfg_chan, { - "DSG Configuration Channel", + "DSG Configuration Channel", "docsis_dcd.cfg_chan", FT_UINT32, BASE_DEC, NULL, 0x0, - NULL, + NULL, HFILL } }, {&hf_docsis_dcd_cfg_tdsg1, { - "DSG Initialization Timeout (Tdsg1)", + "DSG Initialization Timeout (Tdsg1)", "docsis_dcd.cfg_tdsg1", FT_UINT16, BASE_DEC, NULL, 0x0, - NULL, + NULL, HFILL } }, {&hf_docsis_dcd_cfg_tdsg2, { - "DSG Operational Timeout (Tdsg2)", + "DSG Operational Timeout (Tdsg2)", "docsis_dcd.cfg_tdsg2", FT_UINT16, BASE_DEC, NULL, 0x0, - NULL, + NULL, HFILL } }, {&hf_docsis_dcd_cfg_tdsg3, { - "DSG Two-Way Retry Timer (Tdsg3)", + "DSG Two-Way Retry Timer (Tdsg3)", "docsis_dcd.cfg_tdsg3", FT_UINT16, BASE_DEC, NULL, 0x0, - NULL, + NULL, HFILL } }, {&hf_docsis_dcd_cfg_tdsg4, { - "DSG One-Way Retry Timer (Tdsg4)", + "DSG One-Way Retry Timer (Tdsg4)", "docsis_dcd.cfg_tdsg4", FT_UINT16, BASE_DEC, NULL, 0x0, - NULL, + NULL, HFILL } }, {&hf_docsis_dcd_cfg_vendor_spec, { - "DSG Configuration Vendor Specific Parameters", + "DSG Configuration Vendor Specific Parameters", "docsis_dcd.cfg_vendor_spec", FT_BYTES, BASE_NONE, NULL, 0x0, - NULL, + NULL, HFILL } }, diff --git a/plugins/docsis/packet-dpvreq.c b/plugins/docsis/packet-dpvreq.c index 41d1090031..c258a8109b 100644 --- a/plugins/docsis/packet-dpvreq.c +++ b/plugins/docsis/packet-dpvreq.c @@ -58,7 +58,7 @@ dissect_dpvreq (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) dschan = tvb_get_guint8 (tvb, 2); col_add_fstr (pinfo->cinfo, COL_INFO, - "DOCSIS Path Verify Request: Transaction-Id = %u DS-Ch %d", + "DOCSIS Path Verify Request: Transaction-Id = %u DS-Ch %d", transid, dschan); if (tree) @@ -67,23 +67,23 @@ dissect_dpvreq (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) proto_tree_add_protocol_format (tree, proto_docsis_dpvreq, tvb, 0, -1, "DPV Request"); dpvreq_tree = proto_item_add_subtree (it, ett_docsis_dpvreq); - proto_tree_add_item (dpvreq_tree, hf_docsis_dpvreq_tranid, tvb, + proto_tree_add_item (dpvreq_tree, hf_docsis_dpvreq_tranid, tvb, 0, 2, ENC_BIG_ENDIAN); - proto_tree_add_item (dpvreq_tree, hf_docsis_dpvreq_dschan, tvb, + proto_tree_add_item (dpvreq_tree, hf_docsis_dpvreq_dschan, tvb, 2, 1, ENC_BIG_ENDIAN); - proto_tree_add_item (dpvreq_tree, hf_docsis_dpvreq_flags, tvb, + proto_tree_add_item (dpvreq_tree, hf_docsis_dpvreq_flags, tvb, 3, 1, ENC_BIG_ENDIAN); - proto_tree_add_item (dpvreq_tree, hf_docsis_dpvreq_us_sf, tvb, + proto_tree_add_item (dpvreq_tree, hf_docsis_dpvreq_us_sf, tvb, 4, 4, ENC_BIG_ENDIAN); - proto_tree_add_item (dpvreq_tree, hf_docsis_dpvreq_n, tvb, + proto_tree_add_item (dpvreq_tree, hf_docsis_dpvreq_n, tvb, 8, 2, ENC_BIG_ENDIAN); - proto_tree_add_item (dpvreq_tree, hf_docsis_dpvreq_start, tvb, + proto_tree_add_item (dpvreq_tree, hf_docsis_dpvreq_start, tvb, 10, 1, ENC_BIG_ENDIAN); - proto_tree_add_item (dpvreq_tree, hf_docsis_dpvreq_end, tvb, + proto_tree_add_item (dpvreq_tree, hf_docsis_dpvreq_end, tvb, 11, 1, ENC_BIG_ENDIAN); - proto_tree_add_item (dpvreq_tree, hf_docsis_dpvreq_ts_start, tvb, + proto_tree_add_item (dpvreq_tree, hf_docsis_dpvreq_ts_start, tvb, 12, 4, ENC_BIG_ENDIAN); - proto_tree_add_item (dpvreq_tree, hf_docsis_dpvreq_ts_end, tvb, + proto_tree_add_item (dpvreq_tree, hf_docsis_dpvreq_ts_end, tvb, 16, 4, ENC_BIG_ENDIAN); } } diff --git a/plugins/docsis/packet-dpvrsp.c b/plugins/docsis/packet-dpvrsp.c index b03f62ecca..b9a5e4f239 100644 --- a/plugins/docsis/packet-dpvrsp.c +++ b/plugins/docsis/packet-dpvrsp.c @@ -58,7 +58,7 @@ dissect_dpvrsp (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) dschan = tvb_get_guint8 (tvb, 2); col_add_fstr (pinfo->cinfo, COL_INFO, - "DOCSIS Path Verify Response: Transaction-Id = %u DS-Ch %d", + "DOCSIS Path Verify Response: Transaction-Id = %u DS-Ch %d", transid, dschan); if (tree) @@ -67,23 +67,23 @@ dissect_dpvrsp (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) proto_tree_add_protocol_format (tree, proto_docsis_dpvrsp, tvb, 0, -1, "DPV Response"); dpvrsp_tree = proto_item_add_subtree (it, ett_docsis_dpvrsp); - proto_tree_add_item (dpvrsp_tree, hf_docsis_dpvrsp_tranid, tvb, + proto_tree_add_item (dpvrsp_tree, hf_docsis_dpvrsp_tranid, tvb, 0, 2, ENC_BIG_ENDIAN); - proto_tree_add_item (dpvrsp_tree, hf_docsis_dpvrsp_dschan, tvb, + proto_tree_add_item (dpvrsp_tree, hf_docsis_dpvrsp_dschan, tvb, 2, 1, ENC_BIG_ENDIAN); - proto_tree_add_item (dpvrsp_tree, hf_docsis_dpvrsp_flags, tvb, + proto_tree_add_item (dpvrsp_tree, hf_docsis_dpvrsp_flags, tvb, 3, 1, ENC_BIG_ENDIAN); - proto_tree_add_item (dpvrsp_tree, hf_docsis_dpvrsp_us_sf, tvb, + proto_tree_add_item (dpvrsp_tree, hf_docsis_dpvrsp_us_sf, tvb, 4, 4, ENC_BIG_ENDIAN); - proto_tree_add_item (dpvrsp_tree, hf_docsis_dpvrsp_n, tvb, + proto_tree_add_item (dpvrsp_tree, hf_docsis_dpvrsp_n, tvb, 8, 2, ENC_BIG_ENDIAN); - proto_tree_add_item (dpvrsp_tree, hf_docsis_dpvrsp_start, tvb, + proto_tree_add_item (dpvrsp_tree, hf_docsis_dpvrsp_start, tvb, 10, 1, ENC_BIG_ENDIAN); - proto_tree_add_item (dpvrsp_tree, hf_docsis_dpvrsp_end, tvb, + proto_tree_add_item (dpvrsp_tree, hf_docsis_dpvrsp_end, tvb, 11, 1, ENC_BIG_ENDIAN); - proto_tree_add_item (dpvrsp_tree, hf_docsis_dpvrsp_ts_start, tvb, + proto_tree_add_item (dpvrsp_tree, hf_docsis_dpvrsp_ts_start, tvb, 12, 4, ENC_BIG_ENDIAN); - proto_tree_add_item (dpvrsp_tree, hf_docsis_dpvrsp_ts_end, tvb, + proto_tree_add_item (dpvrsp_tree, hf_docsis_dpvrsp_ts_end, tvb, 16, 4, ENC_BIG_ENDIAN); } } diff --git a/plugins/docsis/packet-mdd.c b/plugins/docsis/packet-mdd.c index 8d7a693b0a..e4ab898206 100644 --- a/plugins/docsis/packet-mdd.c +++ b/plugins/docsis/packet-mdd.c @@ -169,7 +169,7 @@ static const value_string mdd_tlv_vals[] = { {CM_STATUS_EVENT_CONTROL , "CM-STATUS Event Control"}, {UPSTREAM_TRANSMIT_POWER_REPORTING , "Upstream Transmit Power Reporting"}, {DSG_DA_TO_DSID_ASSOCIATION_ENTRY , "DSG DA-to-DSID Association Entry"}, - {CM_STATUS_EVENT_ENABLE_NON_CHANNEL_SPECIFIC_EVENTS , + {CM_STATUS_EVENT_ENABLE_NON_CHANNEL_SPECIFIC_EVENTS , "CM-STATUS Event Enable for Non-Channel-Specific-Events"}, {0, NULL} }; diff --git a/plugins/docsis/packet-regreqmp.c b/plugins/docsis/packet-regreqmp.c index 5d94a6b0ec..7007f14fe5 100644 --- a/plugins/docsis/packet-regreqmp.c +++ b/plugins/docsis/packet-regreqmp.c @@ -49,7 +49,7 @@ static gint ett_docsis_regreqmp = -1; static void dissect_regreqmp (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) { - + proto_item *it; proto_tree *regreqmp_tree = NULL; tvbuff_t *next_tvb; @@ -60,7 +60,7 @@ dissect_regreqmp (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) { it = proto_tree_add_protocol_format (tree, proto_docsis_regreqmp, tvb, 0, -1,"REG-REQ-MP Message"); regreqmp_tree = proto_item_add_subtree (it, ett_docsis_regreqmp); - + proto_tree_add_item (regreqmp_tree, hf_docsis_regreqmp_sid, tvb, 0, 2, ENC_BIG_ENDIAN); proto_tree_add_item (regreqmp_tree, hf_docsis_regreqmp_number_of_fragments, tvb, 2, 1, ENC_BIG_ENDIAN); proto_tree_add_item (regreqmp_tree, hf_docsis_regreqmp_fragment_sequence_number, tvb, 3, 1, ENC_BIG_ENDIAN); diff --git a/plugins/docsis/packet-regrspmp.c b/plugins/docsis/packet-regrspmp.c index 8ec78a05fc..2c1a840190 100644 --- a/plugins/docsis/packet-regrspmp.c +++ b/plugins/docsis/packet-regrspmp.c @@ -55,22 +55,22 @@ dissect_regrspmp (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) proto_item *it; proto_tree *regrspmp_tree = NULL; tvbuff_t *next_tvb; - - - - + + + + col_set_str(pinfo->cinfo, COL_INFO, "REG-RSP-MP Message:"); - + if (tree) { it = proto_tree_add_protocol_format (tree, proto_docsis_regrspmp, tvb, 0, -1,"REG-RSP-MP Message"); regrspmp_tree = proto_item_add_subtree (it, ett_docsis_regrspmp); - + proto_tree_add_item (regrspmp_tree, hf_docsis_regrspmp_sid, tvb, 0, 2, ENC_BIG_ENDIAN); proto_tree_add_item (regrspmp_tree, hf_docsis_regrspmp_response, tvb, 2, 1, ENC_BIG_ENDIAN); proto_tree_add_item (regrspmp_tree, hf_docsis_regrspmp_number_of_fragments, tvb, 3, 1, ENC_BIG_ENDIAN); proto_tree_add_item (regrspmp_tree, hf_docsis_regrspmp_fragment_sequence_number, tvb, 4, 1, ENC_BIG_ENDIAN); - + } /* Call Dissector for Appendix C TLV's */ next_tvb = tvb_new_subset_remaining (tvb, 5); @@ -124,11 +124,11 @@ proto_register_docsis_regrspmp (void) proto_docsis_regrspmp = proto_register_protocol ("DOCSIS Registration Response Multipart", "DOCSIS Reg-Rsp-Mp", "docsis_regrspmp"); - + /* Required function calls to register the header fields and subtrees used */ proto_register_field_array (proto_docsis_regrspmp, hf, array_length (hf)); proto_register_subtree_array (ett, array_length (ett)); - + register_dissector ("docsis_regrspmp", dissect_regrspmp, proto_docsis_regrspmp); } @@ -141,7 +141,7 @@ void proto_reg_handoff_docsis_regrspmp (void) { dissector_handle_t docsis_regrspmp_handle; - + docsis_tlv_handle = find_dissector ("docsis_tlv"); docsis_regrspmp_handle = find_dissector ("docsis_regrspmp"); dissector_add_uint ("docsis_mgmt", 45, docsis_regrspmp_handle); diff --git a/plugins/docsis/packet-tlv.c b/plugins/docsis/packet-tlv.c index 917cba2f34..f892bddd2e 100644 --- a/plugins/docsis/packet-tlv.c +++ b/plugins/docsis/packet-tlv.c @@ -4499,7 +4499,7 @@ proto_register_docsis_tlv (void) "Ranging Hold-Off (ePS or eRouter)", HFILL} }, {&hf_docsis_tlv_mcap_rnghoff_emta, - {".16 Ranging Hold-Off (eMTA or EDVA)", + {".16 Ranging Hold-Off (eMTA or EDVA)", "docsis_tlv.mcap.rnghoffemta", FT_UINT32, BASE_DEC, VALS (on_off_vals), 0x4, "Ranging Hold-Off (eMTA or EDVA)", HFILL} diff --git a/plugins/docsis/packet-type29ucd.c b/plugins/docsis/packet-type29ucd.c index 23f2cc60aa..09ba018662 100644 --- a/plugins/docsis/packet-type29ucd.c +++ b/plugins/docsis/packet-type29ucd.c @@ -270,7 +270,7 @@ dissect_type29ucd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) pos, length, ENC_NA); pos = pos + length; break; -/* DOCSIS 2.0 UCD TLV definitions +/* DOCSIS 2.0 UCD TLV definitions * #define type29ucd_EXT_PREAMBLE 6 * #define type29ucd_SCDMA_MODE_ENABLE 7 * #define type29ucd_SCDMA_SPREADING_INTERVAL 8 @@ -407,7 +407,7 @@ dissect_type29ucd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) THROW (ReportedBoundsError); } pos = pos + length; - break; + break; /* DOCSIS 1.1 BURST DESCRIPTOR */ case type29ucd_BURST_DESCR: it = diff --git a/plugins/docsis/packet-ucd.c b/plugins/docsis/packet-ucd.c index 6ff1d7866b..5be9bd974b 100644 --- a/plugins/docsis/packet-ucd.c +++ b/plugins/docsis/packet-ucd.c @@ -147,7 +147,7 @@ value_string iuc_vals[] = { {IUC_RESERVED14, "Reserved"}, {IUC_EXPANSION, "Expanded IUC"}, {0, NULL} - + }; static const value_string last_cw_len_vals[] = { @@ -168,10 +168,10 @@ static void proto_item *tlv_item; gint len; guint8 upchid, symrate; - + len = tvb_reported_length_remaining (tvb, 0); upchid = tvb_get_guint8 (tvb, 0); - + /* if the upstream Channel ID is 0 then this is for Telephony Return) */ if (upchid > 0) col_add_fstr (pinfo->cinfo, COL_INFO, @@ -181,7 +181,7 @@ static void col_add_fstr (pinfo->cinfo, COL_INFO, "UCD Message: Channel ID = %u (Telephony Return)", upchid); - + if (tree) { ucd_item = @@ -196,7 +196,7 @@ static void ENC_BIG_ENDIAN); proto_tree_add_item (ucd_tree, hf_docsis_ucd_down_chid, tvb, 3, 1, ENC_BIG_ENDIAN); - + pos = 4; while (pos < len) { @@ -204,7 +204,7 @@ static void tlv_item = proto_tree_add_text (ucd_tree, tvb, pos, -1, "%s", val_to_str(type, channel_tlv_vals, - "Unknown TLV (%u)")); + "Unknown TLV (%u)")); tlv_tree = proto_item_add_subtree (tlv_item, ett_tlv); proto_tree_add_uint (tlv_tree, hf_docsis_ucd_type, tvb, pos, 1, type); @@ -635,7 +635,7 @@ static void } /* switch(type) */ } /* while (pos < len) */ } /* if (tree) */ - + } /* Register the protocol with Wireshark */ @@ -648,7 +648,7 @@ static void void proto_register_docsis_ucd (void) { - + /* Setup list of header fields See Section 1.6.1 for details*/ static hf_register_info hf[] = { {&hf_docsis_ucd_upstream_chid, @@ -792,22 +792,22 @@ proto_register_docsis_ucd (void) "TCM Enabled", HFILL} }, }; - + /* Setup protocol subtree array */ static gint *ett[] = { &ett_docsis_ucd, &ett_tlv, }; - + /* Register the protocol name and description */ proto_docsis_ucd = proto_register_protocol ("DOCSIS Upstream Channel Descriptor", "DOCSIS UCD", "docsis_ucd"); - + /* Required function calls to register the header fields and subtrees used */ proto_register_field_array (proto_docsis_ucd, hf, array_length (hf)); proto_register_subtree_array (ett, array_length (ett)); - + register_dissector ("docsis_ucd", dissect_ucd, proto_docsis_ucd); } @@ -820,8 +820,8 @@ void proto_reg_handoff_docsis_ucd (void) { dissector_handle_t docsis_ucd_handle; - + docsis_ucd_handle = find_dissector ("docsis_ucd"); dissector_add_uint ("docsis_mgmt", 0x02, docsis_ucd_handle); - + } diff --git a/plugins/easy_codec/codec-g722.c b/plugins/easy_codec/codec-g722.c index a96a747611..35cce0dc65 100644 --- a/plugins/easy_codec/codec-g722.c +++ b/plugins/easy_codec/codec-g722.c @@ -12,12 +12,12 @@ * 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. @@ -59,10 +59,10 @@ int codec_g722_decode(void *context, const void *input, int inputSizeBytes, void short *speech = (short*)output; int decodedBytes = 0; int i; - + if (!ctx) return 0; - if ((inputSizeBytes % L_G722_FRAME_COMPRESSED) != 0) + if ((inputSizeBytes % L_G722_FRAME_COMPRESSED) != 0) return 0; if (!output) @@ -72,13 +72,13 @@ int codec_g722_decode(void *context, const void *input, int inputSizeBytes, void ((*outputSizeBytes - decodedBytes) >= L_G722_FRAME / 2 * sizeof(short))) { if (EasyG722_decoder(ctx->handle, (unsigned char*)bitstream, ctx->speach_buffer)) { int write_index = 0; - + for(i = 0; i < L_G722_FRAME; i+=2) { ctx->speach_buffer[write_index] = ctx->speach_buffer[i]; write_index++; } memcpy(speech, ctx->speach_buffer, L_G722_FRAME / 2 * sizeof(short)); - + speech += L_G722_FRAME / 2; decodedBytes += L_G722_FRAME / 2 * sizeof(short); diff --git a/plugins/easy_codec/codec-g722.h b/plugins/easy_codec/codec-g722.h index fed52761ec..f13899fbbb 100644 --- a/plugins/easy_codec/codec-g722.h +++ b/plugins/easy_codec/codec-g722.h @@ -12,12 +12,12 @@ * 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. diff --git a/plugins/easy_codec/codec-g7231.c b/plugins/easy_codec/codec-g7231.c index 8408ad0c53..1cb7017edd 100644 --- a/plugins/easy_codec/codec-g7231.c +++ b/plugins/easy_codec/codec-g7231.c @@ -12,12 +12,12 @@ * 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. @@ -59,9 +59,9 @@ int codec_g7231_decode(void *context, const void *input, int inputSizeBytes, voi const unsigned char *bitstream = (const unsigned char*)input; short *speech = (short*)output; int decodedBytes = 0; - + if (!ctx) return 0; - + if ( ctx->handle == -1) { if ( bitstream[0] & 0x03 ) { ctx->handle=EasyG7231_init_decoder(FALSE); @@ -69,10 +69,10 @@ int codec_g7231_decode(void *context, const void *input, int inputSizeBytes, voi } else { ctx->handle=EasyG7231_init_decoder(TRUE); ctx->l_g7231_frame_compressed = L_G7231_FRAME_COMPRESSED_63; - } + } } - - if ((inputSizeBytes % ctx->l_g7231_frame_compressed) != 0) + + if ((inputSizeBytes % ctx->l_g7231_frame_compressed) != 0) return 0; if (!output) @@ -86,7 +86,7 @@ int codec_g7231_decode(void *context, const void *input, int inputSizeBytes, voi memcpy(speech, ctx->speach_buffer, L_G7231_FRAME * sizeof(short)); speech += L_G7231_FRAME; decodedBytes += L_G7231_FRAME * sizeof(short); - + } bitstream += ctx->l_g7231_frame_compressed; inputSizeBytes -= ctx->l_g7231_frame_compressed; diff --git a/plugins/easy_codec/codec-g7231.h b/plugins/easy_codec/codec-g7231.h index 05f5f358ba..8faebe3fa2 100644 --- a/plugins/easy_codec/codec-g7231.h +++ b/plugins/easy_codec/codec-g7231.h @@ -12,12 +12,12 @@ * 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. diff --git a/plugins/easy_codec/codec-g729a.c b/plugins/easy_codec/codec-g729a.c index 399d02f787..0b692b7c15 100644 --- a/plugins/easy_codec/codec-g729a.c +++ b/plugins/easy_codec/codec-g729a.c @@ -12,12 +12,12 @@ * 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. @@ -61,7 +61,7 @@ int codec_g729a_decode(void *context, const void *input, int inputSizeBytes, voi if (!ctx) return 0; - if ((inputSizeBytes % L_G729A_FRAME_COMPRESSED) != 0) + if ((inputSizeBytes % L_G729A_FRAME_COMPRESSED) != 0) return 0; if (!output) diff --git a/plugins/easy_codec/codec-g729a.h b/plugins/easy_codec/codec-g729a.h index 65225beddd..d1d73e04cb 100644 --- a/plugins/easy_codec/codec-g729a.h +++ b/plugins/easy_codec/codec-g729a.h @@ -12,12 +12,12 @@ * 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. diff --git a/plugins/easy_codec/easy_codec_plugin.c b/plugins/easy_codec/easy_codec_plugin.c index 2e586787ce..77577752c8 100644 --- a/plugins/easy_codec/easy_codec_plugin.c +++ b/plugins/easy_codec/easy_codec_plugin.c @@ -12,12 +12,12 @@ * 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. diff --git a/plugins/ethercat/packet-ethercat-datagram.h b/plugins/ethercat/packet-ethercat-datagram.h index 71ec746697..7b9f4e3152 100644 --- a/plugins/ethercat/packet-ethercat-datagram.h +++ b/plugins/ethercat/packet-ethercat-datagram.h @@ -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. @@ -26,7 +26,7 @@ #define _PACKET_ETHERCAT_DATAGRAM_ /* structure for decoding the header -----------------------------------------*/ -typedef union +typedef union { struct { diff --git a/plugins/ethercat/packet-ethercat-frame.h b/plugins/ethercat/packet-ethercat-frame.h index f552a2444a..b9a7245115 100644 --- a/plugins/ethercat/packet-ethercat-frame.h +++ b/plugins/ethercat/packet-ethercat-frame.h @@ -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. diff --git a/plugins/ethercat/packet-ioraw.h b/plugins/ethercat/packet-ioraw.h index fbbc1ceafe..d713867371 100644 --- a/plugins/ethercat/packet-ioraw.h +++ b/plugins/ethercat/packet-ioraw.h @@ -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. diff --git a/plugins/ethercat/packet-nv.h b/plugins/ethercat/packet-nv.h index 19fbe951e2..7a3f4ec852 100644 --- a/plugins/ethercat/packet-nv.h +++ b/plugins/ethercat/packet-nv.h @@ -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. diff --git a/plugins/gryphon/packet-gryphon.h b/plugins/gryphon/packet-gryphon.h index f69ddfff36..556251e9af 100644 --- a/plugins/gryphon/packet-gryphon.h +++ b/plugins/gryphon/packet-gryphon.h @@ -151,14 +151,14 @@ /* USDT (SD_IOPWR) target commands: */ -#define CMD_IOPWR_GETINP (SD_IOPWR * 256 + 0x40) /* Read current digital inputs */ -#define CMD_IOPWR_GETLATCH (SD_IOPWR * 256 + 0x41) /* Read latched digital inputs */ -#define CMD_IOPWR_CLRLATCH (SD_IOPWR * 256 + 0x42) /* Read & clear latched inputs */ -#define CMD_IOPWR_GETOUT (SD_IOPWR * 256 + 0x43) /* Read digital outputs */ -#define CMD_IOPWR_SETOUT (SD_IOPWR * 256 + 0x44) /* Write digital outputs */ -#define CMD_IOPWR_SETBIT (SD_IOPWR * 256 + 0x45) /* Set indicated output bit(s) */ -#define CMD_IOPWR_CLRBIT (SD_IOPWR * 256 + 0x46) /* Clear indicated output bit(s)*/ -#define CMD_IOPWR_GETPOWER (SD_IOPWR * 256 + 0x47) /* Read inputs at power on time */ +#define CMD_IOPWR_GETINP (SD_IOPWR * 256 + 0x40) /* Read current digital inputs */ +#define CMD_IOPWR_GETLATCH (SD_IOPWR * 256 + 0x41) /* Read latched digital inputs */ +#define CMD_IOPWR_CLRLATCH (SD_IOPWR * 256 + 0x42) /* Read & clear latched inputs */ +#define CMD_IOPWR_GETOUT (SD_IOPWR * 256 + 0x43) /* Read digital outputs */ +#define CMD_IOPWR_SETOUT (SD_IOPWR * 256 + 0x44) /* Write digital outputs */ +#define CMD_IOPWR_SETBIT (SD_IOPWR * 256 + 0x45) /* Set indicated output bit(s) */ +#define CMD_IOPWR_CLRBIT (SD_IOPWR * 256 + 0x46) /* Clear indicated output bit(s)*/ +#define CMD_IOPWR_GETPOWER (SD_IOPWR * 256 + 0x47) /* Read inputs at power on time */ /* Miscellaneous (SD_UTIL) target commands: */ diff --git a/plugins/opcua/opcua_application_layer.c b/plugins/opcua/opcua_application_layer.c index 3ebf95de68..2aa9e10f3b 100644 --- a/plugins/opcua/opcua_application_layer.c +++ b/plugins/opcua/opcua_application_layer.c @@ -3,15 +3,15 @@ ** ** Copyright (C) 2006-2007 ascolab GmbH. All Rights Reserved. ** Web: http://www.ascolab.com -** +** ** 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 file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -** +** ** Project: OpcUa Wireshark Plugin ** ** Description: OpcUa Application Layer Decoder. diff --git a/plugins/opcua/opcua_application_layer.h b/plugins/opcua/opcua_application_layer.h index 066a353f97..005be67940 100644 --- a/plugins/opcua/opcua_application_layer.h +++ b/plugins/opcua/opcua_application_layer.h @@ -3,15 +3,15 @@ ** ** Copyright (C) 2006-2007 ascolab GmbH. All Rights Reserved. ** Web: http://www.ascolab.com -** +** ** 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 file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -** +** ** Project: OpcUa Wireshark Plugin ** ** Description: OpcUa Application Layer Decoder. diff --git a/plugins/opcua/opcua_complextypeparser.c b/plugins/opcua/opcua_complextypeparser.c index afa119d67a..4b245e490c 100644 --- a/plugins/opcua/opcua_complextypeparser.c +++ b/plugins/opcua/opcua_complextypeparser.c @@ -3,15 +3,15 @@ ** ** Copyright (C) 2006-2009 ascolab GmbH. All Rights Reserved. ** Web: http://www.ascolab.com -** +** ** 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 file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -** +** ** Project: OpcUa Wireshark Plugin ** ** Description: OpcUa Complex Type Parser diff --git a/plugins/opcua/opcua_security_layer.h b/plugins/opcua/opcua_security_layer.h index d42f739e2f..6d604bde2a 100644 --- a/plugins/opcua/opcua_security_layer.h +++ b/plugins/opcua/opcua_security_layer.h @@ -3,15 +3,15 @@ ** ** Copyright (C) 2006-2007 ascolab GmbH. All Rights Reserved. ** Web: http://www.ascolab.com -** +** ** 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 file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -** +** ** Project: OpcUa Wireshark Plugin ** ** Description: OpcUa Security Layer Decoder. diff --git a/plugins/opcua/opcua_serviceparser.c b/plugins/opcua/opcua_serviceparser.c index c6547639ff..e20a9f120c 100644 --- a/plugins/opcua/opcua_serviceparser.c +++ b/plugins/opcua/opcua_serviceparser.c @@ -3,15 +3,15 @@ ** ** Copyright (C) 2006-2009 ascolab GmbH. All Rights Reserved. ** Web: http://www.ascolab.com -** +** ** 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 file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -** +** ** Project: OpcUa Wireshark Plugin ** ** Description: OpcUa Complex Type Parser diff --git a/plugins/opcua/opcua_simpletypes.h b/plugins/opcua/opcua_simpletypes.h index 5eed3da701..7cf65f2ada 100644 --- a/plugins/opcua/opcua_simpletypes.h +++ b/plugins/opcua/opcua_simpletypes.h @@ -3,15 +3,15 @@ ** ** Copyright (C) 2006-2007 ascolab GmbH. All Rights Reserved. ** Web: http://www.ascolab.com -** +** ** 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 file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -** +** ** Project: OpcUa Wireshark Plugin ** ** Description: Implementation of OpcUa built-in type parsers. diff --git a/plugins/opcua/opcua_transport_layer.h b/plugins/opcua/opcua_transport_layer.h index e4788050e3..70d06a7695 100644 --- a/plugins/opcua/opcua_transport_layer.h +++ b/plugins/opcua/opcua_transport_layer.h @@ -3,15 +3,15 @@ ** ** Copyright (C) 2006-2009 ascolab GmbH. All Rights Reserved. ** Web: http://www.ascolab.com -** +** ** 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 file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -** +** ** Project: OpcUa Wireshark Plugin ** ** Description: OpcUa Transport Layer Decoder. diff --git a/plugins/profinet/packet-dcerpc-pn-io.c b/plugins/profinet/packet-dcerpc-pn-io.c index 582c3ff6e7..7e396ef6b4 100644 --- a/plugins/profinet/packet-dcerpc-pn-io.c +++ b/plugins/profinet/packet-dcerpc-pn-io.c @@ -8754,7 +8754,7 @@ dissect_ProfiDriveParameterRequest(tvbuff_t *tvb, int offset, proto_item_append_text(sub_item, "Format:%s, NoOfVals:%u", val_to_str(format, pn_io_profidrive_format_vals, "Unknown"), no_of_vals); - while (no_of_vals--) + while (no_of_vals--) { offset = dissect_profidrive_value(tvb, offset, pinfo, sub_tree, drep, format); } @@ -8816,7 +8816,7 @@ dissect_ProfiDriveParameterResponse(tvbuff_t *tvb, int offset, proto_item_append_text(sub_item, "Format:%s, NoOfVals:%u", val_to_str(format, pn_io_profidrive_format_vals, "Unknown"), no_of_vals); - while (no_of_vals--) + while (no_of_vals--) { offset = dissect_profidrive_value(tvb, offset, pinfo, sub_tree, drep, format); } diff --git a/plugins/stats_tree/pinfo_stats_tree.c b/plugins/stats_tree/pinfo_stats_tree.c index 5ebc9367f5..97265ded60 100644 --- a/plugins/stats_tree/pinfo_stats_tree.c +++ b/plugins/stats_tree/pinfo_stats_tree.c @@ -83,7 +83,7 @@ uat_plen_record_update_cb(void *r, const char **err) static void uat_plen_record_free_cb(void*r) { uat_plen_record_t* record = (uat_plen_record_t*)r; - if (record->packet_range) + if (record->packet_range) g_free(record->packet_range); } diff --git a/plugins/stats_tree/stats_tree_plugin.c b/plugins/stats_tree/stats_tree_plugin.c index b25e8f91a9..f4c073f745 100644 --- a/plugins/stats_tree/stats_tree_plugin.c +++ b/plugins/stats_tree/stats_tree_plugin.c @@ -12,12 +12,12 @@ * 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. diff --git a/plugins/unistim/audio.h b/plugins/unistim/audio.h index 30ab161679..03246082d6 100644 --- a/plugins/unistim/audio.h +++ b/plugins/unistim/audio.h @@ -1,5 +1,5 @@ /* audio.h - * header field declarations, value_string definitions and true_false_string + * header field declarations, value_string definitions and true_false_string * definitions for audio manager messages * Copyright 2007 Don Newton <dnewton@cypresscom.net> * @@ -283,15 +283,15 @@ static const true_false_string opt_rpt_enable_max_tone_vol={ "Maximum tone volume is set equal to the physical maximum", "Maximum tone volume is one level lower than physical maximum" }; -static const true_false_string opt_rpths_on_air_feature={ +static const true_false_string opt_rpths_on_air_feature={ "Single tone frequency sent to HS port while call in progress", "Single tone frequency NOT sent to HS port while call in progress" }; -static const true_false_string opt_rpt_hd_on_air_feature={ +static const true_false_string opt_rpt_hd_on_air_feature={ "Single tone frequency sent to HD port while call in progress", "Single tone frequency NOT sent to HD port while call in progress" }; -static const true_false_string opt_rpt_noise_sqlch_disable={ +static const true_false_string opt_rpt_noise_sqlch_disable={ "Automatic noise squelching enabled", "Automatic noise squelching disabled" }; @@ -440,7 +440,7 @@ static const value_string apb_op_codes[]={ {0x54,"Change Default Volume setting"}, {0x55,"Change Current Volume setting"}, {0x56,"Sampling Rate setting"}, - {0x57,"The filter(s) to be used when the HIP is enabled"}, + {0x57,"The filter(s) to be used when the HIP is enabled"}, {0x58,"The threshold that should be used when AGC is enabled"}, {0x59,"The threshold that should be used when Listener Sidetone (LST) is enabled"}, {0,NULL} @@ -536,7 +536,7 @@ static const true_false_string audio_opts_hs_on_air_feature={ static const true_false_string audio_opts_hd_on_air_feature={ "Single tone frequency sent to Headset (HD) port while call in progress", "Single tone frequency NOT sent to Headset (HD) port while call in progress" -}; +}; static const true_false_string noise_sqlch_disable={ "Automatic noise squelching enabled", "Automatic noise squelching disabled" diff --git a/plugins/unistim/basic.h b/plugins/unistim/basic.h index fc96165325..f052556df4 100644 --- a/plugins/unistim/basic.h +++ b/plugins/unistim/basic.h @@ -1,5 +1,5 @@ /* basic.h - * header field declarations, value_string def and true_false_string + * header field declarations, value_string def and true_false_string * definitions for basic manager messages * Copyright 2007 Don Newton <dnewton@cypresscom.net> * diff --git a/plugins/unistim/broadcast.h b/plugins/unistim/broadcast.h index 7bc6813bd4..de51e3d518 100644 --- a/plugins/unistim/broadcast.h +++ b/plugins/unistim/broadcast.h @@ -1,5 +1,5 @@ /* broadcast.h - * header field declarations, value_string def and true_false_string + * header field declarations, value_string def and true_false_string * definitions for broadcast manager messages * Copyright 2007 Don Newton <dnewton@cypresscom.net> * diff --git a/plugins/unistim/display.h b/plugins/unistim/display.h index 08aa56239b..db19471c6e 100644 --- a/plugins/unistim/display.h +++ b/plugins/unistim/display.h @@ -1,5 +1,5 @@ /*display.h - * header field declarations, value_string def and true_false_string + * header field declarations, value_string def and true_false_string * definitions for display manager messages * Copyright 2007 Don Newton <dnewton@cypresscom.net> * diff --git a/plugins/unistim/expansion.h b/plugins/unistim/expansion.h index 249316b64e..56163ff586 100644 --- a/plugins/unistim/expansion.h +++ b/plugins/unistim/expansion.h @@ -1,5 +1,5 @@ /* expansion.h - * header field declarations, value_string def and true_false_string + * header field declarations, value_string def and true_false_string * definitions for basic manager messages * Copyright 2007 Don Newton <dnewton@cypresscom.net> * diff --git a/plugins/unistim/key.h b/plugins/unistim/key.h index e3afb88f58..77d43b1bb2 100644 --- a/plugins/unistim/key.h +++ b/plugins/unistim/key.h @@ -1,5 +1,5 @@ /* key.h - * header field declarations, value_string def and true_false_string + * header field declarations, value_string def and true_false_string * definitions for key manager messages * Copyright 2007 Don Newton <dnewton@cypresscom.net> * @@ -108,7 +108,7 @@ static const value_string key_phone_msgs[]={ {0,NULL} }; - + static const true_false_string key_release={ "The Key code will be sent when a valid key release occurs", "No command will be sent when a key is released" @@ -125,7 +125,7 @@ static const true_false_string acd_supervisor={ "ACD supervisor path and indicator controlled by the Switch", "ACD supervisor path and indicator controlled by the Phone" }; - + static const value_string local_dialpad_feedback[]={ {0x00,"No tone feedback provided when a dial pad key is depressed"}, {0x01,"Short 'click' provided when a dial pad key is depressed"}, @@ -149,7 +149,7 @@ static const value_string led_ids[]={ {0x03,"Mute LED"}, {0,NULL} }; - + static const value_string led_cadences[]={ {0x00,"Off"}, {0x01,"On"}, diff --git a/plugins/unistim/network.h b/plugins/unistim/network.h index b53d5718b7..c95cda2253 100644 --- a/plugins/unistim/network.h +++ b/plugins/unistim/network.h @@ -1,5 +1,5 @@ /* network.h - * header field declarations, value_string def and true_false_string + * header field declarations, value_string def and true_false_string * definitions for network manager messages * Copyright 2007 Don Newton <dnewton@cypresscom.net> * diff --git a/plugins/unistim/packet-unistim.c b/plugins/unistim/packet-unistim.c index b28a71b5b7..7c2f9622e3 100644 --- a/plugins/unistim/packet-unistim.c +++ b/plugins/unistim/packet-unistim.c @@ -508,7 +508,7 @@ dissect_unistim_message(proto_tree *unistim_tree,packet_info *pinfo,tvbuff_t *tv offset+=(msg_len-2); } if(msg_len){ - /* TODO: add Expert info to indicate there is unknown data ! + /* TODO: add Expert info to indicate there is unknown data ! For the moment, this code only remove Clang Warnings about not used msg_len... */ } return offset; @@ -599,7 +599,7 @@ dissect_basic_phone(proto_tree *msg_tree, } if(msg_len){ - /* TODO: add Expert info to indicate there is unknown data ! + /* TODO: add Expert info to indicate there is unknown data ! For the moment, this code only remove Clang Warnings about not used msg_len... */ } @@ -676,7 +676,7 @@ dissect_basic_switch(proto_tree *msg_tree, } if(msg_len){ - /* TODO: add Expert info to indicate there is unknown data ! + /* TODO: add Expert info to indicate there is unknown data ! For the moment, this code only remove Clang Warnings about not used msg_len... */ } @@ -754,7 +754,7 @@ dissect_broadcast_switch(proto_tree *msg_tree, } if(msg_len){ - /* TODO: add Expert info to indicate there is unknown data ! + /* TODO: add Expert info to indicate there is unknown data ! For the moment, this code only remove Clang Warnings about not used msg_len... */ } @@ -1402,7 +1402,7 @@ dissect_display_switch(proto_tree *msg_tree, } if(msg_len){ - /* TODO: add Expert info to indicate there is unknown data ! + /* TODO: add Expert info to indicate there is unknown data ! For the moment, this code only remove Clang Warnings about not used msg_len... */ } @@ -1513,7 +1513,7 @@ dissect_display_phone(proto_tree *msg_tree, } if(msg_len){ - /* TODO: add Expert info to indicate there is unknown data ! + /* TODO: add Expert info to indicate there is unknown data ! For the moment, this code only remove Clang Warnings about not used msg_len... */ } @@ -1631,7 +1631,7 @@ dissect_key_indicator_switch(proto_tree *msg_tree, } if(msg_len){ - /* TODO: add Expert info to indicate there is unknown data ! + /* TODO: add Expert info to indicate there is unknown data ! For the moment, this code only remove Clang Warnings about not used msg_len... */ } @@ -1725,7 +1725,7 @@ dissect_key_indicator_phone(proto_tree *msg_tree, } if(msg_len){ - /* TODO: add Expert info to indicate there is unknown data ! + /* TODO: add Expert info to indicate there is unknown data ! For the moment, this code only remove Clang Warnings about not used msg_len... */ } @@ -1869,7 +1869,7 @@ dissect_network_switch(proto_tree *msg_tree, } if(msg_len){ - /* TODO: add Expert info to indicate there is unknown data ! + /* TODO: add Expert info to indicate there is unknown data ! For the moment, this code only remove Clang Warnings about not used msg_len... */ } @@ -2052,7 +2052,7 @@ dissect_network_phone(proto_tree *msg_tree, } if(msg_len){ - /* TODO: add Expert info to indicate there is unknown data ! + /* TODO: add Expert info to indicate there is unknown data ! For the moment, this code only remove Clang Warnings about not used msg_len... */ } @@ -2486,7 +2486,7 @@ dissect_audio_switch(proto_tree *msg_tree,packet_info *pinfo, } if(msg_len){ - /* TODO: add Expert info to indicate there is unknown data ! + /* TODO: add Expert info to indicate there is unknown data ! For the moment, this code only remove Clang Warnings about not used msg_len... */ } @@ -2710,7 +2710,7 @@ dissect_audio_phone(proto_tree *msg_tree, } if(msg_len){ - /* TODO: add Expert info to indicate there is unknown data ! + /* TODO: add Expert info to indicate there is unknown data ! For the moment, this code only remove Clang Warnings about not used msg_len... */ } diff --git a/plugins/unistim/packet-unistim.h b/plugins/unistim/packet-unistim.h index 0c873961bc..ce3402201c 100644 --- a/plugins/unistim/packet-unistim.h +++ b/plugins/unistim/packet-unistim.h @@ -1,5 +1,5 @@ /* packet-unistim.h - * header field declarations, value_string definitions, true_false_string + * header field declarations, value_string definitions, true_false_string * definitions and function prototypes for main dissectors * Copyright 2007 Don Newton <dnewton@cypresscom.net> * diff --git a/plugins/unistim/uftp.h b/plugins/unistim/uftp.h index e081e375d1..0fd1eb3e6d 100644 --- a/plugins/unistim/uftp.h +++ b/plugins/unistim/uftp.h @@ -1,5 +1,5 @@ /* uftp.h - * header field declarations, value_string def and true_false_string + * header field declarations, value_string def and true_false_string * definitions for uftp commands and messages * Copyright 2007 Chad Singer <csinger@cypresscom.net> * diff --git a/plugins/wimax/crc.c b/plugins/wimax/crc.c index b2dc4090dd..cd169c2725 100644 --- a/plugins/wimax/crc.c +++ b/plugins/wimax/crc.c @@ -47,11 +47,11 @@ extern guint16 crc16_table[256]; DESCRIPTION: Generate the table of CRC remainders for all possible bytes - + ARGS: RETURNS: - + SIDE EFFECTS: */ @@ -62,16 +62,16 @@ void wimax_mac_gen_crc32_table(void) /* little-endian (reflected) algorithm */ for ( index = 0; index < G_N_ELEMENTS(crc32_table); index++ ) - { + { crc = ( index << 24 ); for ( bit = 0; bit < 8; bit++ ) { if ( crc & 0x80000000U ) crc = ( crc << 1 ) ^ WMAX_MAC_CRC32_POLYNOMIAL; else - crc = ( crc << 1 ); + crc = ( crc << 1 ); } - crc32_table[index] = crc; + crc32_table[index] = crc; } } @@ -94,18 +94,18 @@ void wimax_mac_gen_crc8_table(void) { guint index, bit; guint8 crc; - + for ( index = 0; index < G_N_ELEMENTS(crc8_table); index++ ) - { + { crc = index; for ( bit = 0; bit < 8; bit++ ) { if ( crc & 0x80 ) crc = ( crc << 1 ) ^ WMAX_MAC_CRC8_POLYNOMIAL; else - crc = ( crc << 1 ); + crc = ( crc << 1 ); } - crc8_table[index] = crc; + crc8_table[index] = crc; } } #endif @@ -122,7 +122,7 @@ void wimax_mac_gen_crc8_table(void) data_len - length of data (in bytes) RETURNS: calculated crc32 - + SIDE EFFECTS: */ @@ -132,9 +132,9 @@ guint32 wimax_mac_calc_crc32(const guint8 *data, guint data_len) guint i, j; for ( j = 0; j < data_len; j++ ) - { + { i = ( (guint8)(crc>>24) ^ data[j] ) & 0xff; - crc = ( crc<<8 ) ^ crc32_table[i]; + crc = ( crc<<8 ) ^ crc32_table[i]; } return ~crc; } @@ -151,7 +151,7 @@ guint32 wimax_mac_calc_crc32(const guint8 *data, guint data_len) data_len - length of data (in bytes) RETURNS: calculated crc16 - + SIDE EFFECTS: */ @@ -161,7 +161,7 @@ guint16 wimax_mac_calc_crc16(const guint8 *data, guint data_len) guint j; for ( j = 0; j < data_len; j++ ) - { + { crc ^= data[j] << 8; crc = (crc << 8) ^ crc16_table[(crc & 0xff00) >> 8]; } @@ -182,7 +182,7 @@ guint16 wimax_mac_calc_crc16(const guint8 *data, guint data_len) data_len - length of data (in bytes) RETURNS: calculated crc8 - + SIDE EFFECTS: */ diff --git a/plugins/wimax/crc_data.c b/plugins/wimax/crc_data.c index f97774a4c6..e02411ba08 100644 --- a/plugins/wimax/crc_data.c +++ b/plugins/wimax/crc_data.c @@ -137,37 +137,37 @@ guint8 hcs_table[256] = { #endif guint16 crc16_table[256] = { - 0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50a5, 0x60c6, 0x70e7, - 0x8108, 0x9129, 0xa14a, 0xb16b, 0xc18c, 0xd1ad, 0xe1ce, 0xf1ef, - 0x1231, 0x0210, 0x3273, 0x2252, 0x52b5, 0x4294, 0x72f7, 0x62d6, - 0x9339, 0x8318, 0xb37b, 0xa35a, 0xd3bd, 0xc39c, 0xf3ff, 0xe3de, - 0x2462, 0x3443, 0x0420, 0x1401, 0x64e6, 0x74c7, 0x44a4, 0x5485, - 0xa56a, 0xb54b, 0x8528, 0x9509, 0xe5ee, 0xf5cf, 0xc5ac, 0xd58d, - 0x3653, 0x2672, 0x1611, 0x0630, 0x76d7, 0x66f6, 0x5695, 0x46b4, - 0xb75b, 0xa77a, 0x9719, 0x8738, 0xf7df, 0xe7fe, 0xd79d, 0xc7bc, - 0x48c4, 0x58e5, 0x6886, 0x78a7, 0x0840, 0x1861, 0x2802, 0x3823, - 0xc9cc, 0xd9ed, 0xe98e, 0xf9af, 0x8948, 0x9969, 0xa90a, 0xb92b, - 0x5af5, 0x4ad4, 0x7ab7, 0x6a96, 0x1a71, 0x0a50, 0x3a33, 0x2a12, - 0xdbfd, 0xcbdc, 0xfbbf, 0xeb9e, 0x9b79, 0x8b58, 0xbb3b, 0xab1a, - 0x6ca6, 0x7c87, 0x4ce4, 0x5cc5, 0x2c22, 0x3c03, 0x0c60, 0x1c41, - 0xedae, 0xfd8f, 0xcdec, 0xddcd, 0xad2a, 0xbd0b, 0x8d68, 0x9d49, - 0x7e97, 0x6eb6, 0x5ed5, 0x4ef4, 0x3e13, 0x2e32, 0x1e51, 0x0e70, - 0xff9f, 0xefbe, 0xdfdd, 0xcffc, 0xbf1b, 0xaf3a, 0x9f59, 0x8f78, - 0x9188, 0x81a9, 0xb1ca, 0xa1eb, 0xd10c, 0xc12d, 0xf14e, 0xe16f, - 0x1080, 0x00a1, 0x30c2, 0x20e3, 0x5004, 0x4025, 0x7046, 0x6067, - 0x83b9, 0x9398, 0xa3fb, 0xb3da, 0xc33d, 0xd31c, 0xe37f, 0xf35e, - 0x02b1, 0x1290, 0x22f3, 0x32d2, 0x4235, 0x5214, 0x6277, 0x7256, - 0xb5ea, 0xa5cb, 0x95a8, 0x8589, 0xf56e, 0xe54f, 0xd52c, 0xc50d, - 0x34e2, 0x24c3, 0x14a0, 0x0481, 0x7466, 0x6447, 0x5424, 0x4405, - 0xa7db, 0xb7fa, 0x8799, 0x97b8, 0xe75f, 0xf77e, 0xc71d, 0xd73c, - 0x26d3, 0x36f2, 0x0691, 0x16b0, 0x6657, 0x7676, 0x4615, 0x5634, - 0xd94c, 0xc96d, 0xf90e, 0xe92f, 0x99c8, 0x89e9, 0xb98a, 0xa9ab, - 0x5844, 0x4865, 0x7806, 0x6827, 0x18c0, 0x08e1, 0x3882, 0x28a3, - 0xcb7d, 0xdb5c, 0xeb3f, 0xfb1e, 0x8bf9, 0x9bd8, 0xabbb, 0xbb9a, - 0x4a75, 0x5a54, 0x6a37, 0x7a16, 0x0af1, 0x1ad0, 0x2ab3, 0x3a92, - 0xfd2e, 0xed0f, 0xdd6c, 0xcd4d, 0xbdaa, 0xad8b, 0x9de8, 0x8dc9, - 0x7c26, 0x6c07, 0x5c64, 0x4c45, 0x3ca2, 0x2c83, 0x1ce0, 0x0cc1, - 0xef1f, 0xff3e, 0xcf5d, 0xdf7c, 0xaf9b, 0xbfba, 0x8fd9, 0x9ff8, - 0x6e17, 0x7e36, 0x4e55, 0x5e74, 0x2e93, 0x3eb2, 0x0ed1, 0x1ef0, + 0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50a5, 0x60c6, 0x70e7, + 0x8108, 0x9129, 0xa14a, 0xb16b, 0xc18c, 0xd1ad, 0xe1ce, 0xf1ef, + 0x1231, 0x0210, 0x3273, 0x2252, 0x52b5, 0x4294, 0x72f7, 0x62d6, + 0x9339, 0x8318, 0xb37b, 0xa35a, 0xd3bd, 0xc39c, 0xf3ff, 0xe3de, + 0x2462, 0x3443, 0x0420, 0x1401, 0x64e6, 0x74c7, 0x44a4, 0x5485, + 0xa56a, 0xb54b, 0x8528, 0x9509, 0xe5ee, 0xf5cf, 0xc5ac, 0xd58d, + 0x3653, 0x2672, 0x1611, 0x0630, 0x76d7, 0x66f6, 0x5695, 0x46b4, + 0xb75b, 0xa77a, 0x9719, 0x8738, 0xf7df, 0xe7fe, 0xd79d, 0xc7bc, + 0x48c4, 0x58e5, 0x6886, 0x78a7, 0x0840, 0x1861, 0x2802, 0x3823, + 0xc9cc, 0xd9ed, 0xe98e, 0xf9af, 0x8948, 0x9969, 0xa90a, 0xb92b, + 0x5af5, 0x4ad4, 0x7ab7, 0x6a96, 0x1a71, 0x0a50, 0x3a33, 0x2a12, + 0xdbfd, 0xcbdc, 0xfbbf, 0xeb9e, 0x9b79, 0x8b58, 0xbb3b, 0xab1a, + 0x6ca6, 0x7c87, 0x4ce4, 0x5cc5, 0x2c22, 0x3c03, 0x0c60, 0x1c41, + 0xedae, 0xfd8f, 0xcdec, 0xddcd, 0xad2a, 0xbd0b, 0x8d68, 0x9d49, + 0x7e97, 0x6eb6, 0x5ed5, 0x4ef4, 0x3e13, 0x2e32, 0x1e51, 0x0e70, + 0xff9f, 0xefbe, 0xdfdd, 0xcffc, 0xbf1b, 0xaf3a, 0x9f59, 0x8f78, + 0x9188, 0x81a9, 0xb1ca, 0xa1eb, 0xd10c, 0xc12d, 0xf14e, 0xe16f, + 0x1080, 0x00a1, 0x30c2, 0x20e3, 0x5004, 0x4025, 0x7046, 0x6067, + 0x83b9, 0x9398, 0xa3fb, 0xb3da, 0xc33d, 0xd31c, 0xe37f, 0xf35e, + 0x02b1, 0x1290, 0x22f3, 0x32d2, 0x4235, 0x5214, 0x6277, 0x7256, + 0xb5ea, 0xa5cb, 0x95a8, 0x8589, 0xf56e, 0xe54f, 0xd52c, 0xc50d, + 0x34e2, 0x24c3, 0x14a0, 0x0481, 0x7466, 0x6447, 0x5424, 0x4405, + 0xa7db, 0xb7fa, 0x8799, 0x97b8, 0xe75f, 0xf77e, 0xc71d, 0xd73c, + 0x26d3, 0x36f2, 0x0691, 0x16b0, 0x6657, 0x7676, 0x4615, 0x5634, + 0xd94c, 0xc96d, 0xf90e, 0xe92f, 0x99c8, 0x89e9, 0xb98a, 0xa9ab, + 0x5844, 0x4865, 0x7806, 0x6827, 0x18c0, 0x08e1, 0x3882, 0x28a3, + 0xcb7d, 0xdb5c, 0xeb3f, 0xfb1e, 0x8bf9, 0x9bd8, 0xabbb, 0xbb9a, + 0x4a75, 0x5a54, 0x6a37, 0x7a16, 0x0af1, 0x1ad0, 0x2ab3, 0x3a92, + 0xfd2e, 0xed0f, 0xdd6c, 0xcd4d, 0xbdaa, 0xad8b, 0x9de8, 0x8dc9, + 0x7c26, 0x6c07, 0x5c64, 0x4c45, 0x3ca2, 0x2c83, 0x1ce0, 0x0cc1, + 0xef1f, 0xff3e, 0xcf5d, 0xdf7c, 0xaf9b, 0xbfba, 0x8fd9, 0x9ff8, + 0x6e17, 0x7e36, 0x4e55, 0x5e74, 0x2e93, 0x3eb2, 0x0ed1, 0x1ef0, }; diff --git a/plugins/wimax/mac_mgmt_msg_decoder.c b/plugins/wimax/mac_mgmt_msg_decoder.c index 0ff2cefc50..d505692449 100644 --- a/plugins/wimax/mac_mgmt_msg_decoder.c +++ b/plugins/wimax/mac_mgmt_msg_decoder.c @@ -161,7 +161,7 @@ static void dissect_mac_mgmt_msg_decoder(tvbuff_t *tvb, packet_info *pinfo, prot proto_item_append_text(proto_tree_get_parent(tree), ", %s", mgt_msg_str); /* Decode and display the MAC payload */ - if (!dissector_try_uint(subdissector_message_table, message_type, + if (!dissector_try_uint(subdissector_message_table, message_type, tvb_new_subset_remaining(tvb, 1), pinfo, tree)) { proto_tree_add_item(message_tree, hf_mac_mgmt_msg_values, tvb, offset, -1, ENC_NA); diff --git a/plugins/wimax/msg_dsa.c b/plugins/wimax/msg_dsa.c index b781f9fe9a..a80c368bcf 100644 --- a/plugins/wimax/msg_dsa.c +++ b/plugins/wimax/msg_dsa.c @@ -61,7 +61,7 @@ static void dissect_mac_mgmt_msg_dsa_req_decoder(tvbuff_t *tvb, packet_info *pin { /* we are being asked for details */ /* display MAC message type */ - dsa_item = proto_tree_add_protocol_format(tree, proto_mac_mgmt_msg_dsa_decoder, tvb, offset, -1, + dsa_item = proto_tree_add_protocol_format(tree, proto_mac_mgmt_msg_dsa_decoder, tvb, offset, -1, "Dynamic Service Addition Request (DSA-REQ)"); /* add MAC DSx subtree */ dsa_tree = proto_item_add_subtree(dsa_item, ett_mac_mgmt_msg_dsa_req_decoder); diff --git a/plugins/wimax/msg_dsd.c b/plugins/wimax/msg_dsd.c index 7f2a494aa2..79338b01fa 100644 --- a/plugins/wimax/msg_dsd.c +++ b/plugins/wimax/msg_dsd.c @@ -209,35 +209,35 @@ void proto_register_mac_mgmt_msg_dsd(void) { &hf_dsd_confirmation_code, { - "Confirmation code", "wmx.dsd.confirmation_code", + "Confirmation code", "wmx.dsd.confirmation_code", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL } }, { &hf_dsd_service_flow_id, { - "Service Flow ID", "wmx.dsd.service_flow_id", + "Service Flow ID", "wmx.dsd.service_flow_id", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL } }, { &hf_dsd_transaction_id, { - "Transaction ID", "wmx.dsd.transaction_id", + "Transaction ID", "wmx.dsd.transaction_id", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL } }, { &hf_dsd_invalid_tlv, { - "Invalid TLV", "wmx.dsd.invalid_tlv", + "Invalid TLV", "wmx.dsd.invalid_tlv", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_dsd_unknown_type, { - "Unknown type", "wmx.dsd.unknown_type", + "Unknown type", "wmx.dsd.unknown_type", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } } diff --git a/plugins/wimax/msg_reg_req.c b/plugins/wimax/msg_reg_req.c index c8093d4052..a2a50739de 100644 --- a/plugins/wimax/msg_reg_req.c +++ b/plugins/wimax/msg_reg_req.c @@ -259,7 +259,7 @@ void dissect_extended_tlv(proto_tree *reg_req_tree, gint tlv_type, tvbuff_t *tvb case REG_UL_TRANSPORT_CIDS_SUPPORTED: add_tlv_subtree(&tlv_info, reg_req_tree, hf_reg_ul_cids, tvb, offset, ENC_BIG_ENDIAN); break; - + case REG_POWER_SAVING_CLASS_CAPABILITY: tlv_item = add_tlv_subtree(&tlv_info, reg_req_tree, hf_reg_power_saving_class_capability, tvb, offset, ENC_BIG_ENDIAN); tlv_tree = proto_item_add_subtree(tlv_item, ett_mac_mgmt_msg_reg_req_decoder); diff --git a/plugins/wimax/msg_rng_rsp.c b/plugins/wimax/msg_rng_rsp.c index fab1caece7..27602152a2 100644 --- a/plugins/wimax/msg_rng_rsp.c +++ b/plugins/wimax/msg_rng_rsp.c @@ -513,11 +513,11 @@ static void dissect_mac_mgmt_msg_rng_rsp_decoder(tvbuff_t *tvb, packet_info *pin add_tlv_subtree(&tlv_info, rng_rsp_tree, hf_tlv_type, tvb, offset, ENC_NA); } break; - + default: add_tlv_subtree(&tlv_info, rng_rsp_tree, hf_tlv_type, tvb, offset, ENC_NA); break; - + } offset = tlv_len + tlv_offset; } /* end of TLV process while loop */ @@ -752,7 +752,7 @@ void proto_register_mac_mgmt_msg_rng_rsp(void) { &hf_rng_invalid_tlv, { - "Invalid TLV", "wmx.rng_rsp.invalid_tlv", + "Invalid TLV", "wmx.rng_rsp.invalid_tlv", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL } }, diff --git a/rawshark.c b/rawshark.c index c7f049e07c..adc7cd2e9d 100644 --- a/rawshark.c +++ b/rawshark.c @@ -1066,7 +1066,7 @@ load_cap_file(capture_file *cf) } static gboolean -process_packet(capture_file *cf, epan_dissect_t *edt, gint64 offset, +process_packet(capture_file *cf, epan_dissect_t *edt, gint64 offset, struct wtap_pkthdr *whdr, const guchar *pd) { frame_data fdata; diff --git a/ringbuffer.c b/ringbuffer.c index f9f1e6d678..2c763c05a2 100644 --- a/ringbuffer.c +++ b/ringbuffer.c @@ -122,7 +122,7 @@ static int ringbuf_open_file(rb_file *rfile, int *err) return -1; } - rb_data.fd = ws_open(rfile->name, O_RDWR|O_BINARY|O_TRUNC|O_CREAT, + rb_data.fd = ws_open(rfile->name, O_RDWR|O_BINARY|O_TRUNC|O_CREAT, rb_data.group_read_access ? 0640 : 0600); if (rb_data.fd == -1 && err != NULL) { diff --git a/sync_pipe_write.c b/sync_pipe_write.c index b18adedd19..d93897e154 100644 --- a/sync_pipe_write.c +++ b/sync_pipe_write.c @@ -62,8 +62,8 @@ pipe_write_header(int pipe_fd, char indicator, int length) } -/* write a message to the recipient pipe in the standard format - (3 digit message length (excluding length and indicator field), +/* write a message to the recipient pipe in the standard format + (3 digit message length (excluding length and indicator field), 1 byte message indicator and the rest is the message). If msg is NULL, the message has only a length and indicator. */ void 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 diff --git a/ui/gtk/color_dlg.c b/ui/gtk/color_dlg.c index 3b57eaa000..5259524e84 100644 --- a/ui/gtk/color_dlg.c +++ b/ui/gtk/color_dlg.c @@ -1019,7 +1019,7 @@ color_clear_cb(GtkWidget *widget, gpointer data _U_) { } -static void +static void overwrite_existing_colorfilters_cb(gpointer dialog _U_, gint btn, gpointer data _U_) { switch (btn) { diff --git a/ui/gtk/conversation_hastables_dlg.c b/ui/gtk/conversation_hastables_dlg.c index 7f6648b87c..32514383b8 100644 --- a/ui/gtk/conversation_hastables_dlg.c +++ b/ui/gtk/conversation_hastables_dlg.c @@ -54,7 +54,7 @@ static GtkWidget *conversation_hastables_dlg_w = NULL; * Compute the hash value for two given address/port pairs if the match * is to be exact. */ -/* http://eternallyconfuzzled.com/tuts/algorithms/jsw_tut_hashing.aspx#existing +/* http://eternallyconfuzzled.com/tuts/algorithms/jsw_tut_hashing.aspx#existing * One-at-a-Time hash */ static guint @@ -152,7 +152,7 @@ conversation_info_to_texbuff(GtkTextBuffer *buffer) conversation_hashtable_exact = get_conversation_hashtable_exact(); if(conversation_hashtable_exact){ - g_snprintf(string_buff, CONV_STR_BUF_MAX, "conversation_hashtable_exact %i entries\n#\n", + g_snprintf(string_buff, CONV_STR_BUF_MAX, "conversation_hashtable_exact %i entries\n#\n", g_hash_table_size(conversation_hashtable_exact)); gtk_text_buffer_insert_at_cursor (buffer, string_buff, -1); g_hash_table_foreach( conversation_hashtable_exact, conversation_hashtable_exact_to_texbuff, buffer); @@ -160,7 +160,7 @@ conversation_info_to_texbuff(GtkTextBuffer *buffer) conversation_hashtable_no_addr2 = get_conversation_hashtable_no_addr2(); if(conversation_hashtable_no_addr2){ - g_snprintf(string_buff, CONV_STR_BUF_MAX, "conversation_hashtable_no_addr2 %i entries\n#\n", + g_snprintf(string_buff, CONV_STR_BUF_MAX, "conversation_hashtable_no_addr2 %i entries\n#\n", g_hash_table_size(conversation_hashtable_no_addr2)); gtk_text_buffer_insert_at_cursor (buffer, string_buff, -1); @@ -168,7 +168,7 @@ conversation_info_to_texbuff(GtkTextBuffer *buffer) conversation_hashtable_no_port2 = get_conversation_hashtable_no_port2(); if(conversation_hashtable_no_port2){ - g_snprintf(string_buff, CONV_STR_BUF_MAX, "conversation_hashtable_no_port2 %i entries\n#\n", + g_snprintf(string_buff, CONV_STR_BUF_MAX, "conversation_hashtable_no_port2 %i entries\n#\n", g_hash_table_size(conversation_hashtable_no_port2)); gtk_text_buffer_insert_at_cursor (buffer, string_buff, -1); @@ -176,7 +176,7 @@ conversation_info_to_texbuff(GtkTextBuffer *buffer) conversation_hashtable_no_addr2_or_port2 = get_conversation_hashtable_no_addr2_or_port2(); if(conversation_hashtable_no_addr2_or_port2){ - g_snprintf(string_buff, CONV_STR_BUF_MAX, "conversation_hashtable_no_addr2_or_port2 %i entries\n#\n", + g_snprintf(string_buff, CONV_STR_BUF_MAX, "conversation_hashtable_no_addr2_or_port2 %i entries\n#\n", g_hash_table_size(conversation_hashtable_no_addr2_or_port2)); gtk_text_buffer_insert_at_cursor (buffer, string_buff, -1); diff --git a/ui/gtk/decode_as_dlg.c b/ui/gtk/decode_as_dlg.c index 9b4ae16c21..bbb96faa8e 100644 --- a/ui/gtk/decode_as_dlg.c +++ b/ui/gtk/decode_as_dlg.c @@ -161,7 +161,7 @@ write_da_entry(gpointer item, gpointer user_data) da_entry_t *entry = (da_entry_t *)item; FILE *daf = (FILE *)user_data; gchar *selector_str = g_strdup_printf("%d", entry->selector); - + decode_as_write_entry(daf, entry->table, selector_str, entry->initial, entry->current); g_free(selector_str); } @@ -456,7 +456,7 @@ decode_show_save_cb (GtkWidget *win _U_, gpointer user_data _U_) FILE *daf = decode_as_open(); if (!daf) return; - + g_slist_foreach(da_entries, write_da_entry, daf); fclose(daf); @@ -977,7 +977,7 @@ decode_add_multivalue_combo_box (GtkWidget *page, decode_as_t *entry) gchar prompt[MAX_DECODE_AS_PROMPT_LEN]; combo_box = ws_combo_box_new_text_and_pointer(); - + for (value = 0; value < entry->num_items; value++) { entry->values[value].label_func(&cfile.edt->pi, prompt); @@ -1219,7 +1219,7 @@ decode_add_simple_menu (GtkWidget *page, decode_as_t *entry) * @return GtkWidget * A pointer to the notebook page created by this * routine. */ -static GtkWidget * +static GtkWidget * decode_add_simple_page (decode_as_t *entry) { GtkWidget *page, *label, *scrolled_window, *combo_box; diff --git a/ui/gtk/diameter_stat.c b/ui/gtk/diameter_stat.c index c59c212472..5ccf3bb99f 100644 --- a/ui/gtk/diameter_stat.c +++ b/ui/gtk/diameter_stat.c @@ -184,11 +184,11 @@ gtk_diameterstat_init(const char *opt_arg, void *userdata _U_) init_srt_table_row(&diameter->diameter_srt_table, 0, "Unknown"); error_string=register_tap_listener( - "diameter", - diameter, filter, - TL_REQUIRES_PROTO_TREE, - diameterstat_reset, - diameterstat_packet, + "diameter", + diameter, filter, + TL_REQUIRES_PROTO_TREE, + diameterstat_reset, + diameterstat_packet, diameterstat_draw); if(error_string){ diff --git a/ui/gtk/dissector_tables_dlg.h b/ui/gtk/dissector_tables_dlg.h index e0276a7052..2466332454 100644 --- a/ui/gtk/dissector_tables_dlg.h +++ b/ui/gtk/dissector_tables_dlg.h @@ -6,17 +6,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. diff --git a/ui/gtk/edit_packet_comment_dlg.c b/ui/gtk/edit_packet_comment_dlg.c index 0765d7f59e..062ed614be 100644 --- a/ui/gtk/edit_packet_comment_dlg.c +++ b/ui/gtk/edit_packet_comment_dlg.c @@ -251,7 +251,7 @@ edit_capture_comment_dlg_launch (void) gtk_widget_show (edit_or_add_capture_comment_dlg); } - + void edit_capture_comment_dlg_hide(void) diff --git a/ui/gtk/expert_comp_dlg.h b/ui/gtk/expert_comp_dlg.h index d7a9240af9..e597a4849f 100644 --- a/ui/gtk/expert_comp_dlg.h +++ b/ui/gtk/expert_comp_dlg.h @@ -6,17 +6,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. diff --git a/ui/gtk/expert_comp_table.h b/ui/gtk/expert_comp_table.h index 3e4c0eaa0f..03036a37b1 100644 --- a/ui/gtk/expert_comp_table.h +++ b/ui/gtk/expert_comp_table.h @@ -1,6 +1,6 @@ /* expert_comp_table.h * expert_comp_table 2005 Greg Morris - * Portions copied from service_response_time_table.h by Ronnie Sahlberg + * Portions copied from service_response_time_table.h by Ronnie Sahlberg * Helper routines common to all composite expert statistics * tap. * @@ -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. diff --git a/ui/gtk/export_sslkeys.c b/ui/gtk/export_sslkeys.c index a6a2e2f4cd..9538e6b200 100644 --- a/ui/gtk/export_sslkeys.c +++ b/ui/gtk/export_sslkeys.c @@ -127,7 +127,7 @@ gtk_export_sslkeys_file(guint keylist_len) * Build the dialog box we need. */ savesslkeys_dlg = file_selection_new("Wireshark: Export SSL Session Keys", - GTK_WINDOW(top_level), + GTK_WINDOW(top_level), FILE_SELECTION_SAVE); /* label */ diff --git a/ui/gtk/file_dlg.h b/ui/gtk/file_dlg.h index f0c0106dbf..cd48771cf5 100644 --- a/ui/gtk/file_dlg.h +++ b/ui/gtk/file_dlg.h @@ -24,7 +24,7 @@ /** @defgroup filesel_dialog_group File Selection Dialogs * - * Dialogs are specially created windows and are related to their parent windows (usually the main window). + * Dialogs are specially created windows and are related to their parent windows (usually the main window). * See: @ref howto_window_page for details. * * File selection dialogs are created using file_selection_new(). @@ -39,7 +39,7 @@ * - "Save Data As CSV" save_csv_as_cb() * - "Save Payload As ..." on_save_bt_clicked() * - "Save selected stream in rtpdump" rtpstream_on_save() - * + * */ /** @file @@ -57,7 +57,7 @@ typedef enum { FILE_SELECTION_READ_BROWSE, /**< browse for a file to read */ FILE_SELECTION_SAVE, /**< save/export a file */ FILE_SELECTION_WRITE_BROWSE, /**< browse for a file to write to */ - FILE_SELECTION_CREATE_FOLDER /**< browse for a dir. to save in */ + FILE_SELECTION_CREATE_FOLDER /**< browse for a dir. to save in */ } file_selection_action_t; /** Create a file selection dialog box window that belongs to a top-level @@ -88,7 +88,7 @@ extern gboolean file_selection_set_current_folder(GtkWidget *fs, const gchar *fi #define file_selection_set_current_file(chooser, filename) \ gtk_file_chooser_set_filename(chooser, filename) -/** Set the "extra" widget for a file selection dialog. This is needed to support +/** Set the "extra" widget for a file selection dialog. This is needed to support * user-supplied options. * * @param fs the file selection dialog from file_selection_new() diff --git a/ui/gtk/filter_autocomplete.c b/ui/gtk/filter_autocomplete.c index 3513ba5075..5bd4c81a0e 100644 --- a/ui/gtk/filter_autocomplete.c +++ b/ui/gtk/filter_autocomplete.c @@ -76,7 +76,7 @@ is_protocol_name_being_typed(GtkWidget *filter_te, int str_len) int op_len, cursor_pos; gchar *start; gchar *pos; - static const gchar *logic_ops[] = + static const gchar *logic_ops[] = { "!", "not", "||", "or", "&&", "and", diff --git a/ui/gtk/filter_autocomplete.h b/ui/gtk/filter_autocomplete.h index ae5a73c30c..336ef094f5 100644 --- a/ui/gtk/filter_autocomplete.h +++ b/ui/gtk/filter_autocomplete.h @@ -22,7 +22,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. - */ + */ #ifndef _FILTER_AUTO_COMPLETE_H_ #define _FILTER_AUTO_COMPLETE_H_ diff --git a/ui/gtk/filter_dlg.c b/ui/gtk/filter_dlg.c index e1963027b4..7db090107c 100644 --- a/ui/gtk/filter_dlg.c +++ b/ui/gtk/filter_dlg.c @@ -1280,7 +1280,7 @@ colorize_filter_te_as_empty(GtkWidget *w) gtk_widget_override_color(w, GTK_STATE_FLAG_NORMAL, NULL); gtk_widget_override_background_color(w, GTK_STATE_FLAG_NORMAL, NULL); gtk_widget_override_cursor(w, NULL, NULL); -#else +#else /* use defaults */ gtk_widget_modify_text(w, GTK_STATE_NORMAL, NULL); gtk_widget_modify_base(w, GTK_STATE_NORMAL, NULL); diff --git a/ui/gtk/firewall_dlg.c b/ui/gtk/firewall_dlg.c index 3a065fd7b0..623dd9fe28 100644 --- a/ui/gtk/firewall_dlg.c +++ b/ui/gtk/firewall_dlg.c @@ -297,7 +297,7 @@ firewall_rule_cb(GtkWidget *w _U_, gpointer data _U_) /* Make sure this widget gets destroyed if we quit the main loop, so that if we exit, we clean up any temporary files we have - for "Follow SSL Stream" windows. + for "Follow SSL Stream" windows. gtk_quit_add_destroy is deprecated and should not be used in newly-written code. This function is going to be removed in GTK+ 3.0 gtk_quit_add_destroy(gtk_main_level(), GTK_OBJECT(rule_w)); diff --git a/ui/gtk/follow_stream.c b/ui/gtk/follow_stream.c index 79bf7547e1..ab56567bd7 100644 --- a/ui/gtk/follow_stream.c +++ b/ui/gtk/follow_stream.c @@ -838,8 +838,8 @@ follow_stream(const gchar *title, follow_info_t *follow_info, /* Make sure this widget gets destroyed if we quit the main loop, so that if we exit, we clean up any temporary files we have - for "Follow TCP Stream" windows. - gtk_quit_add_destroy is deprecated and should not be used in newly-written code. + for "Follow TCP Stream" windows. + gtk_quit_add_destroy is deprecated and should not be used in newly-written code. This function is going to be removed in GTK+ 3.0 gtk_quit_add_destroy(gtk_main_level(), GTK_OBJECT(streamwindow)); */ diff --git a/ui/gtk/font_utils.h b/ui/gtk/font_utils.h index 47214da69b..0fc5fb4477 100644 --- a/ui/gtk/font_utils.h +++ b/ui/gtk/font_utils.h @@ -24,12 +24,12 @@ /** @file - * Utilities for font manipulation. + * Utilities for font manipulation. * * There are two different fonts used: * - the application font for menu's, dialog's and such * - the user font for the packet panes - * + * * The user font is also available in regular (m_r_font) and bold (m_b_font) versions. */ @@ -46,7 +46,7 @@ typedef enum { FA_FONT_NOT_AVAILABLE /**< the chosen font isn't available */ } fa_ret_t; -/** Applies a new user font, corresponding to the preferences font name and recent zoom level. +/** Applies a new user font, corresponding to the preferences font name and recent zoom level. * Will also redraw the screen. * * @return if the new font could be set or not diff --git a/ui/gtk/graph_analysis.c b/ui/gtk/graph_analysis.c index 2314009466..fe5ebcf1f9 100644 --- a/ui/gtk/graph_analysis.c +++ b/ui/gtk/graph_analysis.c @@ -1111,7 +1111,7 @@ mouse_scrolled(GtkWidget *widget _U_, GdkEventScroll *event, gpointer data) GtkAdjustment *adjustment; gdouble v_scroll_items; GtkAllocation draw_area_alloc, scroll_window_alloc; - + if (event->direction == GDK_SCROLL_UP) { adjustment = user_data->dlg.v_scrollbar_adjustment; v_scroll_items = pow(gtk_adjustment_get_page_size(adjustment), 2.0/3.0); @@ -1122,7 +1122,7 @@ mouse_scrolled(GtkWidget *widget _U_, GdkEventScroll *event, gpointer data) gtk_adjustment_set_value(adjustment, gtk_adjustment_get_value(adjustment) - v_scroll_items); } } - + else if (event->direction == GDK_SCROLL_DOWN) { adjustment = user_data->dlg.v_scrollbar_adjustment; v_scroll_items = pow (gtk_adjustment_get_page_size(adjustment), 2.0/3.0); @@ -1133,7 +1133,7 @@ mouse_scrolled(GtkWidget *widget _U_, GdkEventScroll *event, gpointer data) gtk_adjustment_set_value(adjustment, gtk_adjustment_get_value(adjustment) + v_scroll_items); } } - + else if (event->direction == GDK_SCROLL_LEFT) { if (widget == user_data->dlg.scroll_window) { scroll_window = user_data->dlg.scroll_window; @@ -1151,7 +1151,7 @@ mouse_scrolled(GtkWidget *widget _U_, GdkEventScroll *event, gpointer data) } gtk_scrolled_window_set_hadjustment(GTK_SCROLLED_WINDOW(scroll_window), adjustment); } - + else if (event->direction == GDK_SCROLL_RIGHT) { if (widget == user_data->dlg.scroll_window) { scroll_window = user_data->dlg.scroll_window; @@ -1519,7 +1519,7 @@ static void create_draw_area(graph_analysis_data_t *user_data, GtkWidget *box) /* creating time scroll window to enable mouse scroll */ user_data->dlg.scroll_window_time = gtk_scrolled_window_new(NULL, NULL); gtk_widget_set_size_request(user_data->dlg.scroll_window_time, TIME_WIDTH, user_data->dlg.surface_height); - + /* create "comments" draw area */ user_data->dlg.draw_area_comments = gtk_drawing_area_new(); gtk_widget_set_size_request(user_data->dlg.draw_area_comments, COMMENT_WIDTH, user_data->dlg.surface_height); @@ -1529,12 +1529,12 @@ static void create_draw_area(graph_analysis_data_t *user_data, GtkWidget *box) * Set the scrollbar policy for the horizontal and vertical scrollbars * The policy determines when the scrollbar should appear */ - + /* we only want mouse scroll from this window */ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW (user_data->dlg.scroll_window_time), GTK_POLICY_NEVER, /* Policy for horizontal bar. */ GTK_POLICY_NEVER); /* Policy for vertical bar */ - + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW (user_data->dlg.scroll_window_comments), GTK_POLICY_ALWAYS, /* Policy for horizontal bar. */ GTK_POLICY_NEVER); /* Policy for vertical bar */ @@ -1542,7 +1542,7 @@ static void create_draw_area(graph_analysis_data_t *user_data, GtkWidget *box) /* Changes the type of shadow drawn around the contents of scrolled_window. */ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(user_data->dlg.scroll_window_time), GTK_SHADOW_ETCHED_IN); - + gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(user_data->dlg.scroll_window_comments), GTK_SHADOW_ETCHED_IN); diff --git a/ui/gtk/hostlist_table.h b/ui/gtk/hostlist_table.h index 08f1017261..abd3e99309 100644 --- a/ui/gtk/hostlist_table.h +++ b/ui/gtk/hostlist_table.h @@ -44,8 +44,8 @@ typedef struct _hostlist_talker_t { guint64 rx_bytes; /**< number of received bytes */ guint64 tx_bytes; /**< number of transmitted bytes */ - gboolean modified; /**< new to redraw the row */ - GtkTreeIter iter; + gboolean modified; /**< new to redraw the row */ + GtkTreeIter iter; gboolean iter_valid; /**< not a new row */ } hostlist_talker_t; diff --git a/ui/gtk/iax2_analysis.h b/ui/gtk/iax2_analysis.h index 5bcbdc3089..ea0c23f052 100644 --- a/ui/gtk/iax2_analysis.h +++ b/ui/gtk/iax2_analysis.h @@ -38,7 +38,7 @@ #include <epan/packet_info.h> /** @file - * ??? + * ??? * @todo what's this? */ @@ -60,7 +60,7 @@ typedef struct _iax2_bw_history_item { guint32 bytes; } iax2_bw_history_item; -#define BUFF_BW 300 +#define BUFF_BW 300 typedef struct _tap_iax2_stat_t { gboolean first_packet; /* do not use in code that is called after rtp_packet_analyse */ diff --git a/ui/gtk/macros_dlg.c b/ui/gtk/macros_dlg.c index 41b1445946..082eff9224 100644 --- a/ui/gtk/macros_dlg.c +++ b/ui/gtk/macros_dlg.c @@ -5,17 +5,17 @@ * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> * Copyright 2001 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. diff --git a/ui/gtk/macros_dlg.h b/ui/gtk/macros_dlg.h index 1a4e50c4ed..36caffea2c 100644 --- a/ui/gtk/macros_dlg.h +++ b/ui/gtk/macros_dlg.h @@ -5,17 +5,17 @@ * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> * Copyright 2001 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. diff --git a/ui/gtk/main_menubar.c b/ui/gtk/main_menubar.c index 3d5f681001..cdd705e5d8 100644 --- a/ui/gtk/main_menubar.c +++ b/ui/gtk/main_menubar.c @@ -4227,7 +4227,7 @@ add_tap_plugins (guint merge_id, GtkUIManager *ui_manager) gchar *stat_name_buf; gchar *stat_name; gchar *sep; - + action_group = gtk_action_group_new ("tap-plugins-group"); submenu_statistics = gtk_ui_manager_get_widget(ui_manager_main_menubar, MENU_STATISTICS_PATH); @@ -4280,7 +4280,7 @@ add_tap_plugins (guint merge_id, GtkUIManager *ui_manager) stat_name= sep; } } - + action_name = g_strdup_printf("%s/%s", submenu_path, cfg->abbr); action = (GtkAction *)g_object_new (GTK_TYPE_ACTION, "name", action_name, @@ -5003,7 +5003,7 @@ set_menus_for_selected_packet(capture_file *cf) } else if (!strcmp(proto_name, "sctp")) { is_sctp = TRUE; } - + protos = wmem_list_frame_next(protos); } } diff --git a/ui/gtk/main_titlebar.h b/ui/gtk/main_titlebar.h index b7362c4929..b1ade8eb54 100644 --- a/ui/gtk/main_titlebar.h +++ b/ui/gtk/main_titlebar.h @@ -26,7 +26,7 @@ #define __MAIN_TITLEBAR_H__ /** Construct the main window's title with the current main_window_name optionally appended - * with the user-specified title and/or wireshark version. + * with the user-specified title and/or wireshark version. * Display the result in the main window's title bar and in its icon title */ extern void main_titlebar_update(void); diff --git a/ui/gtk/main_toolbar.c b/ui/gtk/main_toolbar.c index e629937c8e..a18f0af28b 100644 --- a/ui/gtk/main_toolbar.c +++ b/ui/gtk/main_toolbar.c @@ -77,7 +77,7 @@ static GtkToolItem *resize_columns_button; static GtkToolItem *color_display_button, *prefs_button, *help_button; /* - * Redraw all toolbars + * Redraw all toolbars */ void toolbar_redraw_all(void) diff --git a/ui/gtk/main_toolbar.h b/ui/gtk/main_toolbar.h index df8b188262..b32ea82c2a 100644 --- a/ui/gtk/main_toolbar.h +++ b/ui/gtk/main_toolbar.h @@ -35,8 +35,8 @@ /** Redraw the main toolbar. Used, when user changes preferences. */ void toolbar_redraw_all(void); -/** Set object data of some buttons (where needed). It's needed so callback - * functions can read back their required data. Acts like g_object_set_data() +/** Set object data of some buttons (where needed). It's needed so callback + * functions can read back their required data. Acts like g_object_set_data() * on multiple buttons. * * @param key the key diff --git a/ui/gtk/old-gtk-compat.h b/ui/gtk/old-gtk-compat.h index 770b2d7f1d..cc94c44056 100644 --- a/ui/gtk/old-gtk-compat.h +++ b/ui/gtk/old-gtk-compat.h @@ -1,4 +1,4 @@ -/* +/* * Definitions to provide some functions that are not present in older * GTK versions (down to 2.12.0) * diff --git a/ui/gtk/packet_win.c b/ui/gtk/packet_win.c index 5e78b9e65b..1aac3ba09d 100644 --- a/ui/gtk/packet_win.c +++ b/ui/gtk/packet_win.c @@ -919,7 +919,7 @@ void new_packet_window(GtkWidget *w _U_, gboolean reference, gboolean editable _ *bv_nb_ptr; struct PacketWinData *DataPtr; frame_data *fd; - + if(reference) { guint32 framenum; header_field_info *hfinfo; diff --git a/ui/gtk/pixmap_save.h b/ui/gtk/pixmap_save.h index 54ab558d98..9fcf1288bf 100644 --- a/ui/gtk/pixmap_save.h +++ b/ui/gtk/pixmap_save.h @@ -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. diff --git a/ui/gtk/prefs_dlg.c b/ui/gtk/prefs_dlg.c index c76f0670be..428f431abf 100644 --- a/ui/gtk/prefs_dlg.c +++ b/ui/gtk/prefs_dlg.c @@ -1419,15 +1419,15 @@ prefs_main_save(gpointer parent_w) const gchar *msg3 = "that version of Wireshark, "; const gchar *msg4 = "an older or nonstandard Wireshark version, "; const gchar *msg5 = "click 'Continue without Saving' and save this profile under a another name.\n"; - + if (prefs.saved_at_version) { gulong tot_msg_len = 246 + (gulong)strlen(prefs.saved_at_version) + 1; - + msg = (gchar *)g_malloc(tot_msg_len); g_snprintf(msg, tot_msg_len, "%s\"%s\". %s%s%s", msg1, prefs.saved_at_version, msg2, msg3, msg5); dialog = simple_dialog(ESD_TYPE_CONFIRMATION, ESD_BTNS_SAVE_DONTSAVE, "%s", msg); - } else { + } else { msg = (gchar *)g_malloc(214); g_snprintf(msg, 214, "%s%s%s", msg2, msg4, msg5); @@ -1436,7 +1436,7 @@ prefs_main_save(gpointer parent_w) simple_dialog_set_cb(dialog, overwrite_existing_prefs_cb, parent_w); g_free(msg); - + } else { prefs_main_write(); } diff --git a/ui/gtk/proto_dlg.c b/ui/gtk/proto_dlg.c index 304ffe844d..fd21fc492d 100644 --- a/ui/gtk/proto_dlg.c +++ b/ui/gtk/proto_dlg.c @@ -364,7 +364,7 @@ proto_cb(GtkWidget *w _U_, gpointer data _U_) GtkWidget *main_vb, *main_nb, *page_lb, *protocols_page; #if defined(HEUR_DISSECTOR_LIST) GtkWidget *heur_dissectors_page; -#endif +#endif if (proto_w != NULL) { reactivate_window(proto_w); return; diff --git a/ui/gtk/proto_dlg.h b/ui/gtk/proto_dlg.h index d9f7820953..76611c76db 100644 --- a/ui/gtk/proto_dlg.h +++ b/ui/gtk/proto_dlg.h @@ -33,14 +33,14 @@ */ /** Show the enabled protocols dialog. - * + * * @param widget parent widget (unused) * @param data unused */ void proto_cb(GtkWidget *widget, gpointer data); /** Disable (temporarily) the selected protocol. - * + * * @param widget parent widget (unused) * @param data unused */ diff --git a/ui/gtk/proto_hier_stats_dlg.h b/ui/gtk/proto_hier_stats_dlg.h index 258dc34885..84058141b7 100644 --- a/ui/gtk/proto_hier_stats_dlg.h +++ b/ui/gtk/proto_hier_stats_dlg.h @@ -30,7 +30,7 @@ */ /** Show protocol hierarchy statistics. - * + * * @param widget parent widget (unused) * @param data unused */ diff --git a/ui/gtk/proto_hier_tree_model.c b/ui/gtk/proto_hier_tree_model.c index fb71c34afd..17b7f404a1 100644 --- a/ui/gtk/proto_hier_tree_model.c +++ b/ui/gtk/proto_hier_tree_model.c @@ -320,7 +320,7 @@ proto_hier_tree_get_path(GtkTreeModel *tree_model, GtkTreeIter *iter) int p_id; void *cookie; - + g_return_val_if_fail(PROTOHIER_IS_TREE(tree_model), NULL); model = (ProtoHierTreeModel *) tree_model; @@ -438,7 +438,7 @@ proto_hier_tree_class_init(ProtoHierTreeModelClass *klass) object_class->finalize = _class_finalize; } -GType +GType proto_hier_tree_get_type(void) { static GType proto_hier_tree_type = 0; diff --git a/ui/gtk/proto_tree_model.c b/ui/gtk/proto_tree_model.c index e9348fbab7..b7d4db9484 100644 --- a/ui/gtk/proto_tree_model.c +++ b/ui/gtk/proto_tree_model.c @@ -159,7 +159,7 @@ fi_get_string(field_info *fi) if (!fi->rep) { label_ptr = label_str; proto_item_fill_label(fi, label_str); - } else + } else label_ptr = fi->rep->representation; if (FI_GET_FLAG(fi, FI_GENERATED)) { @@ -415,7 +415,7 @@ proto_tree_model_class_init(ProtoTreeModelClass *klass) object_class->finalize = _class_finalize; } -GType +GType proto_tree_model_get_type(void) { static GType proto_tree_type = 0; @@ -453,7 +453,7 @@ proto_tree_model_get_type(void) return proto_tree_type; } -void +void proto_tree_model_force_resolv(ProtoTreeModel *model, const e_addr_resolve *flags) { model->resolv_forced = TRUE; diff --git a/ui/gtk/sat.h b/ui/gtk/sat.h index e1fb4eb789..ac489b9986 100644 --- a/ui/gtk/sat.h +++ b/ui/gtk/sat.h @@ -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. diff --git a/ui/gtk/sctp_assoc_analyse.c b/ui/gtk/sctp_assoc_analyse.c index 72296813b1..d930384619 100644 --- a/ui/gtk/sctp_assoc_analyse.c +++ b/ui/gtk/sctp_assoc_analyse.c @@ -355,7 +355,7 @@ update_analyse_dlg(struct sctp_analyse *u_data) GtkListStore *list_store; store = (address *)(list->data); - if (store->type != AT_NONE) { + if (store->type != AT_NONE) { if (store->type == AT_IPv4) { g_snprintf(field[0], 30, "%s", ip_to_str((const guint8 *)(store->data))); diff --git a/ui/gtk/sctp_stat_gtk.h b/ui/gtk/sctp_stat_gtk.h index 517caae8d1..8cff204fd1 100644 --- a/ui/gtk/sctp_stat_gtk.h +++ b/ui/gtk/sctp_stat_gtk.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 2004-2013, Irene Ruengeler <i.ruengeler [AT] fh-muenster.de> * * $Id$ @@ -21,7 +21,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ - + #ifndef __SCTP_STAT_GTK_H__ #define __SCTP_STAT_GTK_H__ diff --git a/ui/gtk/service_response_time_table.h b/ui/gtk/service_response_time_table.h index f6505a6522..ae7e4d1924 100644 --- a/ui/gtk/service_response_time_table.h +++ b/ui/gtk/service_response_time_table.h @@ -8,17 +8,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. @@ -48,7 +48,7 @@ typedef struct _srt_stat_table { GtkWidget *scrolled_window; /**< window widget */ GtkTreeView *table; /**< Tree view */ GtkWidget *menu; /**< context menu */ - char *filter_string; /**< append procedure number (%d) to this string + char *filter_string; /**< append procedure number (%d) to this string to create a display filter */ int num_procs; /**< number of elements on procedures array */ srt_procedure_t *procedures;/**< the procedures array */ diff --git a/ui/gtk/smb2_stat.c b/ui/gtk/smb2_stat.c index 72a4e03e34..406d43c504 100644 --- a/ui/gtk/smb2_stat.c +++ b/ui/gtk/smb2_stat.c @@ -88,11 +88,11 @@ smb2stat_packet(void *pss, packet_info *pinfo, epan_dissect_t *edt _U_, const vo /* SMB2 SRT can be very inaccurate in the presence of retransmissions. Retransmitted responses * not only add additional (bogus) transactions but also the latency associated with them. * This can greatly inflate the maximum and average SRT stats especially in the case of - * retransmissions triggered by the expiry of the rexmit timer (RTOs). Only calculating SRT - * for the last received response accomplishes this goal without requiring the TCP pref + * retransmissions triggered by the expiry of the rexmit timer (RTOs). Only calculating SRT + * for the last received response accomplishes this goal without requiring the TCP pref * "Do not call subdissectors for error packets" to be set. */ if(si->saved->frame_req - && si->saved->frame_res==pinfo->fd->num) + && si->saved->frame_res==pinfo->fd->num) add_srt_table_data(&ss->smb2_srt_table, si->opcode, &si->saved->req_time, pinfo); else return 0; diff --git a/ui/gtk/stats_tree_stat.c b/ui/gtk/stats_tree_stat.c index 57495d9b0c..87ef8a7b8e 100644 --- a/ui/gtk/stats_tree_stat.c +++ b/ui/gtk/stats_tree_stat.c @@ -383,7 +383,7 @@ st_sort_func(GtkTreeModel *model, gint result; gtk_tree_sortable_get_sort_column_id (GTK_TREE_SORTABLE (user_data), &sort_column, &order); - + gtk_tree_model_get(model, a, NODEPTR_COLUMN, &node_a, -1); gtk_tree_model_get(model, b, NODEPTR_COLUMN, &node_b, -1); @@ -589,7 +589,7 @@ register_tap_listener_stats_tree_stat(void) void gtk_stats_tree_cb(GtkAction *action, gpointer user_data _U_) { - const gchar *action_name; + const gchar *action_name; gchar *abbr; stats_tree_cfg* cfg = NULL; diff --git a/ui/gtk/uat_gui.h b/ui/gtk/uat_gui.h index 9837d0e69d..f60a4e865f 100644 --- a/ui/gtk/uat_gui.h +++ b/ui/gtk/uat_gui.h @@ -5,23 +5,23 @@ * * User Accessible Tables GUI * Mantain an array of user accessible data strucures - * + * * (c) 2007, Luis E. Garcia Ontanon <luis@ontanon.org> * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> * Copyright 2001 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. diff --git a/ui/gtk/voip_calls.c b/ui/gtk/voip_calls.c index 448bfcec0d..acc7b44950 100644 --- a/ui/gtk/voip_calls.c +++ b/ui/gtk/voip_calls.c @@ -211,7 +211,7 @@ void voip_calls_reset(voip_calls_tapinfo_t *tapinfo) g_free(graph_item->comment); g_free((void *)graph_item->src_addr.data); g_free((void *)graph_item->dst_addr.data); - g_free(graph_item->time_str); + g_free(graph_item->time_str); g_free(list->data); list = g_list_next(list); } diff --git a/ui/gtk/voip_calls.h b/ui/gtk/voip_calls.h index 9ff41a2a0e..bfcd30f070 100644 --- a/ui/gtk/voip_calls.h +++ b/ui/gtk/voip_calls.h @@ -100,7 +100,7 @@ typedef struct _h245_address { typedef struct _h323_calls_info { e_guid_t *guid; /* Call ID to identify a H225 */ GList* h245_list; /**< list of H245 Address and ports for tunneling off calls*/ - address h225SetupAddr; /**< we use the SETUP H225 IP to determine if packets are forward or reverse */ + address h225SetupAddr; /**< we use the SETUP H225 IP to determine if packets are forward or reverse */ gboolean is_h245; gboolean is_faststart_Setup; /**< if faststart field is included in Setup*/ gboolean is_faststart_Proc; /**< if faststart field is included in Proce, Alerting, Progress or Connect*/ @@ -149,7 +149,7 @@ typedef struct _voip_calls_info { gchar *call_comment; guint16 call_num; /**> The frame_data struct holds the frame number and timing information needed. */ - frame_data *start_fd; + frame_data *start_fd; nstime_t start_rel_ts; frame_data *stop_fd; nstime_t stop_rel_ts; @@ -157,7 +157,7 @@ typedef struct _voip_calls_info { } voip_calls_info_t; -/** +/** * structure that holds the information about all detected calls */ /* struct holding all information of the tap */ @@ -174,7 +174,7 @@ typedef struct _voip_calls_tapinfo { seq_analysis_info_t* graph_analysis; gboolean reversed; gboolean redraw; - /* + /* * Now add dummy variables, one for each tap listener. * Their address will be used to distinguish between them. */ diff --git a/ui/gtk/voip_calls_dlg.h b/ui/gtk/voip_calls_dlg.h index bccfcb8195..794e48d1f2 100644 --- a/ui/gtk/voip_calls_dlg.h +++ b/ui/gtk/voip_calls_dlg.h @@ -9,7 +9,7 @@ * based on h323_conversations_dlg.h * Copyright 2004, Iskratel, Ltd, Kranj * By Miha Jemec <m.jemec@iskratel.si> - * + * * H323, RTP and Graph Support * By Alejandro Vaquero, alejandro.vaquero@verso.com * Copyright 2005, Verso Technologies Inc. diff --git a/ui/iface_lists.c b/ui/iface_lists.c index caccbfb419..a55318cf5f 100644 --- a/ui/iface_lists.c +++ b/ui/iface_lists.c @@ -360,8 +360,8 @@ scan_local_interfaces(void (*update_cb)(void)) } /* - * Get the global interface list. Generate it if we haven't done so - * already. This can be quite time consuming the first time, so + * Get the global interface list. Generate it if we haven't done so + * already. This can be quite time consuming the first time, so * record how long it takes in the info log. */ void @@ -375,7 +375,7 @@ fill_in_local_interfaces(void(*update_cb)(void)) /* record the time we started, so we can log total time later */ g_get_current_time(&start_time); g_log(LOG_DOMAIN_MAIN, G_LOG_LEVEL_INFO, "fill_in_local_interfaces() starts"); - + if (!initialized) { /* do the actual work */ scan_local_interfaces(update_cb); diff --git a/ui/preference_utils.c b/ui/preference_utils.c index 602412b5ff..5100c00ccb 100644 --- a/ui/preference_utils.c +++ b/ui/preference_utils.c @@ -317,7 +317,7 @@ column_prefs_remove_link(GList *col_link) fmt_data *cfmt; if (!col_link || !col_link->data) return; - + cfmt = (fmt_data *) col_link->data; g_free(cfmt->title); diff --git a/ui/qt/accordion_frame.h b/ui/qt/accordion_frame.h index a4d5a87e55..699e0151fb 100644 --- a/ui/qt/accordion_frame.h +++ b/ui/qt/accordion_frame.h @@ -36,7 +36,7 @@ public: void animatedHide(); signals: - + public slots: private: @@ -45,7 +45,7 @@ private: private slots: void animationFinished(); - + }; #endif // ACCORDION_FRAME_H diff --git a/ui/qt/capture_preferences_frame.h b/ui/qt/capture_preferences_frame.h index 670253a850..6905959629 100644 --- a/ui/qt/capture_preferences_frame.h +++ b/ui/qt/capture_preferences_frame.h @@ -35,11 +35,11 @@ class CapturePreferencesFrame; class CapturePreferencesFrame : public QFrame { Q_OBJECT - + public: explicit CapturePreferencesFrame(QWidget *parent = 0); ~CapturePreferencesFrame(); - + protected: void showEvent(QShowEvent *evt); diff --git a/ui/qt/column_preferences_frame.h b/ui/qt/column_preferences_frame.h index 24d1e4e16c..ae0c09136c 100644 --- a/ui/qt/column_preferences_frame.h +++ b/ui/qt/column_preferences_frame.h @@ -35,13 +35,13 @@ class ColumnPreferencesFrame; class ColumnPreferencesFrame : public QFrame { Q_OBJECT - + public: explicit ColumnPreferencesFrame(QWidget *parent = 0); ~ColumnPreferencesFrame(); void unstash(); - + protected: void keyPressEvent(QKeyEvent *evt); diff --git a/ui/qt/elided_label.h b/ui/qt/elided_label.h index 9821586323..3455f8719c 100644 --- a/ui/qt/elided_label.h +++ b/ui/qt/elided_label.h @@ -43,7 +43,7 @@ private: void updateText(); signals: - + public slots: void clear(); void setText(const QString &text); diff --git a/ui/qt/export_dissection_dialog.h b/ui/qt/export_dissection_dialog.h index 3dc2cfb1be..f67afece40 100644 --- a/ui/qt/export_dissection_dialog.h +++ b/ui/qt/export_dissection_dialog.h @@ -44,11 +44,11 @@ class ExportDissectionDialog : public QFileDialog { Q_OBJECT - + public: explicit ExportDissectionDialog(QWidget *parent, capture_file *cap_file, export_type_e export_type); ~ExportDissectionDialog(); - + public slots: int exec(); diff --git a/ui/qt/export_object_dialog.h b/ui/qt/export_object_dialog.h index 7c5ce0ac68..992ed6815d 100644 --- a/ui/qt/export_object_dialog.h +++ b/ui/qt/export_object_dialog.h @@ -55,7 +55,7 @@ struct _export_object_list_t { class ExportObjectDialog : public QDialog { Q_OBJECT - + public: enum ObjectType { Dicom, Http, Smb }; diff --git a/ui/qt/filter_expressions_preferences_frame.h b/ui/qt/filter_expressions_preferences_frame.h index 90ee5a38aa..19482980f5 100644 --- a/ui/qt/filter_expressions_preferences_frame.h +++ b/ui/qt/filter_expressions_preferences_frame.h @@ -35,7 +35,7 @@ class FilterExpressionsPreferencesFrame; class FilterExpressionsPreferencesFrame : public QFrame { Q_OBJECT - + public: explicit FilterExpressionsPreferencesFrame(QWidget *parent = 0); ~FilterExpressionsPreferencesFrame(); diff --git a/ui/qt/font_color_preferences_frame.h b/ui/qt/font_color_preferences_frame.h index f7630a0e5a..e533ebef9b 100644 --- a/ui/qt/font_color_preferences_frame.h +++ b/ui/qt/font_color_preferences_frame.h @@ -36,11 +36,11 @@ class FontColorPreferencesFrame; class FontColorPreferencesFrame : public QFrame { Q_OBJECT - + public: explicit FontColorPreferencesFrame(QWidget *parent = 0); ~FontColorPreferencesFrame(); - + protected: void showEvent(QShowEvent *evt); diff --git a/ui/qt/import_text_dialog.h b/ui/qt/import_text_dialog.h index 6abb68a9a6..abe0b25565 100644 --- a/ui/qt/import_text_dialog.h +++ b/ui/qt/import_text_dialog.h @@ -45,12 +45,12 @@ class ImportTextDialog; class ImportTextDialog : public QDialog { Q_OBJECT - + public: explicit ImportTextDialog(QWidget *parent = 0); ~ImportTextDialog(); QString &capfileName(); - + private: void convertTextFile(); void enableHeaderWidgets(bool enable_buttons = true); diff --git a/ui/qt/main_window_preferences_frame.h b/ui/qt/main_window_preferences_frame.h index b94bf05359..50d9885e58 100644 --- a/ui/qt/main_window_preferences_frame.h +++ b/ui/qt/main_window_preferences_frame.h @@ -35,11 +35,11 @@ class MainWindowPreferencesFrame; class MainWindowPreferencesFrame : public QFrame { Q_OBJECT - + public: explicit MainWindowPreferencesFrame(QWidget *parent = 0); ~MainWindowPreferencesFrame(); - + protected: void showEvent(QShowEvent *evt); diff --git a/ui/qt/packet_comment_dialog.h b/ui/qt/packet_comment_dialog.h index 2822841e0b..ecd679ba2e 100644 --- a/ui/qt/packet_comment_dialog.h +++ b/ui/qt/packet_comment_dialog.h @@ -33,12 +33,12 @@ class PacketCommentDialog; class PacketCommentDialog : public QDialog { Q_OBJECT - + public: explicit PacketCommentDialog(QWidget *parent = 0, QString comment = QString()); ~PacketCommentDialog(); QString text(); - + private slots: void on_buttonBox_helpRequested(); diff --git a/ui/qt/packet_format_group_box.h b/ui/qt/packet_format_group_box.h index f16e7f23ab..2371050bb1 100644 --- a/ui/qt/packet_format_group_box.h +++ b/ui/qt/packet_format_group_box.h @@ -34,7 +34,7 @@ class PacketFormatGroupBox; class PacketFormatGroupBox : public QGroupBox { Q_OBJECT - + public: explicit PacketFormatGroupBox(QWidget *parent = 0); ~PacketFormatGroupBox(); diff --git a/ui/qt/packet_range_group_box.h b/ui/qt/packet_range_group_box.h index 371d63dca2..f633dcfc6b 100644 --- a/ui/qt/packet_range_group_box.h +++ b/ui/qt/packet_range_group_box.h @@ -40,7 +40,7 @@ class PacketRangeGroupBox; class PacketRangeGroupBox : public QGroupBox { Q_OBJECT - + public: explicit PacketRangeGroupBox(QWidget *parent = 0); ~PacketRangeGroupBox(); diff --git a/ui/qt/preferences_dialog.h b/ui/qt/preferences_dialog.h index fe4db669b7..97b7e246d3 100644 --- a/ui/qt/preferences_dialog.h +++ b/ui/qt/preferences_dialog.h @@ -46,7 +46,7 @@ class PreferencesDialog; class PreferencesDialog : public QDialog { Q_OBJECT - + public: explicit PreferencesDialog(QWidget *parent = 0); ~PreferencesDialog(); diff --git a/ui/qt/print_dialog.h b/ui/qt/print_dialog.h index 0f4591f0d0..b6aa9d68c2 100644 --- a/ui/qt/print_dialog.h +++ b/ui/qt/print_dialog.h @@ -42,7 +42,7 @@ class PrintDialog; class PrintDialog : public QDialog { Q_OBJECT - + public: explicit PrintDialog(QWidget *parent = 0, capture_file *cf = NULL); ~PrintDialog(); diff --git a/ui/qt/profile_dialog.h b/ui/qt/profile_dialog.h index 5325df303c..cd79d0c236 100644 --- a/ui/qt/profile_dialog.h +++ b/ui/qt/profile_dialog.h @@ -35,7 +35,7 @@ class ProfileDialog; class ProfileDialog : public QDialog { Q_OBJECT - + public: enum ProfileAction { ShowProfiles, NewProfile, EditCurrentProfile, DeleteCurrentProfile }; diff --git a/ui/qt/search_frame.h b/ui/qt/search_frame.h index 576beb5e1b..e7e5ce985e 100644 --- a/ui/qt/search_frame.h +++ b/ui/qt/search_frame.h @@ -37,7 +37,7 @@ class SearchFrame; class SearchFrame : public AccordionFrame { Q_OBJECT - + public: explicit SearchFrame(QWidget *parent = 0); ~SearchFrame(); @@ -48,7 +48,7 @@ public: public slots: void setCaptureFile(capture_file *cf); void findFrameWithFilter(QString &filter); - + signals: void pushFilterSyntaxStatus(QString&); diff --git a/ui/qt/sequence_dialog.h b/ui/qt/sequence_dialog.h index 1daaaa0e96..5b392b2358 100644 --- a/ui/qt/sequence_dialog.h +++ b/ui/qt/sequence_dialog.h @@ -44,13 +44,13 @@ class SequenceDialog; class SequenceDialog : public QDialog { Q_OBJECT - + public: enum SequenceType { any, tcp, voip }; explicit SequenceDialog(QWidget *parent = 0, capture_file *cf = NULL, SequenceType type = any); ~SequenceDialog(); - + signals: void goToPacket(int packet_num); diff --git a/ui/qt/splash_overlay.h b/ui/qt/splash_overlay.h index 5c55b9e8d8..77ae8e6fd0 100644 --- a/ui/qt/splash_overlay.h +++ b/ui/qt/splash_overlay.h @@ -42,11 +42,11 @@ class SplashOverlay; class SplashOverlay : public QWidget { Q_OBJECT - + public: explicit SplashOverlay(QWidget *parent = 0); ~SplashOverlay(); - + protected: void paintEvent(QPaintEvent *event); diff --git a/ui/qt/summary_dialog.h b/ui/qt/summary_dialog.h index be58d53fb1..cf97dc008c 100644 --- a/ui/qt/summary_dialog.h +++ b/ui/qt/summary_dialog.h @@ -58,7 +58,7 @@ class SummaryDialog; class SummaryDialog : public QDialog { Q_OBJECT - + public: explicit SummaryDialog(QWidget *parent = 0); ~SummaryDialog(); @@ -79,7 +79,7 @@ protected slots: void CopyComment(); void on_tabWidget_currentChanged(int index); - + private: Ui::SummaryDialog *ui; diff --git a/ui/qt/syntax_line_edit.h b/ui/qt/syntax_line_edit.h index 73a096c261..138ac93d4e 100644 --- a/ui/qt/syntax_line_edit.h +++ b/ui/qt/syntax_line_edit.h @@ -45,7 +45,7 @@ private: QString state_style_sheet_; signals: - + public slots: void setStyleSheet(const QString &style_sheet); }; diff --git a/ui/qt/time_shift_dialog.h b/ui/qt/time_shift_dialog.h index d150cbfce9..0759c84cf8 100644 --- a/ui/qt/time_shift_dialog.h +++ b/ui/qt/time_shift_dialog.h @@ -42,7 +42,7 @@ class TimeShiftDialog; class TimeShiftDialog : public QDialog { Q_OBJECT - + public: explicit TimeShiftDialog(QWidget *parent = 0, capture_file *cf = NULL); ~TimeShiftDialog(); diff --git a/ui/qt/uat_dialog.h b/ui/qt/uat_dialog.h index a777230bf9..c81aa8f1d5 100644 --- a/ui/qt/uat_dialog.h +++ b/ui/qt/uat_dialog.h @@ -45,13 +45,13 @@ class UatDialog; class UatDialog : public QDialog { Q_OBJECT - + public: explicit UatDialog(QWidget *parent = 0, uat_t *uat = NULL); ~UatDialog(); void setUat(uat_t *uat = NULL); - + protected: void keyPressEvent(QKeyEvent *evt); diff --git a/ui/rtp_analysis.h b/ui/rtp_analysis.h index 2eb495c96b..f142be87a4 100644 --- a/ui/rtp_analysis.h +++ b/ui/rtp_analysis.h @@ -37,7 +37,7 @@ #include <epan/packet_info.h> /** @file - * ??? + * ??? * @todo what's this? */ @@ -61,7 +61,7 @@ typedef struct _bw_history_item { guint32 bytes; } bw_history_item; -#define BUFF_BW 300 +#define BUFF_BW 300 typedef struct _tap_rtp_stat_t { gboolean first_packet; /**< do not use in code that is called after rtp_packet_analyse */ diff --git a/ui/tap-sctp-analysis.c b/ui/tap-sctp-analysis.c index 362eb07a70..a413fbbaac 100644 --- a/ui/tap-sctp-analysis.c +++ b/ui/tap-sctp-analysis.c @@ -465,7 +465,7 @@ packet(void *tapdata _U_, packet_info *pinfo , epan_dissect_t *edt _U_ , const v info->sort_tsn2 = g_ptr_array_new(); info->sort_sack1 = g_ptr_array_new(); info->sort_sack2 = g_ptr_array_new(); - + for (i=0; i < NUM_CHUNKS; i++) { info->chunk_count[i] = 0; diff --git a/ui/tap-sctp-analysis.h b/ui/tap-sctp-analysis.h index ad985ee7a2..3b93acf084 100644 --- a/ui/tap-sctp-analysis.h +++ b/ui/tap-sctp-analysis.h @@ -27,7 +27,7 @@ #ifdef __cplusplus extern "C" { -#endif /* __cplusplus */ +#endif /* __cplusplus */ #include <epan/dissectors/packet-sctp.h> #include <epan/address.h> diff --git a/ui/tap-sequence-analysis.c b/ui/tap-sequence-analysis.c index 600c60766f..a84f610094 100644 --- a/ui/tap-sequence-analysis.c +++ b/ui/tap-sequence-analysis.c @@ -4,7 +4,7 @@ * $Id$ * * Some code from from gtk/flow_graph.c - * + * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs diff --git a/ui/tap-sequence-analysis.h b/ui/tap-sequence-analysis.h index f48bfbbba7..c97784510a 100644 --- a/ui/tap-sequence-analysis.h +++ b/ui/tap-sequence-analysis.h @@ -4,7 +4,7 @@ * $Id$ * * Copied from gtk/graph_analysis.h - * + * * Copyright 2004, Verso Technologies Inc. * By Alejandro Vaquero <alejandrovaquero@yahoo.com> * diff --git a/ui/tap-tcp-stream.c b/ui/tap-tcp-stream.c index 958480884b..4b2d253b95 100644 --- a/ui/tap-tcp-stream.c +++ b/ui/tap-tcp-stream.c @@ -297,7 +297,7 @@ select_tcpip_session(capture_file *cf, struct segment *hdrs) if (!cf || !hdrs) return NULL; - + fdata = cf->current_frame; /* no real filter yet */ @@ -37,7 +37,7 @@ char *get_args_as_string(int argc, char **argv, int optindex); /* Compute the difference between two seconds/microseconds time stamps. * Beware: we're using nanosecond resolution now and function is currently unused */ -void compute_timestamp_diff(gint *diffsec, gint *diffusec, +void compute_timestamp_diff(gint *diffsec, gint *diffusec, guint32 sec1, guint32 usec1, guint32 sec2, guint32 usec2); /* Try to figure out if we're remotely connected, e.g. via ssh or diff --git a/ui/win32/file_dlg_win32.c b/ui/win32/file_dlg_win32.c index d6bc34825c..b7c9c993de 100644 --- a/ui/win32/file_dlg_win32.c +++ b/ui/win32/file_dlg_win32.c @@ -1779,13 +1779,13 @@ save_as_statstree_hook_proc(HWND sf_hwnd, UINT msg, WPARAM w_param, LPARAM l_par case WM_INITDIALOG: g_sf_hwnd = sf_hwnd; break; - + case WM_COMMAND: break; - + case WM_NOTIFY: break; - + default: break; } diff --git a/wiretap/btsnoop.c b/wiretap/btsnoop.c index 3c67f84198..a3026517b2 100644 --- a/wiretap/btsnoop.c +++ b/wiretap/btsnoop.c @@ -336,7 +336,7 @@ static gboolean btsnoop_dump_h1(wtap_dumper *wdh, /* * Don't write out anything bigger than we can read. * (This will also fail on a caplen of 0, as it should.) - */ + */ if (phdr->caplen-1 > WTAP_MAX_PACKET_SIZE) { *err = WTAP_ERR_PACKET_TOO_LARGE; return FALSE; diff --git a/wiretap/file_access.c b/wiretap/file_access.c index 97b9c7f5f6..df32f1cee9 100644 --- a/wiretap/file_access.c +++ b/wiretap/file_access.c @@ -506,7 +506,7 @@ static char *get_file_extension(const char *pathname) extensionp = g_strdup(extensionp); g_strfreev(components); return extensionp; -} +} static gboolean heuristic_uses_extension(unsigned int i, const char *extension) { diff --git a/wiretap/mpeg.c b/wiretap/mpeg.c index dcccd6ade1..326bf98630 100644 --- a/wiretap/mpeg.c +++ b/wiretap/mpeg.c @@ -222,7 +222,7 @@ mpeg_read_packet(wtap *wth, FILE_T fh, struct wtap_pkthdr *phdr, Buffer *buf, return TRUE; } -static gboolean +static gboolean mpeg_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset) { *data_offset = file_tell(wth->fh); diff --git a/wiretap/vwr.c b/wiretap/vwr.c index fde668f997..932acf7023 100644 --- a/wiretap/vwr.c +++ b/wiretap/vwr.c @@ -814,7 +814,7 @@ static int vwr_get_fpga_version(wtap *wth, int *err, gchar **err_info) guint16 data_length = 0; guint16 fpga_version; int valid_but_empty_file = -1; - + filePos = file_tell(wth->fh); if (filePos == -1) { *err = file_error(wth->fh, err_info); diff --git a/wiretap/wtap.c b/wiretap/wtap.c index 28bba7a79c..c7f344e6b0 100644 --- a/wiretap/wtap.c +++ b/wiretap/wtap.c @@ -690,8 +690,8 @@ static struct encap_type_info encap_table_base[] = { /* WTAP_ENCAP_STANAG_4607 */ { "STANAG 4607", "s4607" }, - /* WTAP_ENCAP_STANAG_5066_D_PDU */ - { "STANAG 5066 Data Transfer Sublayer PDUs(D_PDU)", "s5066-dpdu"}, + /* WTAP_ENCAP_STANAG_5066_D_PDU */ + { "STANAG 5066 Data Transfer Sublayer PDUs(D_PDU)", "s5066-dpdu"}, /* WTAP_ENCAP_NETLINK */ { "Netlink", "Linux netlink" }, diff --git a/wsutil/base64.c b/wsutil/base64.c index 2211cff522..5f3b57c953 100644 --- a/wsutil/base64.c +++ b/wsutil/base64.c @@ -59,7 +59,7 @@ size_t ws_base64_decode_inplace(char *s) } i++; } - s++; + s++; } d[i*3/4] = 0; diff --git a/wsutil/bits_count_ones.h b/wsutil/bits_count_ones.h index 82f88bc43c..3d88d52fa9 100644 --- a/wsutil/bits_count_ones.h +++ b/wsutil/bits_count_ones.h @@ -31,9 +31,9 @@ #include <glib.h> /* - * The variable-precision SWAR algorithm is an interesting way to count - * the number of bits set in an integer. While its performance is very - * good (two times faster than gcc's __builtin_popcount [1] and + * The variable-precision SWAR algorithm is an interesting way to count + * the number of bits set in an integer. While its performance is very + * good (two times faster than gcc's __builtin_popcount [1] and * 16 instructions when compiled with gcc -O3) * http://playingwithpointers.com/swar.html */ diff --git a/wsutil/crc10.c b/wsutil/crc10.c index 7a4b1c4c5f..37fb8e3a6c 100644 --- a/wsutil/crc10.c +++ b/wsutil/crc10.c @@ -4,7 +4,7 @@ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> - * Copyright 1998 Gerald Combs + * 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 @@ -77,7 +77,7 @@ guint16 update_crc10_by_bytes(guint16 crc10, const guint8 *data_blk_ptr, { register int i; guint16 crc10_accum = 0; - + for (i = 0; i < data_blk_size; i++) { crc10_accum = ((crc10_accum << 8) & 0x3ff) ^ byte_crc10_table[( crc10_accum >> 2) & 0xff] @@ -89,7 +89,7 @@ guint16 update_crc10_by_bytes(guint16 crc10, const guint8 *data_blk_ptr, crc10_accum = ((crc10_accum << 8) & 0x3ff) ^ byte_crc10_table[( crc10_accum >> 2) & 0xff] ^ ((crc10<<6) & 0xFF); - + return crc10_accum; } diff --git a/wsutil/crc10.h b/wsutil/crc10.h index 41ea0feded..2ee98853ee 100644 --- a/wsutil/crc10.h +++ b/wsutil/crc10.h @@ -5,7 +5,7 @@ * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> - * Copyright 1998 Gerald Combs + * 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 diff --git a/wsutil/crc7.c b/wsutil/crc7.c index cf4d99d0ba..92010a3f1f 100644 --- a/wsutil/crc7.c +++ b/wsutil/crc7.c @@ -1,6 +1,6 @@ /** * crc7.c - * + * * $Id$ * * Functions and types for CRC checks. diff --git a/wsutil/crc7.h b/wsutil/crc7.h index 2afc9fb109..44d748efea 100644 --- a/wsutil/crc7.h +++ b/wsutil/crc7.h @@ -1,6 +1,6 @@ /* * crc7.h - * + * * $Id$ * * Functions and types for CRC checks. diff --git a/wsutil/crcdrm.c b/wsutil/crcdrm.c index 8299a155a2..b9e37f6abb 100644 --- a/wsutil/crcdrm.c +++ b/wsutil/crcdrm.c @@ -1,6 +1,6 @@ /* crcdrm.c * another CRC 16 - * Copyright 2006, British Broadcasting Corporation + * Copyright 2006, British Broadcasting Corporation * * $Id$ * diff --git a/wsutil/crcdrm.h b/wsutil/crcdrm.h index 30e336f5a2..694aa6c4d6 100644 --- a/wsutil/crcdrm.h +++ b/wsutil/crcdrm.h @@ -1,23 +1,23 @@ /* crcdrm.h * another CRC 16 - * Copyright 2006, British Broadcasting Corporation + * Copyright 2006, British Broadcasting Corporation * * $Id$ * * 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. diff --git a/wsutil/g711.h b/wsutil/g711.h index 8dc7d206ef..8482775ca0 100644 --- a/wsutil/g711.h +++ b/wsutil/g711.h @@ -1,4 +1,4 @@ -/* +/* * g711.h * * Definitions for routines for u-law, A-law and linear PCM conversions diff --git a/wsutil/plugins.c b/wsutil/plugins.c index ebd337ca43..269913bab2 100644 --- a/wsutil/plugins.c +++ b/wsutil/plugins.c @@ -95,7 +95,7 @@ add_plugin_type(const char *type, plugin_callback callback) report_failure("At most 32 plugin types can be supported, so the plugin type '%s' won't be supported.", type); return; - } + } new_type = (plugin_type *)g_malloc(sizeof (plugin_type)); new_type->type = type; new_type->callback = callback; @@ -368,7 +368,7 @@ plugins_get_descriptions(plugin_description_callback callback, void *user_data) info.pt_plug = info.pt_plug->next) { info.sep = ""; - info.types = g_string_new(""); + info.types = g_string_new(""); /* * Build a list of all the plugin types. diff --git a/wsutil/report_err.c b/wsutil/report_err.c index e470af903c..2e003df277 100644 --- a/wsutil/report_err.c +++ b/wsutil/report_err.c @@ -58,7 +58,7 @@ void report_failure(const char *msg_format, ...) { va_list ap; - + va_start(ap, msg_format); (*report_failure_func)(msg_format, ap); va_end(ap); diff --git a/wsutil/type_util.c b/wsutil/type_util.c index 00318b7860..d0a20b4db2 100644 --- a/wsutil/type_util.c +++ b/wsutil/type_util.c @@ -38,7 +38,7 @@ * gstutils.h: Header for various utility functions * * GNU GPL v2 - * + * */ /* work around error C2520: conversion from unsigned __int64 to double diff --git a/wsutil/wsgcrypt.h b/wsutil/wsgcrypt.h index 06c9d4b583..0f1f2b022b 100644 --- a/wsutil/wsgcrypt.h +++ b/wsutil/wsgcrypt.h @@ -10,17 +10,17 @@ * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> * Copyright 2007 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. |