aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJörg Mayer <jmayer@loplof.de>2003-12-21 04:31:58 +0000
committerJörg Mayer <jmayer@loplof.de>2003-12-21 04:31:58 +0000
commit3f020f582ecb5c6e6994a6ad896f41043f100536 (patch)
treeca7ac06e027a07c1eec24d79d0f34c6d9faa623d
parent951b5352476bc57ca122fac571e2f489e3f1ada5 (diff)
Compiling with -pedantic:
warning: comma at end of enumerator list svn path=/trunk/; revision=9383
-rw-r--r--gtk/supported_protos_dlg.c2
-rw-r--r--packet-ansi_a.c4
-rw-r--r--packet-fcip.c8
-rw-r--r--packet-giop.c6
-rw-r--r--packet-gsm_a.c6
-rw-r--r--packet-lmp.c6
-rw-r--r--packet-mip.c6
-rw-r--r--packet-ospf.c4
-rw-r--r--packet-smb-pipe.c4
-rw-r--r--packet-tacacs.h4
-rw-r--r--packet-tcap.h4
-rw-r--r--packet-wsp.c10
-rw-r--r--text2pcap.c4
13 files changed, 34 insertions, 34 deletions
diff --git a/gtk/supported_protos_dlg.c b/gtk/supported_protos_dlg.c
index 4f382e72d3..d5afe09d47 100644
--- a/gtk/supported_protos_dlg.c
+++ b/gtk/supported_protos_dlg.c
@@ -54,7 +54,7 @@ static const char *dfilter_supported =
typedef enum {
PROTOCOL_SUPPORTED,
- DFILTER_SUPPORTED,
+ DFILTER_SUPPORTED
} supported_type_t;
static void supported_close_cb(GtkWidget *w, gpointer data);
diff --git a/packet-ansi_a.c b/packet-ansi_a.c
index 2d411c1c13..d87f9723bf 100644
--- a/packet-ansi_a.c
+++ b/packet-ansi_a.c
@@ -10,7 +10,7 @@
* 2000 Access Network Interfaces
* 3GPP2 A.S0001-1 TIA/EIA-2001
*
- * $Id: packet-ansi_a.c,v 1.14 2003/12/12 19:55:26 guy Exp $
+ * $Id: packet-ansi_a.c,v 1.15 2003/12/21 04:31:56 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -5892,7 +5892,7 @@ typedef enum
ANSI_A_E_XMODE, /* Transcoder Mode */
ANSI_A_E_UZ_ID, /* User Zone ID */
ANSI_A_E_VP_REQ, /* Voice Privacy Request */
- ANSI_A_E_NONE, /* NONE */
+ ANSI_A_E_NONE /* NONE */
}
elem_idx_t;
diff --git a/packet-fcip.c b/packet-fcip.c
index 4650fb1c67..92cdaab748 100644
--- a/packet-fcip.c
+++ b/packet-fcip.c
@@ -2,7 +2,7 @@
* Routines for FCIP dissection
* Copyright 2001, Dinesh G Dutt (ddutt@cisco.com)
*
- * $Id: packet-fcip.c,v 1.10 2003/12/04 05:38:05 gram Exp $
+ * $Id: packet-fcip.c,v 1.11 2003/12/21 04:31:56 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -58,7 +58,7 @@ typedef enum {
FCIP_EOFni = 0x49,
FCIP_EOFdti = 0x4E,
FCIP_EOFrti = 0x4F,
- FCIP_EOFa = 0x50,
+ FCIP_EOFa = 0x50
} fcip_eof_t;
typedef enum {
@@ -69,12 +69,12 @@ typedef enum {
FCIP_SOFn4 = 0x31,
FCIP_SOFn2 = 0x35,
FCIP_SOFn3 = 0x36,
- FCIP_SOFc4 = 0x39,
+ FCIP_SOFc4 = 0x39
} fcip_sof_t;
typedef enum {
FCENCAP_PROTO_FCIP = 1,
- FCENCAP_PROTO_iFCP = 2,
+ FCENCAP_PROTO_iFCP = 2
} fcencap_proto_t;
static const value_string fcip_eof_vals[] = {
diff --git a/packet-giop.c b/packet-giop.c
index 4bee597d4d..534be6a720 100644
--- a/packet-giop.c
+++ b/packet-giop.c
@@ -9,7 +9,7 @@
* Frank Singleton <frank.singleton@ericsson.com>
* Trevor Shepherd <eustrsd@am1.ericsson.se>
*
- * $Id: packet-giop.c,v 1.74 2003/11/26 02:58:12 guy Exp $
+ * $Id: packet-giop.c,v 1.75 2003/12/21 04:31:56 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -727,7 +727,7 @@ enum giop_op_val {
request_resolve_op_val, /* REQUEST (resolve) to get RepoID etc*/
request_bind_new_context_op_val, /* bind_new_context */
request_bind_op_val, /* bind */
- request_get_INIT_op_val, /* finding Nameserver */
+ request_get_INIT_op_val /* finding Nameserver */
};
@@ -745,7 +745,7 @@ enum giop_op_val {
enum ior_src {
req_res = 0, /* REQUEST (resolve) */
- file, /* stringified IOR' in a file */
+ file /* stringified IOR' in a file */
};
diff --git a/packet-gsm_a.c b/packet-gsm_a.c
index 342ea852d9..2480269d0a 100644
--- a/packet-gsm_a.c
+++ b/packet-gsm_a.c
@@ -38,7 +38,7 @@
* Formats and coding
* (3GPP TS 24.080 version 4.3.0 Release 4)
*
- * $Id: packet-gsm_a.c,v 1.9 2003/12/17 23:35:28 ulfl Exp $
+ * $Id: packet-gsm_a.c,v 1.10 2003/12/21 04:31:56 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -1022,7 +1022,7 @@ typedef enum
BE_RET_ERR_REQ, /* Return Error Request */
BE_RET_ERR_CAUSE, /* Return Error Cause */
BE_SEG, /* Segmentation */
- BE_NONE, /* NONE */
+ BE_NONE /* NONE */
}
bssmap_elem_idx_t;
@@ -2736,7 +2736,7 @@ typedef enum
DE_RAD_PRIO, /* Radio Priority */
DE_GPRS_TIMER, /* GPRS Timer */
DE_GPRS_TIMER_2, /* GPRS Timer 2 */
- DE_NONE, /* NONE */
+ DE_NONE /* NONE */
}
dtap_elem_idx_t;
diff --git a/packet-lmp.c b/packet-lmp.c
index eacaa4655f..dad1a5b24f 100644
--- a/packet-lmp.c
+++ b/packet-lmp.c
@@ -3,7 +3,7 @@
*
* (c) Copyright Ashok Narayanan <ashokn@cisco.com>
*
- * $Id: packet-lmp.c,v 1.17 2003/10/23 18:49:49 ashokn Exp $
+ * $Id: packet-lmp.c,v 1.18 2003/12/21 04:31:56 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -95,7 +95,7 @@ typedef enum {
LMP_MSG_CHANNEL_STATUS,
LMP_MSG_CHANNEL_STATUS_ACK,
LMP_MSG_CHANNEL_STATUS_REQ,
- LMP_MSG_CHANNEL_STATUS_RESP,
+ LMP_MSG_CHANNEL_STATUS_RESP
} lmp_message_types;
static value_string message_type_vals[] = {
@@ -390,7 +390,7 @@ enum lmp_filter_keys {
LMPF_VAL_SVCCFG_TRANSP_TCM,
LMPF_VAL_SVCCFG_DIVERSITY_DIVERSITY,
- LMPF_MAX,
+ LMPF_MAX
};
static int lmp_filter[LMPF_MAX];
diff --git a/packet-mip.c b/packet-mip.c
index c649df1021..e82154f5f7 100644
--- a/packet-mip.c
+++ b/packet-mip.c
@@ -2,7 +2,7 @@
* Routines for Mobile IP dissection
* Copyright 2000, Stefan Raab <sraab@cisco.com>
*
- * $Id: packet-mip.c,v 1.33 2002/08/28 21:00:20 jmayer Exp $
+ * $Id: packet-mip.c,v 1.34 2003/12/21 04:31:56 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -131,8 +131,8 @@ typedef enum {
CVSE_EXT = 38, /* RFC 3115 */
MN_NAI_EXT = 131,
MF_CHALLENGE_EXT = 132, /* RFC 3012 */
- OLD_NVSE_EXT = 133,/* RFC 3115 */
- NVSE_EXT = 134, /* RFC 3115 */
+ OLD_NVSE_EXT = 133, /* RFC 3115 */
+ NVSE_EXT = 134 /* RFC 3115 */
} MIP_EXTS;
static const value_string mip_ext_types[]= {
{MH_AUTH_EXT, "Mobile-Home Authentication Extension"},
diff --git a/packet-ospf.c b/packet-ospf.c
index 210c0ebdce..e931c88d1f 100644
--- a/packet-ospf.c
+++ b/packet-ospf.c
@@ -2,7 +2,7 @@
* Routines for OSPF packet disassembly
* (c) Copyright Hannes R. Boehm <hannes@boehm.org>
*
- * $Id: packet-ospf.c,v 1.77 2003/10/24 22:59:37 guy Exp $
+ * $Id: packet-ospf.c,v 1.78 2003/12/21 04:31:56 jmayer Exp $
*
* At this time, this module is able to analyze OSPF
* packets as specified in RFC2328. MOSPF (RFC1584) and other
@@ -912,7 +912,7 @@ enum {
MPLS_LINK_REMOTE_ID,
MPLS_LINK_PROTECTION = 14,
MPLS_LINK_IF_SWITCHING_DESC,
- MPLS_LINK_SHARED_RISK_GROUP,
+ MPLS_LINK_SHARED_RISK_GROUP
};
static const value_string mpls_link_stlv_str[] = {
diff --git a/packet-smb-pipe.c b/packet-smb-pipe.c
index 6a5f365d82..9e61db2c17 100644
--- a/packet-smb-pipe.c
+++ b/packet-smb-pipe.c
@@ -8,7 +8,7 @@ XXX Fixme : shouldnt show [malformed frame] for long packets
* significant rewrite to tvbuffify the dissector, Ronnie Sahlberg and
* Guy Harris 2001
*
- * $Id: packet-smb-pipe.c,v 1.98 2003/12/17 23:35:29 ulfl Exp $
+ * $Id: packet-smb-pipe.c,v 1.99 2003/12/21 04:31:56 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -722,7 +722,7 @@ typedef enum {
PARAM_WORD, /* 'W' or 'h' - 16-bit word */
PARAM_DWORD, /* 'D' or 'i' - 32-bit word */
PARAM_BYTES, /* 'B' or 'b' or 'g' or 'O' - one or more bytes */
- PARAM_STRINGZ, /* 'z' or 'O' - null-terminated string */
+ PARAM_STRINGZ /* 'z' or 'O' - null-terminated string */
} param_type_t;
/*
diff --git a/packet-tacacs.h b/packet-tacacs.h
index 9f4b8c6120..85e0d232d9 100644
--- a/packet-tacacs.h
+++ b/packet-tacacs.h
@@ -2,7 +2,7 @@
* Routines for cisco tacplus packet dissection
* Copyright 2000, Emanuele Caratti <wiz@iol.it>
*
- * $Id: packet-tacacs.h,v 1.5 2003/10/19 17:30:43 guy Exp $
+ * $Id: packet-tacacs.h,v 1.6 2003/12/21 04:31:57 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -63,7 +63,7 @@ enum
TAC_PLUS_PRIV_LVL_MAX = 0x0f,
TAC_PLUS_PRIV_LVL_ROOT = 0x0f,
TAC_PLUS_PRIV_LVL_USER = 0x01,
- TAC_PLUS_PRIV_LVL_MIN = 0x00,
+ TAC_PLUS_PRIV_LVL_MIN = 0x00
};
/* authen types */
diff --git a/packet-tcap.h b/packet-tcap.h
index 86ccd76ab7..fff574daeb 100644
--- a/packet-tcap.h
+++ b/packet-tcap.h
@@ -1,6 +1,6 @@
/* packet-tcap.h
*
- * $Id: packet-tcap.h,v 1.1 2003/10/02 06:13:28 guy Exp $
+ * $Id: packet-tcap.h,v 1.2 2003/12/21 04:31:57 jmayer Exp $
*
* Copyright 2003, Michael Lum <mlum [AT] telostech.com>,
* In association with Telos Technology Inc.
@@ -28,7 +28,7 @@
typedef enum {
ITU_TCAP_STANDARD = 1,
- ANSI_TCAP_STANDARD = 2,
+ ANSI_TCAP_STANDARD = 2
} Tcap_Standard_Type;
extern Tcap_Standard_Type tcap_standard;
diff --git a/packet-wsp.c b/packet-wsp.c
index 3430fdba34..6d059a185c 100644
--- a/packet-wsp.c
+++ b/packet-wsp.c
@@ -2,7 +2,7 @@
*
* Routines to dissect WSP component of WAP traffic.
*
- * $Id: packet-wsp.c,v 1.98 2003/12/19 20:16:04 obiot Exp $
+ * $Id: packet-wsp.c,v 1.99 2003/12/21 04:31:57 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -1178,23 +1178,23 @@ static const value_string vals_false_true[] = {
enum {
WSP_PDU_RESERVED = 0x00,
WSP_PDU_CONNECT = 0x01,
- WSP_PDU_CONNECTREPLY = 0x02,
+ WSP_PDU_CONNECTREPLY = 0x02,
WSP_PDU_REDIRECT = 0x03, /* No sample data */
WSP_PDU_REPLY = 0x04,
WSP_PDU_DISCONNECT = 0x05,
WSP_PDU_PUSH = 0x06, /* No sample data */
- WSP_PDU_CONFIRMEDPUSH = 0x07, /* No sample data */
+ WSP_PDU_CONFIRMEDPUSH = 0x07, /* No sample data */
WSP_PDU_SUSPEND = 0x08, /* No sample data */
WSP_PDU_RESUME = 0x09, /* No sample data */
- WSP_PDU_GET = 0x40,
+ WSP_PDU_GET = 0x40,
WSP_PDU_OPTIONS = 0x41, /* No sample data */
WSP_PDU_HEAD = 0x42, /* No sample data */
WSP_PDU_DELETE = 0x43, /* No sample data */
WSP_PDU_TRACE = 0x44, /* No sample data */
WSP_PDU_POST = 0x60,
- WSP_PDU_PUT = 0x61, /* No sample data */
+ WSP_PDU_PUT = 0x61 /* No sample data */
};
diff --git a/text2pcap.c b/text2pcap.c
index e30e8fcdf8..14deeccd85 100644
--- a/text2pcap.c
+++ b/text2pcap.c
@@ -6,7 +6,7 @@
*
* (c) Copyright 2001 Ashok Narayanan <ashokn@cisco.com>
*
- * $Id: text2pcap.c,v 1.26 2003/04/27 00:41:50 guy Exp $
+ * $Id: text2pcap.c,v 1.27 2003/12/21 04:31:57 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -195,7 +195,7 @@ typedef enum {
START_OF_LINE, /* Starting from beginning of line */
READ_OFFSET, /* Just read the offset */
READ_BYTE, /* Just read a byte */
- READ_TEXT, /* Just read text - ignore until EOL */
+ READ_TEXT /* Just read text - ignore until EOL */
} parser_state_t;
static parser_state_t state = INIT;