summaryrefslogtreecommitdiff
path: root/asn1/ftam
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2005-06-26 10:59:15 +0000
committerAnders Broman <anders.broman@ericsson.com>2005-06-26 10:59:15 +0000
commitcc862131a239684c2cfc513dd84b28f2706a4f00 (patch)
treea4dfc4fce569eda6838bf545b0ee18f4e539e885 /asn1/ftam
parenta96c3b0f73fecce6d62a94b781550f918df835c8 (diff)
downloadwireshark-cc862131a239684c2cfc513dd84b28f2706a4f00.tar.gz
Fix a compiler warning and set eol-style.
svn path=/trunk/; revision=14773
Diffstat (limited to 'asn1/ftam')
-rwxr-xr-xasn1/ftam/ftam.cnf2
-rwxr-xr-xasn1/ftam/packet-ftam-template.c4
-rwxr-xr-xasn1/ftam/packet-ftam-template.h2
3 files changed, 5 insertions, 3 deletions
diff --git a/asn1/ftam/ftam.cnf b/asn1/ftam/ftam.cnf
index 0f51f30c6f..c968aa4f3a 100755
--- a/asn1/ftam/ftam.cnf
+++ b/asn1/ftam/ftam.cnf
@@ -1,7 +1,7 @@
# FTAM.cnf
# FTAM conformation file
-# $Id: FTAM.cnf 12417 2004-10-27 20:34:21Z guy $
+# $Id$
#.MODULE_IMPORT
ACSE-1 acse
diff --git a/asn1/ftam/packet-ftam-template.c b/asn1/ftam/packet-ftam-template.c
index 91831dcf25..3703daeae9 100755
--- a/asn1/ftam/packet-ftam-template.c
+++ b/asn1/ftam/packet-ftam-template.c
@@ -7,7 +7,7 @@
*
* Anders Broman and Ronnie Sahlberg 2005
*
- * $Id: packet-ftam-template.c 13967 2005-03-29 14:56:09Z gerald $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -51,6 +51,8 @@
int proto_ftam = -1;
static char object_identifier_id[MAX_OID_STR_LEN];
+/* Declare the function to avoid a compiler warning */
+static int dissect_ftam_OR_Set(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_);
#include "packet-ftam-hf.c"
diff --git a/asn1/ftam/packet-ftam-template.h b/asn1/ftam/packet-ftam-template.h
index d68b62cff6..69a0ebd74d 100755
--- a/asn1/ftam/packet-ftam-template.h
+++ b/asn1/ftam/packet-ftam-template.h
@@ -7,7 +7,7 @@
*
* Anders Broman and Ronnie Sahlberg 2005
*
- * $Id: $
+ * $Id$
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>