diff options
author | Jörg Mayer <jmayer@loplof.de> | 2013-09-15 15:00:03 +0000 |
---|---|---|
committer | Jörg Mayer <jmayer@loplof.de> | 2013-09-15 15:00:03 +0000 |
commit | c5ffff76d87088bd66834af0ce8f2694d53fd54b (patch) | |
tree | 11f6eb0a9f43bcbb8f9964bb4d2bc39e35d20b71 /asn1/atn-ulcs | |
parent | 05ba7d3afcd5b010f1f324f8e8ced78d01dd4180 (diff) |
Fix checkapi warnings (missing id)
Replace Makefile.{am,nmake,common} that did not conform by
their asn1/c133/ version.
svn path=/trunk/; revision=52062
Diffstat (limited to 'asn1/atn-ulcs')
-rw-r--r-- | asn1/atn-ulcs/Makefile.am | 25 | ||||
-rw-r--r-- | asn1/atn-ulcs/Makefile.common | 30 | ||||
-rw-r--r-- | asn1/atn-ulcs/Makefile.nmake | 23 | ||||
-rw-r--r-- | asn1/atn-ulcs/atn-ulcs.cnf | 13 |
4 files changed, 73 insertions, 18 deletions
diff --git a/asn1/atn-ulcs/Makefile.am b/asn1/atn-ulcs/Makefile.am index 4347512508..d357a4d4df 100644 --- a/asn1/atn-ulcs/Makefile.am +++ b/asn1/atn-ulcs/Makefile.am @@ -1,9 +1,24 @@ -# Makefile.am -# ASN.1-based plugin atn-pres -# presentation layer for the Aereonautical Telecommunications Network (ATN) -# -# (c) 2012 Mathias Guettler guettler@web.de +# $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. + include ../Makefile.preinc include Makefile.common diff --git a/asn1/atn-ulcs/Makefile.common b/asn1/atn-ulcs/Makefile.common index 91a5c092fa..ed11207140 100644 --- a/asn1/atn-ulcs/Makefile.common +++ b/asn1/atn-ulcs/Makefile.common @@ -1,14 +1,30 @@ -# Makefile.common -# ASN.1-based plugin atn-pres -# presentation layer for the Aereonautical Telecommunications Network (ATN) -# -# (c) 2012 Mathias Guettler guettler@web.de +# $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. + + PROTOCOL_NAME = atn-ulcs EXT_ASN_FILE_LIST = -ASN_FILE_LIST = $(PROTOCOL_NAME).asn +ASN_FILE_LIST = $(PROTOCOL_NAME).asn EXTRA_DIST = \ Makefile.nmake \ @@ -22,7 +38,7 @@ SRC_FILES = \ $(EXT_ASN_FILE_LIST) # default behavoiur ASN1 PER encoding -A2W_FLAGS= -u -L +A2W_FLAGS= -u -L EXTRA_CNF= diff --git a/asn1/atn-ulcs/Makefile.nmake b/asn1/atn-ulcs/Makefile.nmake index 78b3419d2b..25f75f5105 100644 --- a/asn1/atn-ulcs/Makefile.nmake +++ b/asn1/atn-ulcs/Makefile.nmake @@ -1,3 +1,26 @@ +## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake +# +# $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. + include ../../config.nmake include ../Makefile.preinc.nmake diff --git a/asn1/atn-ulcs/atn-ulcs.cnf b/asn1/atn-ulcs/atn-ulcs.cnf index d765411201..f8cc43b04b 100644 --- a/asn1/atn-ulcs/atn-ulcs.cnf +++ b/asn1/atn-ulcs/atn-ulcs.cnf @@ -1,6 +1,7 @@ # c-basic-offset: 2; tab-width: 2; indent-tabs-mode: t # vi: set shiftwidth=2 tabstop=2 noexpandtab: # :indentSize=2:tabSize=2:noTabs=false: +# $Id$ #.MODULE_IMPORT @@ -18,7 +19,7 @@ PDV-list/presentation-data-values/arbitrary pdv-list_presentation-data-values_ar #.PDU Fully-encoded-data - ACSE-apdu + ACSE-apdu #.END @@ -45,8 +46,8 @@ PDV-list/presentation-data-values/arbitrary pdv-list_presentation-data-values_ar #.FN_BODY PDV-list/presentation-data-values/arbitrary packet_info * pinfo = actx->pinfo; - tvbuff_t *tvb_usr = NULL; - proto_item *ti = NULL; + tvbuff_t *tvb_usr = NULL; + proto_item *ti = NULL; proto_tree *atn_ulcs_tree = NULL; atn_conversation_t *atn_cv = NULL; @@ -291,7 +292,7 @@ PDV-list/presentation-data-values/arbitrary pdv-list_presentation-data-values_ar memset(aarq_data,0,sizeof(aarq_data_t)); aarq_data->cv = atn_cv; - aarq_data-> aarq_pending = TRUE; + aarq_data-> aarq_pending = TRUE; } #.END @@ -475,7 +476,7 @@ PDV-list/presentation-data-values/arbitrary pdv-list_presentation-data-values_ar atn_cv = find_atn_conversation( &pinfo->dst, - pinfo->clnp_dstref, + pinfo->clnp_dstref, &pinfo->src); } /* CR: srcref present, dstref always zero */ @@ -536,7 +537,7 @@ PDV-list/presentation-data-values/arbitrary pdv-list_presentation-data-values_ar NULL); } } - + offset += tvb_length_remaining(tvb, offset); #.END |