Replace tabs in files with editor modeline "expandtab"
authorBill Meier <wmeier@newsguy.com>
Thu, 11 Jun 2015 01:59:31 +0000 (21:59 -0400)
committerBill Meier <wmeier@newsguy.com>
Thu, 11 Jun 2015 02:15:35 +0000 (02:15 +0000)
Change-Id: I4667fd4091c510a4c798f79dae333a07dc42dad6
Reviewed-on: https://code.wireshark.org/review/8880
Reviewed-by: Bill Meier <wmeier@newsguy.com>
13 files changed:
epan/dissectors/packet-capwap.c
epan/dissectors/packet-fcdns.c
epan/dissectors/packet-gsm_a_common.h
epan/dissectors/packet-gsm_a_dtap.c
epan/dissectors/packet-iana-oui.h
epan/dissectors/packet-pim.c
epan/ftypes/ftype-guid.c
epan/ftypes/ftype-pcre.c
ui/gtk/gui_utils.c
ui/gtk/supported_protos_dlg.c
wiretap/json.h
wiretap/pcapng.c
wsutil/nstime.c

index 1355d580e4e6b0106144295571847e00081ea289..6b67dff9e71b1cea9dfe6c95d3c928dd674133ac 100644 (file)
@@ -1901,7 +1901,7 @@ dissect_capwap_message_element_vendor_fortinet_type(tvbuff_t *tvb, proto_tree *s
 #define VSP_CISCO_RAD                       3
 #define VSP_CISCO_RAD_SLOT                  4
 #define VSP_CISCO_RAD_NAME                  5
-#define        VSP_CISCO_MWAR                      6
+#define VSP_CISCO_MWAR                      6
 #define VSP_CISCO_ADD_WLAN                  7
 #define VSP_CISCO_WTP_RADIO_CFG             8
 
index b5f319f5143e9fe185eeb06995633d27be15a0e7..02d8e4ad34b686b1f0adeed999e21005242a49d4 100644 (file)
@@ -446,7 +446,7 @@ dissect_fc4features (proto_tree *parent_tree, tvbuff_t *tvb, int offset)
     };
 
     proto_tree_add_bitmask(parent_tree, tvb, offset, hfi_fcdns_fc4features_i.id,
-                      ett_fc4features, flags, ENC_NA);
+                           ett_fc4features, flags, ENC_NA);
 }
 
 
index 40ec72562b31080fc08229e81af05fd020bc9419..1cdea3e3514bf4e1c7e92096e7de73029311dd53 100644 (file)
@@ -1109,7 +1109,7 @@ typedef enum
     DE_BCC_CAUSE,                       /* Cause */
     DE_BCC_ORIG_IND,                    /* Originator indication */
     DE_BCC_STATE_ATTR,                  /* State attributes */
-    DE_BCC_COMPR_OTDI,                                 /* Compressed otdi */
+    DE_BCC_COMPR_OTDI,                  /* Compressed otdi */
     DE_NONE                             /* NONE */
 }
 dtap_elem_idx_t;
index 2fa89d0a26cdbb7fef65575d0727fe8a803b7805..7256c5fc908faa06d173901dbf4bb69300e62c51 100644 (file)
@@ -144,16 +144,16 @@ const value_string gsm_a_dtap_msg_gcc_strings[] = {
 };
 
 const value_string gsm_a_dtap_msg_bcc_strings[] = {
-    { 0x31,    "Immediate Setup" },
-    { 0x32,    "Setup" },
-    { 0x33,    "Connect" },
-    { 0x34,    "Termination" },
-    { 0x35,    "Termination Request" },
-    { 0x36,    "Termination Reject" },
-    { 0x38,    "Status" },
-    { 0x39,    "Get Status" },
-    { 0x3A,    "Set Parameter" },
-    { 0x3B,    "Immediate Setup 2" },
+    { 0x31, "Immediate Setup" },
+    { 0x32, "Setup" },
+    { 0x33, "Connect" },
+    { 0x34, "Termination" },
+    { 0x35, "Termination Request" },
+    { 0x36, "Termination Reject" },
+    { 0x38, "Status" },
+    { 0x39, "Get Status" },
+    { 0x3A, "Set Parameter" },
+    { 0x3B, "Immediate Setup 2" },
     { 0, NULL }
 };
 
@@ -453,7 +453,7 @@ static const true_false_string tfs_acceptable_not_acceptable = { "Acceptable", "
 
 #define DTAP_MM_IEI_MASK    0x3f
 #define DTAP_GCC_IEI_MASK   0x3f
-#define        DTAP_BCC_IEI_MASK   0x3f
+#define DTAP_BCC_IEI_MASK   0x3f
 #define DTAP_CC_IEI_MASK    0x3f
 #define DTAP_SMS_IEI_MASK   0xff
 #define DTAP_SS_IEI_MASK    0x3f
index cb8913ede7676ab7197839d8ba86556f3af49827..66bbcc93d293477638c865b460f14682a86c857c 100644 (file)
@@ -2,7 +2,7 @@
  * SNAP PIDs for the IANA's OUI 00:00:5e
  * See
  *
- *     http://www.iana.org/assignments/ethernet-numbers
+ *     http://www.iana.org/assignments/ethernet-numbers
  *
  * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@wireshark.org>
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define IANA_PID_MARS_DATA_SHORT       0x0001  /* RFC 2022 */
-#define IANA_PID_NHRP_RESERVED         0x0002  /* RFC 2332 */
-#define IANA_PID_MARS_NHRP_CONTROL     0x0003  /* RFC 2022, RFC 2332 */
-#define IANA_PID_MARS_DATA_LONG                0x0004  /* RFC 2022 */
-#define IANA_PID_SCSP                  0x0005  /* RFC 2334 */
-#define IANA_PID_VRID                  0x0006
-#define IANA_PID_L2TP                  0x0007  /* RFC 3070 */
-#define IANA_PID_VPN_ID                        0x0008  /* RFC 2684 */
-#define IANA_PID_MSDP_GRE_PROTO_TYPE   0x0009
+#define IANA_PID_MARS_DATA_SHORT        0x0001  /* RFC 2022 */
+#define IANA_PID_NHRP_RESERVED          0x0002  /* RFC 2332 */
+#define IANA_PID_MARS_NHRP_CONTROL      0x0003  /* RFC 2022, RFC 2332 */
+#define IANA_PID_MARS_DATA_LONG         0x0004  /* RFC 2022 */
+#define IANA_PID_SCSP                   0x0005  /* RFC 2334 */
+#define IANA_PID_VRID                   0x0006
+#define IANA_PID_L2TP                   0x0007  /* RFC 3070 */
+#define IANA_PID_VPN_ID                 0x0008  /* RFC 2684 */
+#define IANA_PID_MSDP_GRE_PROTO_TYPE    0x0009
 
 /*
  * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
index a4607a30b3b72e593fe54743880ea09df8b02649..f77af445ceba55c586ef4ab30e48d8e5b4094940 100644 (file)
@@ -34,8 +34,8 @@
 void proto_register_pim(void);
 void proto_reg_handoff_pim(void);
 
-#define PIM_TYPE(x)     ((x) & 0x0f)
-#define PIM_VER(x)      (((x) & 0xf0) >> 4)
+#define PIM_TYPE(x)             ((x) & 0x0f)
+#define PIM_VER(x)              (((x) & 0xf0) >> 4)
 #define PIM_BIDIR_SUBTYPE(x)    ((x) & 0x0f)
 #define PIM_BIDIR_RSVD(x)       (((x) & 0xf0) >> 4)
 
@@ -225,7 +225,7 @@ static gboolean use_main_tree  = TRUE;
 /*
  * The Story About Ping^WPIM:
  *
- *     http://www.cs.usc.edu/assets/003/83187.pdf
+ *   http://www.cs.usc.edu/assets/003/83187.pdf
  *
  * dated January 11, 1995, entitled "Protocol Independent Multicast (PIM):
  * Protocol Specification", calls itself draft-ietf-idmr-pim-spec-01,
@@ -233,18 +233,18 @@ static gboolean use_main_tree  = TRUE;
  * that runs atop IGMP, with a type of 4 for "Router PIM Messages", and
  * a PIM version number field of 1.
  *
- *     https://tools.ietf.org/html/draft-ietf-idmr-pim-sm-spec-00
+ *   https://tools.ietf.org/html/draft-ietf-idmr-pim-sm-spec-00
  *
  * dated September 7, 1995, and
  *
- *     http://tools.ietf.org/html/draft-ietf-idmr-pim-spec-02
+ *   http://tools.ietf.org/html/draft-ietf-idmr-pim-spec-02
  *
  * dated September 7, 1995, both entitled "Protocol Independent Multicast-
  * Sparse Mode (PIM-SM): Protocol Specification", describe a protocol that
  * runs atop IGMP, with a type of 4 for "Router PIM Messages", and a PIM
  * version number field of 2.
  *
- *     https://tools.ietf.org/html/draft-ietf-idmr-pim-sm-spec-03
+ *   https://tools.ietf.org/html/draft-ietf-idmr-pim-sm-spec-03
  *
  * dated June 6, 1996, and all subsequent drafts, and RFC 2117, dated
  * June 1997, all entitled "Protocol Independent Multicast-Sparse Mode
@@ -262,7 +262,7 @@ static gboolean use_main_tree  = TRUE;
  *
  * Looking at the Dense Mode specs,
  *
- *     http://tools.ietf.org/html/draft-ietf-idmr-pim-dm-spec-02
+ *   http://tools.ietf.org/html/draft-ietf-idmr-pim-dm-spec-02
  *
  * entitled "Protocol Independent Multicast-Dense Mode (PIM-DM): Protocol
  * Specification", dated September 1995, describes a protocol that runs
index c1f2f20c42545109b7b1fde8233a320ac9341677..1b88b70c131dcdf5189cffeb95aeb7d5da24993d 100644 (file)
@@ -153,8 +153,8 @@ ftype_register_guid(void)
         value_get,           /* get_value */
         NULL,                /* get_value_uinteger */
         NULL,                /* get_value_sinteger */
-        NULL,               /* get_value_uinteger64 */
-        NULL,               /* get_value_sinteger64 */
+        NULL,                /* get_value_uinteger64 */
+        NULL,                /* get_value_sinteger64 */
         NULL,                /* get_value_floating */
 
         cmp_eq,
index 0f4b02fb04373237c38edc773c6eae50978f69e7..959215ac08976b89e6d6ff7b902b43d96ee99c3a 100644 (file)
@@ -152,10 +152,10 @@ void
 ftype_register_pcre(void)
 {
     static ftype_t pcre_type = {
-        FT_PCRE,        /* ftype */
-        "FT_PCRE",      /* name */
+        FT_PCRE,            /* ftype */
+        "FT_PCRE",          /* name */
         "Compiled Perl-Compatible Regular Expression (GRegex) object", /* pretty_name */
-        0,          /* wire_size */
+        0,                  /* wire_size */
         gregex_fvalue_new,  /* new_value */
         gregex_fvalue_free, /* free_value */
         val_from_unparsed,  /* val_from_unparsed */
@@ -178,8 +178,8 @@ ftype_register_pcre(void)
         gregex_fvalue_get,  /* get_value */
         NULL,               /* get_value_uinteger */
         NULL,               /* get_value_sinteger */
-       NULL,               /* get_value_uinteger64 */
-       NULL,               /* get_value_sinteger64 */
+        NULL,               /* get_value_uinteger64 */
+        NULL,               /* get_value_sinteger64 */
         NULL,               /* get_value_floating */
 
         NULL,               /* cmp_eq */
index 1e4ad67f09c13d8d576a762261ecec67f9ef0866..c85d347825a34eb5a43dade6b62003e87018bd4c 100644 (file)
@@ -693,7 +693,7 @@ pipe_input_cb(GIOChannel   *source _U_,
 void
 pipe_input_set_handler(gint             source,
                        gpointer         user_data,
-                      ws_process_id   *child_process,
+                       ws_process_id   *child_process,
                        pipe_input_cb_t  input_cb)
 {
     static pipe_input_t pipe_input;
index 11e60244feb02bf8b4c96360cdc6e8ce8fdc1b5d..6fd5b79756e7bddca331b65c319e4581b302b67e 100644 (file)
@@ -237,7 +237,7 @@ static void set_supported_text(GtkWidget *w, supported_type_t type)
       /* the name used for sorting in the left column */
       len = g_snprintf(buffer, BUFF_LEN, "%*s %*s %*s\n",
                        -short_namel,  short_name,
-                       -namel,   name,
+                       -namel, name,
                        -filter_namel, filter_name);
       insert_text(w, buffer, len);
     }
index 8c233cb771c0fad4dd13ff5add62f88deb3d9094..704e155eee2e7adce9c6372da508158dd9da26ac 100644 (file)
@@ -35,7 +35,7 @@
  *
  * For now, go for 50MB.
  */
-#define MAX_FILE_SIZE  (50*1024*1024)
+#define MAX_FILE_SIZE  (50*1024*1024)
 
 wtap_open_return_val json_open(wtap *wth, int *err, gchar **err_info);
 
index aaec91345a7fb33d687d0c6ac3983d98cbd898bf..a18d50de05a3452eff4e2d649994de99849699ae 100644 (file)
@@ -2001,7 +2001,7 @@ pcapng_read_interface_statistics_block(FILE_T fh, pcapng_block_header_t *bh, pca
 
                     /*  Don't cast a guint8 * into a guint32 *--the
                      *  guint8 * may not point to something that's
-                    *  aligned correctly.
+                     *  aligned correctly.
                      */
                     memcpy(&high, option_content, sizeof(guint32));
                     memcpy(&low, option_content + sizeof(guint32), sizeof(guint32));
index f2450489f2f055c101d772630221cd206580ea0e..e9ad23c28935d06cb8da3cd8b955f3feeac70a59 100644 (file)
@@ -220,7 +220,7 @@ double nstime_to_sec(const nstime_t *nstime)
 
 #ifndef TIME_T_MIN
 #define TIME_T_MIN ((time_t) ((time_t)0 < (time_t) -1 ? (time_t) 0 \
-                   : ~ (time_t) 0 << (sizeof (time_t) * CHAR_BIT - 1)))
+                    : ~ (time_t) 0 << (sizeof (time_t) * CHAR_BIT - 1)))
 #endif
 #ifndef TIME_T_MAX
 #define TIME_T_MAX ((time_t) (~ (time_t) 0 - TIME_T_MIN))