Skip to content

Commit

Permalink
Replace tabs by spaces when editor modelines has "expandtab"
Browse files Browse the repository at this point in the history
Change-Id: If7a6f2697be732ae4f94ed8b845fd293c32510f7
Also: tabs-stops should be 8
Reviewed-on: https://code.wireshark.org/review/7100
Reviewed-by: Bill Meier <wmeier@newsguy.com>
  • Loading branch information
Bill Meier committed Feb 13, 2015
1 parent 936f685 commit 9c866ff
Show file tree
Hide file tree
Showing 36 changed files with 4,703 additions and 4,703 deletions.
2 changes: 1 addition & 1 deletion asn1/rtse/packet-rtse-template.c
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ call_rtse_external_type_callback(gboolean implicit_tag _U_, tvbuff_t *tvb, int o
}

if (oid)
offset = call_rtse_oid_callback(oid, tvb, offset, actx->pinfo, top_tree ? top_tree : tree, actx->private_data);
offset = call_rtse_oid_callback(oid, tvb, offset, actx->pinfo, top_tree ? top_tree : tree, actx->private_data);

return offset;
}
Expand Down
8 changes: 4 additions & 4 deletions epan/address_types.c
Original file line number Diff line number Diff line change
Expand Up @@ -791,10 +791,10 @@ void address_types_initialize(void)
}

/* Given an address type id, return an address_type_t* */
#define ADDR_TYPE_LOOKUP(addr_type, result) \
/* Check input */ \
g_assert(addr_type < MAX_ADDR_TYPE_VALUE); \
result = type_list[addr_type];
#define ADDR_TYPE_LOOKUP(addr_type, result) \
/* Check input */ \
g_assert(addr_type < MAX_ADDR_TYPE_VALUE); \
result = type_list[addr_type];

static int address_type_get_length(const address* addr)
{
Expand Down
4 changes: 2 additions & 2 deletions epan/conversation_table.c
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ set_conv_gui_data(gpointer data, gpointer user_data)
g_string_append(conv_cmd_str, proto_get_protocol_filter_name(table->proto_id));
cmd_string_list_ = g_list_append(cmd_string_list_, conv_cmd_str->str);
ui_info.group = REGISTER_STAT_GROUP_CONVERSATION_LIST;
ui_info.title = NULL; /* construct this from the protocol info? */
ui_info.title = NULL; /* construct this from the protocol info? */
ui_info.cli_string = g_string_free(conv_cmd_str, FALSE);
ui_info.tap_init_cb = dissector_conversation_init;
ui_info.index = -1;
Expand All @@ -191,7 +191,7 @@ set_host_gui_data(gpointer data, gpointer user_data)

g_string_printf(host_cmd_str, "%s,%s", HOSTLIST_TAP_PREFIX, proto_get_protocol_filter_name(table->proto_id));
ui_info.group = REGISTER_STAT_GROUP_ENDPOINT_LIST;
ui_info.title = NULL; /* construct this from the protocol info? */
ui_info.title = NULL; /* construct this from the protocol info? */
ui_info.cli_string = g_string_free(host_cmd_str, FALSE);
ui_info.tap_init_cb = dissector_hostlist_init;
ui_info.index = -1;
Expand Down
4 changes: 2 additions & 2 deletions epan/dissectors/packet-3g-a11.c
Original file line number Diff line number Diff line change
Expand Up @@ -1585,7 +1585,7 @@ dissect_a11( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_

/* flags */
proto_tree_add_bitmask(a11_tree, tvb, offset, hf_a11_flags,
ett_a11_flags, a11_flags, ENC_NA);
ett_a11_flags, a11_flags, ENC_NA);
offset += 1;

/* lifetime */
Expand Down Expand Up @@ -1905,7 +1905,7 @@ dissect_a11( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_

/* flags */
proto_tree_add_bitmask(a11_tree, tvb, offset, hf_a11_flags,
ett_a11_flags, a11_flags, ENC_NA);
ett_a11_flags, a11_flags, ENC_NA);
offset += 1;

/* lifetime */
Expand Down
10 changes: 5 additions & 5 deletions epan/dissectors/packet-ansi_683.c
Original file line number Diff line number Diff line change
Expand Up @@ -1123,11 +1123,11 @@ msg_download_req(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, guint len,
* 4.5.1.3
*/
static const value_string akey_protocol_revision_vals[] = {
{ 0x02, "2G A-key generation" },
{ 0x03, "2G A-key and 3G Root Key generation" },
{ 0x04, "3G Root Key generation" },
{ 0x05, "Enhanced 3G Root Key generation" },
{ 0, NULL },
{ 0x02, "2G A-key generation" },
{ 0x03, "2G A-key and 3G Root Key generation" },
{ 0x04, "3G Root Key generation" },
{ 0x05, "Enhanced 3G Root Key generation" },
{ 0, NULL },
};

static void
Expand Down
2 changes: 1 addition & 1 deletion epan/dissectors/packet-assa_r3.c
Original file line number Diff line number Diff line change
Expand Up @@ -6040,7 +6040,7 @@ dissect_r3_cmd_clearnvram (tvbuff_t *tvb, guint32 start_offset, guint32 length _
proto_tree_add_item (tree, hf_r3_commandlength, tvb, start_offset + 0, 1, ENC_LITTLE_ENDIAN);
proto_tree_add_item (tree, hf_r3_command, tvb, start_offset + 1, 1, ENC_LITTLE_ENDIAN);
proto_tree_add_bitmask(tree, tvb, start_offset + 2, hf_r3_nvramclearoptions,
ett_r3clearnvram, r3_nvramclearoptions, ENC_LITTLE_ENDIAN);
ett_r3clearnvram, r3_nvramclearoptions, ENC_LITTLE_ENDIAN);
}

static void
Expand Down
18 changes: 9 additions & 9 deletions epan/dissectors/packet-dtn.c
Original file line number Diff line number Diff line change
Expand Up @@ -1072,13 +1072,13 @@ dissect_payload_header(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, int
/* This is really a SDNV but there are only 7 bits defined so leave it this way*/

if (version == 4) {
static const gint *flags[] = {
&hf_bundle_payload_flags_replicate_hdr,
&hf_bundle_payload_flags_xmit_report,
&hf_bundle_payload_flags_discard_on_fail,
&hf_bundle_payload_flags_last_header,
NULL
};
static const gint *flags[] = {
&hf_bundle_payload_flags_replicate_hdr,
&hf_bundle_payload_flags_xmit_report,
&hf_bundle_payload_flags_discard_on_fail,
&hf_bundle_payload_flags_last_header,
NULL
};
guint8 procflags;

procflags = tvb_get_guint8(tvb, offset);
Expand All @@ -1088,8 +1088,8 @@ dissect_payload_header(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, int
else {
*lastheader = FALSE;
}
proto_tree_add_bitmask(payload_tree, tvb, offset, hf_bundle_payload_flags,
ett_payload_flags, flags, ENC_BIG_ENDIAN);
proto_tree_add_bitmask(payload_tree, tvb, offset, hf_bundle_payload_flags,
ett_payload_flags, flags, ENC_BIG_ENDIAN);
++offset;
}
else { /*Bundle Protocol Version 5*/
Expand Down
8 changes: 4 additions & 4 deletions epan/dissectors/packet-e212.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@
extern value_string_ext E212_codes_ext;

typedef enum {
E212_NONE,
E212_LAI,
E212_RAI,
E212_SAI
E212_NONE,
E212_LAI,
E212_RAI,
E212_SAI
} e212_number_type_t;

gchar* dissect_e212_mcc_mnc_wmem_packet_str(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, e212_number_type_t number_type, gboolean little_endian);
Expand Down
12 changes: 6 additions & 6 deletions epan/dissectors/packet-gsm_a_dtap.c
Original file line number Diff line number Diff line change
Expand Up @@ -1100,8 +1100,8 @@ de_emerg_num_list(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 o
item = proto_tree_add_string(subtree, hf_gsm_a_dtap_emergency_bcd_num, tvb, curr_offset, en_len, digit_str);

/* Check for overdicadic digits, we used the standard digit map from tvbuff.c
* 0 1 2 3 4 5 6 7 8 9 a b c d e f
* '0','1','2','3','4','5','6','7','8','9','?','?','?','?','?','?'
* 0 1 2 3 4 5 6 7 8 9 a b c d e f
* '0','1','2','3','4','5','6','7','8','9','?','?','?','?','?','?'
*
*/
if(strchr(digit_str,'?')){
Expand Down Expand Up @@ -2171,10 +2171,10 @@ de_bcd_num(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset,
a_bigbuf);

/* Check for overdicadic digits, we used the standard digit map from tvbuff.c
* 0 1 2 3 4 5 6 7 8 9 a b c d e f
* '0','1','2','3','4','5','6','7','8','9','?','?','?','?','?','?'
*
*/
* 0 1 2 3 4 5 6 7 8 9 a b c d e f
* '0','1','2','3','4','5','6','7','8','9','?','?','?','?','?','?'
*
*/
if(strchr(digit_str,'?')){
expert_add_info(pinfo, item, &ei_gsm_a_dtap_end_mark_unexpected);
}
Expand Down
Loading

0 comments on commit 9c866ff

Please sign in to comment.