Sync filelists between autofoo and cmake.

Move some dissectors that throw warnings to DIRTY_
Whitespace cleanups

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40478 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 630c2d754569779bcbe9ca91b9a919d746bbb7f7..0c611d18225c4b0d517d543d97134aebbb274d91 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -182,7 +182,7 @@ endforeach()
 if(NOT DISABLE_WERROR AND NOT ENABLE_EXTRA_GCC_CHECKS)
        check_c_compiler_flag(-Werror WERROR)
 else()
-       set(WERROR 0)
+       unset(WERROR)
 endif()
 
 if(CMAKE_COMPILER_IS_GNUCC)

diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt
index f2b85c1ec9dce641c2ef9096a75509e5dc6a5fd2..869771ee58a1d698f6a656d5e6663a649db8a894 100644 (file)
--- a/epan/CMakeLists.txt
+++ b/epan/CMakeLists.txt
@@ -159,10 +159,10 @@ ADD_CUSTOM_COMMAND(
 
 # Note that some dissectors are added in dissectors/dcerpc/CMakeLists.txt
 set(PIDL_DISSECTOR_SRC
+       dissectors/packet-dcerpc-atsvc.c
 #      dissectors/packet-dcerpc-budb.c
 #      dissectors/packet-dcerpc-butc.c
 #      dissectors/packet-dcerpc-drsuapi.c
-       dissectors/packet-dcerpc-atsvc.c
        dissectors/packet-dcerpc-dssetup.c
        dissectors/packet-dcerpc-efs.c
        dissectors/packet-dcerpc-frstrans.c
@@ -174,8 +174,8 @@ set(PIDL_DISSECTOR_SRC
        dissectors/packet-dcerpc-wzcsvc.c
 )
 set(DIRTY_PIDL_DISSECTOR_SRC
-       dissectors/packet-dcerpc-dfs.c
        dissectors/packet-dcerpc-dnsserver.c
+       dissectors/packet-dcerpc-dfs.c
        dissectors/packet-dcerpc-eventlog.c
        dissectors/packet-dcerpc-lsa.c
        dissectors/packet-dcerpc-mapi.c
@@ -211,15 +211,20 @@ set(ASN1_DISSECTOR_SRC
        dissectors/packet-h450-ros.c
        dissectors/packet-h460.c
        dissectors/packet-h501.c
+       dissectors/packet-HI2Operations.c
+       dissectors/packet-hnbap.c
        dissectors/packet-idmp.c
-       dissectors/packet-lppa.c
+       dissectors/packet-inap.c
+       dissectors/packet-lcsap.c
        dissectors/packet-logotypecertextn.c
+       dissectors/packet-lppa.c
        dissectors/packet-mms.c
        dissectors/packet-mpeg-audio.c
        dissectors/packet-mpeg-pes.c
        dissectors/packet-ns_cert_exts.c
        dissectors/packet-ocsp.c
        dissectors/packet-opsi.c
+       dissectors/packet-p22.c
        dissectors/packet-p7.c
        dissectors/packet-p772.c
        dissectors/packet-pkcs1.c
@@ -257,18 +262,13 @@ set(ASN1_DISSECTOR_SRC
 set(DIRTY_ASN1_DISSECTOR_SRC
        dissectors/packet-ansi_map.c
        dissectors/packet-gnm.c
-       dissectors/packet-gsm_map.c
        dissectors/packet-gprscdr.c
-       dissectors/packet-HI2Operations.c
-       dissectors/packet-hnbap.c
-       dissectors/packet-inap.c
-       dissectors/packet-lcsap.c
+       dissectors/packet-gsm_map.c
        dissectors/packet-ldap.c
        dissectors/packet-lpp.c
        dissectors/packet-lte-rrc.c
        dissectors/packet-nbap.c
        dissectors/packet-p1.c
-       dissectors/packet-p22.c
        dissectors/packet-pcap.c
        dissectors/packet-pkcs12.c
        dissectors/packet-pres.c
@@ -299,8 +299,8 @@ set(DISSECTOR_SRC
        dissectors/packet-afs.c
        dissectors/packet-agentx.c
        dissectors/packet-aim.c
-       dissectors/packet-aim-adverts.c
        dissectors/packet-aim-admin.c
+       dissectors/packet-aim-adverts.c
        dissectors/packet-aim-bos.c
        dissectors/packet-aim-buddylist.c
        dissectors/packet-aim-chat.c
@@ -353,10 +353,10 @@ set(DISSECTOR_SRC
        dissectors/packet-auto_rp.c
        dissectors/packet-ax4000.c
        dissectors/packet-ayiya.c
+       dissectors/packet-babel.c
        dissectors/packet-bacapp.c
        dissectors/packet-bacnet.c
        dissectors/packet-banana.c
-       dissectors/packet-babel.c
        dissectors/packet-bat.c
        dissectors/packet-batadv.c
        dissectors/packet-bctp.c
@@ -420,6 +420,7 @@ set(DISSECTOR_SRC
        dissectors/packet-cpfi.c
        dissectors/packet-cpha.c
        dissectors/packet-csm-encaps.c
+       dissectors/packet-csn1.c
        dissectors/packet-ctdb.c
        dissectors/packet-cups.c
        dissectors/packet-daap.c
@@ -501,11 +502,11 @@ set(DISSECTOR_SRC
        dissectors/packet-dhcpv6.c
        dissectors/packet-diameter.c
        dissectors/packet-diameter_3gpp.c
+       dissectors/packet-diffserv-mpls-common.c
        dissectors/packet-dis.c
        dissectors/packet-dis-enums.c
        dissectors/packet-dis-fields.c
        dissectors/packet-dis-pdus.c
-       dissectors/packet-diffserv-mpls-common.c
        dissectors/packet-distcc.c
        dissectors/packet-dlm3.c
        dissectors/packet-dlsw.c
@@ -598,14 +599,14 @@ set(DISSECTOR_SRC
        dissectors/packet-gprs-llc.c
        dissectors/packet-gre.c
        dissectors/packet-gsm_a_bssmap.c
-       # dissectors/packet-gsm_a_common.c
        dissectors/packet-gsm_a_dtap.c
        dissectors/packet-gsm_a_gm.c
        dissectors/packet-gsm_a_rp.c
        dissectors/packet-gsm_a_rr.c
-       dissectors/packet-gsm_ipa.c
        dissectors/packet-gsm_bsslap.c
        dissectors/packet-gsm_bssmap_le.c
+       dissectors/packet-gsm_rlcmac.c
+       dissectors/packet-gsm_ipa.c
        dissectors/packet-gsm_sms.c
        dissectors/packet-gsm_sms_ud.c
        dissectors/packet-gsm_um.c
@@ -618,12 +619,14 @@ set(DISSECTOR_SRC
        dissectors/packet-h1.c
        dissectors/packet-h221_nonstd.c
        dissectors/packet-h223.c
-       dissectors/packet-h248_2.c
        dissectors/packet-h248_annex_c.c
        dissectors/packet-h248_annex_e.c
+       dissectors/packet-h248_2.c
        dissectors/packet-h248_3gpp.c
        dissectors/packet-h248_7.c
        dissectors/packet-h248_10.c
+       dissectors/packet-h248_annex_c.c
+       dissectors/packet-h248_annex_e.c
        dissectors/packet-h248_q1950.c
        dissectors/packet-h261.c
        dissectors/packet-h263.c
@@ -651,7 +654,6 @@ set(DISSECTOR_SRC
        dissectors/packet-iana-oui.c
        dissectors/packet-iapp.c
        dissectors/packet-iax2.c
-       dissectors/packet-infiniband_sdp.c
        dissectors/packet-icap.c
        dissectors/packet-icep.c
        dissectors/packet-icmp.c
@@ -679,8 +681,9 @@ set(DISSECTOR_SRC
        dissectors/packet-imap.c
        dissectors/packet-imf.c
        dissectors/packet-infiniband.c
-       dissectors/packet-ipars.c
+       dissectors/packet-infiniband_sdp.c
        dissectors/packet-ip.c
+       dissectors/packet-ipars.c
        dissectors/packet-ipdc.c
        dissectors/packet-ipfc.c
        dissectors/packet-ipmi.c
@@ -725,12 +728,13 @@ set(DISSECTOR_SRC
        dissectors/packet-kdp.c
        dissectors/packet-kerberos.c
        dissectors/packet-kerberos4.c
-       dissectors/packet-klm.c
        dissectors/packet-kingfisher.c
        dissectors/packet-kink.c
        dissectors/packet-kismet.c
+       dissectors/packet-klm.c
        dissectors/packet-knet.c
        dissectors/packet-kpasswd.c
+       dissectors/packet-l1-events.c
        dissectors/packet-l2tp.c
        dissectors/packet-lanforge.c
        dissectors/packet-lapb.c
@@ -738,7 +742,6 @@ set(DISSECTOR_SRC
        dissectors/packet-lapd.c
        dissectors/packet-lapdm.c
        dissectors/packet-laplink.c
-       dissectors/packet-l1-events.c
        dissectors/packet-ldp.c
        dissectors/packet-ldss.c
        dissectors/packet-lge_monitor.c
@@ -762,8 +765,8 @@ set(DISSECTOR_SRC
        dissectors/packet-m2ua.c
        dissectors/packet-m3ua.c
        dissectors/packet-mac-lte.c
-       dissectors/packet-mactelnet.c
        dissectors/packet-maccontrol.c
+       dissectors/packet-mactelnet.c
        dissectors/packet-manolito.c
        dissectors/packet-mbtcp.c
        dissectors/packet-mdshdr.c
@@ -778,7 +781,6 @@ set(DISSECTOR_SRC
        dissectors/packet-miop.c
        dissectors/packet-mip.c
        dissectors/packet-mip6.c
-       dissectors/packet-ms-mms.c
        dissectors/packet-mmse.c
        dissectors/packet-mndp.c
        dissectors/packet-mongo.c
@@ -794,10 +796,11 @@ set(DISSECTOR_SRC
        dissectors/packet-mrp-mmrp.c
        dissectors/packet-mrp-msrp.c
        dissectors/packet-mrp-mvrp.c
+       dissectors/packet-ms-mms.c
        dissectors/packet-msdp.c
-       dissectors/packet-msnlb.c
        dissectors/packet-msn-messenger.c
        dissectors/packet-msnip.c
+       dissectors/packet-msnlb.c
        dissectors/packet-msproxy.c
        dissectors/packet-msrp.c
        dissectors/packet-mstp.c
@@ -809,6 +812,7 @@ set(DISSECTOR_SRC
        dissectors/packet-mysql.c
        dissectors/packet-nas_eps.c
        dissectors/packet-nasdaq-itch.c
+       dissectors/packet-nasdaq-soup.c
        dissectors/packet-nat-pmp.c
        dissectors/packet-nb_rtpmux.c
        dissectors/packet-nbd.c
@@ -839,9 +843,9 @@ set(DISSECTOR_SRC
        dissectors/packet-nlm.c
        dissectors/packet-nlsp.c
        dissectors/packet-nntp.c
-       dissectors/packet-nstrace.c
        dissectors/packet-nsip.c
        dissectors/packet-nsrp.c
+       dissectors/packet-nstrace.c
        dissectors/packet-nt-oui.c
        dissectors/packet-nt-tpcp.c
        dissectors/packet-ntlmssp.c
@@ -873,17 +877,17 @@ set(DISSECTOR_SRC
        dissectors/packet-pgsql.c
        dissectors/packet-pim.c
        dissectors/packet-pingpongprotocol.c
-       dissectors/packet-pktgen.c
        dissectors/packet-pktc.c
+       dissectors/packet-pktgen.c
        dissectors/packet-pnrp.c
        dissectors/packet-pop.c
        dissectors/packet-portmap.c
        dissectors/packet-ppi.c
        dissectors/packet-ppi-antenna.c
        dissectors/packet-ppi-geolocation-common.c
-       dissectors/packet-ppi-geolocation-common.h
        dissectors/packet-ppi-gps.c
        dissectors/packet-ppi-sensor.c
+       dissectors/packet-ppi-vector.c
        dissectors/packet-ppp.c
        dissectors/packet-pppoe.c
        dissectors/packet-pptp.c
@@ -891,11 +895,11 @@ set(DISSECTOR_SRC
        dissectors/packet-ptp.c
        dissectors/packet-pvfs2.c
        dissectors/packet-pw-common.c
-       dissectors/packet-pw-eth.c
-       dissectors/packet-pw-hdlc.c
-       dissectors/packet-pw-fr.c
        dissectors/packet-pw-atm.c
        dissectors/packet-pw-cesopsn.c
+       dissectors/packet-pw-eth.c
+       dissectors/packet-pw-fr.c
+       dissectors/packet-pw-hdlc.c
        dissectors/packet-pw-satop.c
        dissectors/packet-q2931.c
        dissectors/packet-q708.c
@@ -906,10 +910,10 @@ set(DISSECTOR_SRC
        dissectors/packet-quake2.c
        dissectors/packet-quake3.c
        dissectors/packet-quakeworld.c
-       dissectors/packet-radius.c
-       dissectors/packet-radius_packetcable.c
        dissectors/packet-radiotap.c
        dissectors/packet-radiotap-iter.c
+       dissectors/packet-radius.c
+       dissectors/packet-radius_packetcable.c
        dissectors/packet-raw.c
        dissectors/packet-rdm.c
        dissectors/packet-rdp.c
@@ -968,6 +972,7 @@ set(DISSECTOR_SRC
        dissectors/packet-sccp.c
        dissectors/packet-sccpmg.c
        dissectors/packet-scop.c
+       dissectors/packet-scriptingservice.c
        dissectors/packet-scsi.c
        dissectors/packet-scsi-mmc.c
        dissectors/packet-scsi-osd.c
@@ -982,9 +987,9 @@ set(DISSECTOR_SRC
        dissectors/packet-ses.c
        dissectors/packet-sflow.c
        dissectors/packet-sgsap.c
+       dissectors/packet-sigcomp.c
        dissectors/packet-simulcrypt.c
        dissectors/packet-sip.c
-       dissectors/packet-sigcomp.c
        dissectors/packet-sipfrag.c
        dissectors/packet-sita.c
        dissectors/packet-skinny.c
@@ -1008,15 +1013,13 @@ set(DISSECTOR_SRC
        dissectors/packet-sndcp-xid.c
        dissectors/packet-socketcan.c
        dissectors/packet-socks.c
-       dissectors/packet-nasdaq-soup.c
        dissectors/packet-spice.c
        dissectors/packet-spp.c
        dissectors/packet-spray.c
        dissectors/packet-srp.c
-       dissectors/packet-sscf-nni.c
        dissectors/packet-srvloc.c
+       dissectors/packet-sscf-nni.c
        dissectors/packet-sscop.c
-       dissectors/packet-scriptingservice.c
        dissectors/packet-ssh.c
        dissectors/packet-ssl.c
        dissectors/packet-ssl-utils.c
@@ -1039,18 +1042,18 @@ set(DISSECTOR_SRC
        dissectors/packet-teamspeak2.c
        dissectors/packet-teimanagement.c
        dissectors/packet-teklink.c
+       dissectors/packet-telkonet.c
        dissectors/packet-telnet.c
        dissectors/packet-teredo.c
        dissectors/packet-text-media.c
-       dissectors/packet-telkonet.c
        dissectors/packet-tftp.c
        dissectors/packet-time.c
        dissectors/packet-tipc.c
        dissectors/packet-tivoconnect.c
-       dissectors/packet-tnef.c
-       dissectors/packet-tns.c
        dissectors/packet-tn3270.c
        dissectors/packet-tn5250.c
+       dissectors/packet-tnef.c
+       dissectors/packet-tns.c
        dissectors/packet-tpkt.c
        dissectors/packet-tpncp.c
        dissectors/packet-tr.c
@@ -1065,7 +1068,6 @@ set(DISSECTOR_SRC
        dissectors/packet-tuxedo.c
        dissectors/packet-tzsp.c
        dissectors/packet-ua.c
-       dissectors/packet-ua.h
        dissectors/packet-uaudp.c
        dissectors/packet-ucp.c
        dissectors/packet-udld.c
@@ -1082,8 +1084,8 @@ set(DISSECTOR_SRC
        dissectors/packet-user_encap.c
        dissectors/packet-uts.c
        dissectors/packet-v120.c
-       dissectors/packet-v5ua.c
        dissectors/packet-v52.c
+       dissectors/packet-v5ua.c
        dissectors/packet-vcdu.c
        dissectors/packet-vicp.c
        dissectors/packet-vines.c
@@ -1116,7 +1118,6 @@ set(DISSECTOR_SRC
        dissectors/packet-wsp.c
        dissectors/packet-wtls.c
        dissectors/packet-wtp.c
-       # dissectors/packet-x11.c
        dissectors/packet-x25.c
        dissectors/packet-x29.c
        dissectors/packet-xcsl.c
@@ -1140,8 +1141,8 @@ set(DISSECTOR_SRC
        dissectors/packet-ypserv.c
        dissectors/packet-ypxfr.c
        dissectors/packet-zbee-aps.c
-       dissectors/packet-zbee-security.c
        dissectors/packet-zbee-nwk.c
+       dissectors/packet-zbee-security.c
        dissectors/packet-zbee-zcl.c
        dissectors/packet-zbee-zdp.c
        dissectors/packet-zbee-zdp-binding.c
@@ -1153,6 +1154,11 @@ set(DISSECTOR_SRC
        dissectors/packet-zrtp.c
 )
 
+set(DIRTY_DISSECTOR_SRC
+       dissectors/packet-gsm_a_common.c
+       dissectors/packet-x11.c
+)
+
 # IPMI sub-parsers for each network function code
 set(IPMI_SUBPARSERS
        dissectors/packet-ipmi-app.c
@@ -1189,11 +1195,10 @@ set(LIBWIRESHARK_ASM_FILES
 
 set(DISSECTOR_FILES
        ${DISSECTOR_SRC}
+       ${DIRTY_DISSECTOR_SRC}
        ${PIDL_DISSECTOR_SRC}
        ${PIDL_DISSECTOR_AUTOGEN_SRC}
        ${DIRTY_PIDL_DISSECTOR_SRC}
-       dissectors/packet-gsm_a_common.c
-       dissectors/packet-x11.c
        ${ASN1_DISSECTOR_SRC}
        ${DIRTY_ASN1_DISSECTOR_SRC}
 )
@@ -1352,7 +1357,6 @@ set(CLEAN_FILES
        # ${DISSECTOR_FILES} contains dirty files
        ${DISSECTOR_SRC}
        ${PIDL_DISSECTOR_SRC}
-       # ${PIDL_DISSECTOR_AUTOGEN_SRC}
        ${ASN1_DISSECTOR_SRC}
        # ${DISSECTOR_FILES } end
        ${DISSECTOR_SUPPORT_SRC}

diff --git a/epan/dissectors/Makefile.am b/epan/dissectors/Makefile.am
index 2b405214f77735e49ad80eb9163cbad5d43ffee1..0d5a39434b4768e71752a458142ae9fe183c63bd 100644 (file)
--- a/epan/dissectors/Makefile.am
+++ b/epan/dissectors/Makefile.am
@@ -28,6 +28,7 @@ INCLUDES = -I$(srcdir)/../.. -I$(srcdir)/.. \
 include Makefile.common
 
 libdirtydissectors_la_SOURCES = \
+       $(DIRTY_DISSECTOR_SRC)      \
        $(DIRTY_ASN1_DISSECTOR_SRC) \
        $(DIRTY_PIDL_DISSECTOR_SRC)
 

diff --git a/epan/dissectors/Makefile.common b/epan/dissectors/Makefile.common
index 53b043b9e6b6004f276c516615fd8a8c6c0dbeaa..650374070835fd391a2b860612b2844dcf418beb 100644 (file)
--- a/epan/dissectors/Makefile.common
+++ b/epan/dissectors/Makefile.common
@@ -50,7 +50,6 @@ PIDL_DISSECTOR_SRC = \
        packet-dcerpc-atsvc.c \
        packet-dcerpc-budb.c    \
        packet-dcerpc-butc.c    \
-       packet-dcerpc-dfs.c \
        packet-dcerpc-drsuapi.c \
        packet-dcerpc-dssetup.c \
        packet-dcerpc-efs.c \
@@ -66,9 +65,11 @@ PIDL_DISSECTOR_SRC = \
 # PIDL-generated DCE RPC dissectors with warnings.
 #
 DIRTY_PIDL_DISSECTOR_SRC = \
-       packet-dcerpc-dnsserver.c       \
+       packet-dcerpc-dfs.c \
+       packet-dcerpc-dnsserver.c       \
        packet-dcerpc-eventlog.c \
        packet-dcerpc-lsa.c \
+       packet-dcerpc-mapi.c \
        packet-dcerpc-winreg.c
 
 #
@@ -82,13 +83,14 @@ PIDL_DISSECTOR_INCLUDES = \
        packet-dcerpc-eventlog.h        \
        packet-dcerpc-initshutdown.h    \
        packet-dcerpc-lsa.h     \
+       packet-dcerpc-mapi.h    \
        packet-dcerpc-misc.h    \
        packet-dcerpc-nspi.h    \
-       packet-dcerpc-rfr.h \
+       packet-dcerpc-rfr.h     \
        packet-dcerpc-srvsvc.h  \
-       packet-dcerpc-winreg.h \
+       packet-dcerpc-winreg.h  \
        packet-dcerpc-wkssvc.h  \
-       packet-dcerpc-wzcsvc.h \
+       packet-dcerpc-wzcsvc.h  \
        packet-dcerpc-frstrans.h
 
 #
@@ -104,7 +106,6 @@ ASN1_DISSECTOR_SRC = \
        packet-cmip.c \
        packet-cmp.c \
        packet-cms.c \
-       packet-coap.c \
        packet-credssp.c \
        packet-crmf.c \
        packet-dap.c \
@@ -127,13 +128,12 @@ ASN1_DISSECTOR_SRC = \
        packet-h501.c \
        packet-HI2Operations.c \
        packet-hnbap.c \
-       packet-lcsap.c \
-       packet-lppa.c \
        packet-idmp.c \
        packet-inap.c \
+       packet-lcsap.c \
        packet-logotypecertextn.c \
+       packet-lppa.c \
        packet-mms.c \
-       packet-mndp.c \
        packet-mpeg-audio.c \
        packet-mpeg-pes.c \
        packet-ns_cert_exts.c \
@@ -202,7 +202,7 @@ DIRTY_ASN1_DISSECTOR_SRC = \
 # Dissectors without warnings.
 #
 DISSECTOR_SRC = \
-       packet-2dparityfec.c    \
+       packet-2dparityfec.c    \
        packet-3com-njack.c     \
        packet-3com-xns.c       \
        packet-3g-a11.c         \
@@ -216,28 +216,28 @@ DISSECTOR_SRC = \
        packet-adwin-config.c   \
        packet-afp.c            \
        packet-afs.c            \
-       packet-agentx.c         \
+       packet-agentx.c         \
        packet-aim.c            \
-       packet-aim-admin.c      \
+       packet-aim-admin.c      \
        packet-aim-adverts.c    \
-       packet-aim-bos.c        \
+       packet-aim-bos.c        \
        packet-aim-buddylist.c  \
        packet-aim-chat.c       \
-       packet-aim-chatnav.c    \
+       packet-aim-chatnav.c    \
        packet-aim-directory.c  \
-       packet-aim-email.c      \
+       packet-aim-email.c      \
        packet-aim-generic.c    \
-       packet-aim-icq.c        \
+       packet-aim-icq.c        \
        packet-aim-invitation.c \
-       packet-aim-location.c   \
-       packet-aim-messaging.c  \
-       packet-aim-oft.c        \
-       packet-aim-popup.c      \
-       packet-aim-signon.c     \
-       packet-aim-ssi.c        \
-       packet-aim-sst.c        \
-       packet-aim-stats.c      \
-       packet-aim-translate.c  \
+       packet-aim-location.c   \
+       packet-aim-messaging.c  \
+       packet-aim-oft.c        \
+       packet-aim-popup.c      \
+       packet-aim-signon.c     \
+       packet-aim-ssi.c        \
+       packet-aim-sst.c        \
+       packet-aim-stats.c      \
+       packet-aim-translate.c  \
        packet-aim-userlookup.c \
        packet-airopeek.c       \
        packet-ajp13.c          \
@@ -256,7 +256,7 @@ DISSECTOR_SRC = \
        packet-app-pkix-cert.c  \
        packet-applemidi.c      \
        packet-arcnet.c         \
-       packet-armagetronad.c   \
+       packet-armagetronad.c   \
        packet-arp.c            \
        packet-artnet.c         \
        packet-aruba-adp.c      \
@@ -283,7 +283,7 @@ DISSECTOR_SRC = \
        packet-ber.c            \
        packet-bfd.c            \
        packet-bgp.c            \
-       packet-bittorrent.c     \
+       packet-bittorrent.c     \
        packet-bjnp.c           \
        packet-bmc.c            \
        packet-bofl.c           \
@@ -316,7 +316,7 @@ DISSECTOR_SRC = \
        packet-cfm.c            \
        packet-cgmp.c           \
        packet-chdlc.c          \
-       packet-cigi.c           \
+       packet-cigi.c           \
        packet-cimd.c           \
        packet-cimetrics.c      \
        packet-cip.c            \
@@ -331,9 +331,10 @@ DISSECTOR_SRC = \
        packet-clnp.c           \
        packet-cmpp.c           \
        packet-cnip.c           \
+       packet-coap.c           \
        packet-collectd.c       \
        packet-componentstatus.c \
-       packet-cops.c           \
+       packet-cops.c           \
        packet-cosine.c         \
        packet-cpfi.c           \
        packet-cpha.c           \
@@ -343,42 +344,42 @@ DISSECTOR_SRC = \
        packet-cups.c           \
        packet-daap.c           \
        packet-data.c           \
-       packet-daytime.c        \
+       packet-daytime.c        \
        packet-db-lsp.c         \
        packet-dcc.c            \
        packet-dccp.c           \
        packet-dcerpc-bossvr.c          \
        packet-dcerpc-browser.c         \
        packet-dcerpc-cds_clerkserver.c \
-       packet-dcerpc-cds_solicit.c     \
+       packet-dcerpc-cds_solicit.c     \
        packet-dcerpc-conv.c            \
-       packet-dcerpc-cprpc_server.c    \
+       packet-dcerpc-cprpc_server.c    \
        packet-dcerpc-dce122.c          \
-       packet-dcerpc-dtsprovider.c     \
-       packet-dcerpc-dtsstime_req.c    \
+       packet-dcerpc-dtsprovider.c     \
+       packet-dcerpc-dtsstime_req.c    \
        packet-dcerpc-epm.c             \
        packet-dcerpc-fileexp.c         \
        packet-dcerpc-fldb.c            \
        packet-dcerpc-frsapi.c          \
        packet-dcerpc-frsrpc.c          \
-       packet-dcerpc-ftserver.c        \
+       packet-dcerpc-ftserver.c        \
        packet-dcerpc-icl_rpc.c         \
        packet-dcerpc-krb5rpc.c         \
        packet-dcerpc-llb.c             \
        packet-dcerpc-mapi.c            \
-       packet-dcerpc-messenger.c       \
+       packet-dcerpc-messenger.c       \
        packet-dcerpc-mgmt.c            \
        packet-dcerpc-ndr.c             \
-       packet-dcerpc-netlogon.c        \
+       packet-dcerpc-netlogon.c        \
        packet-dcerpc-pnp.c             \
        packet-dcerpc-rdaclif.c         \
-       packet-dcerpc-rep_proc.c        \
-       packet-dcerpc-roverride.c       \
+       packet-dcerpc-rep_proc.c        \
+       packet-dcerpc-roverride.c       \
        packet-dcerpc-rpriv.c           \
        packet-dcerpc-rras.c            \
        packet-dcerpc-rs_acct.c         \
        packet-dcerpc-rs_attr.c         \
-       packet-dcerpc-rs_attr_schema.c  \
+       packet-dcerpc-rs_attr_schema.c  \
        packet-dcerpc-rs_bind.c         \
        packet-dcerpc-rs_misc.c         \
        packet-dcerpc-rs_pgo.c          \
@@ -406,12 +407,12 @@ DISSECTOR_SRC = \
        packet-dcerpc-update.c          \
        packet-dcerpc.c                 \
        packet-dcm.c            \
-       packet-dcom.c           \
-       packet-dcom-dispatch.c  \
-       packet-dcom-oxid.c      \
-       packet-dcom-remact.c    \
-       packet-dcom-remunkn.c   \
-       packet-dcom-sysact.c    \
+       packet-dcom.c           \
+       packet-dcom-dispatch.c  \
+       packet-dcom-oxid.c      \
+       packet-dcom-remact.c    \
+       packet-dcom-remunkn.c   \
+       packet-dcom-sysact.c    \
        packet-dcp-etsi.c       \
        packet-ddtp.c           \
        packet-dec-bpdu.c       \
@@ -435,7 +436,7 @@ DISSECTOR_SRC = \
        packet-dplay.c          \
        packet-dpnss.c          \
        packet-dpnss-link.c     \
-       packet-drda.c           \
+       packet-drda.c           \
        packet-dsi.c            \
        packet-dtls.c           \
        packet-dtn.c            \
@@ -462,7 +463,7 @@ DISSECTOR_SRC = \
        packet-enttec.c         \
        packet-epl.c            \
        packet-epl_v1.c         \
-       packet-epmd.c           \
+       packet-epmd.c           \
        packet-erf.c            \
        packet-esio.c           \
        packet-esis.c           \
@@ -518,7 +519,6 @@ DISSECTOR_SRC = \
        packet-gprs-llc.c       \
        packet-gre.c            \
        packet-gsm_a_bssmap.c   \
-       packet-gsm_a_common.c   \
        packet-gsm_a_dtap.c     \
        packet-gsm_a_gm.c       \
        packet-gsm_a_rp.c       \
@@ -539,12 +539,12 @@ DISSECTOR_SRC = \
        packet-h1.c             \
        packet-h221_nonstd.c    \
        packet-h223.c           \
-       packet-h248_2.c         \
-       packet-h248_3gpp.c      \
-       packet-h248_7.c         \
-       packet-h248_10.c        \
-       packet-h248_annex_c.c   \
-       packet-h248_annex_e.c   \
+       packet-h248_2.c         \
+       packet-h248_3gpp.c      \
+       packet-h248_7.c         \
+       packet-h248_10.c        \
+       packet-h248_annex_c.c   \
+       packet-h248_annex_e.c   \
        packet-h248_q1950.c     \
        packet-h261.c           \
        packet-h263.c           \
@@ -557,14 +557,14 @@ DISSECTOR_SRC = \
        packet-hdfs.c           \
        packet-hdfsdata.c       \
        packet-hip.c            \
-       packet-homeplug.c       \
-       packet-homeplug-av.c    \
+       packet-homeplug.c       \
+       packet-homeplug-av.c    \
        packet-hp-erm.c         \
        packet-hpext.c          \
        packet-hpsw.c           \
        packet-hpteam.c         \
        packet-hsr.c            \
-       packet-hsr-prp-supervision.c            \
+       packet-hsr-prp-supervision.c    \
        packet-hsrp.c           \
        packet-http.c           \
        packet-hyperscsi.c      \
@@ -625,7 +625,7 @@ DISSECTOR_SRC = \
        packet-isis-hello.c     \
        packet-isis-lsp.c       \
        packet-isis-snp.c       \
-       packet-isis.c           \
+       packet-isis.c           \
        packet-isl.c            \
        packet-ismacryp.c       \
        packet-ismp.c           \
@@ -637,11 +637,11 @@ DISSECTOR_SRC = \
        packet-iwarp-ddp-rdmap.c\
        packet-iwarp-mpa.c      \
        packet-jmirror.c        \
-       packet-jpeg.c           \
+       packet-jpeg.c           \
        packet-json.c           \
-       packet-juniper.c        \
+       packet-juniper.c        \
        packet-jxta.c           \
-       packet-k12.c            \
+       packet-k12.c            \
        packet-kadm5.c          \
        packet-kdp.c            \
        packet-kerberos.c       \
@@ -682,7 +682,7 @@ DISSECTOR_SRC = \
        packet-m2tp.c           \
        packet-m2ua.c           \
        packet-m3ua.c           \
-       packet-mac-lte.c                \
+       packet-mac-lte.c        \
        packet-maccontrol.c     \
        packet-mactelnet.c      \
        packet-manolito.c       \
@@ -700,13 +700,14 @@ DISSECTOR_SRC = \
        packet-mip.c            \
        packet-mip6.c           \
        packet-mmse.c           \
+       packet-mndp.c           \
        packet-mongo.c          \
        packet-mount.c          \
        packet-mp2t.c           \
        packet-mp4ves.c         \
        packet-mpeg1.c          \
        packet-mpls.c           \
-       packet-mpls-echo.c      \
+       packet-mpls-echo.c      \
        packet-mq.c             \
        packet-mq-pcf.c         \
        packet-mrdisc.c         \
@@ -738,18 +739,18 @@ DISSECTOR_SRC = \
        packet-ncp.c            \
        packet-ncp2222.c        \
        packet-ncp-nmas.c       \
-       packet-ncp-sss.c        \
+       packet-ncp-sss.c        \
        packet-ncs.c            \
        packet-ndmp.c           \
        packet-ndp.c            \
        packet-ndps.c           \
-  packet-netanalyzer.c  \
+       packet-netanalyzer.c    \
        packet-netbios.c        \
        packet-netdump.c        \
        packet-netflow.c        \
        packet-netmon-802_11.c  \
        packet-netperfmeter.c   \
-       packet-netsync.c        \
+       packet-netsync.c        \
        packet-nettl.c          \
        packet-newmail.c        \
        packet-nfs.c            \
@@ -787,7 +788,7 @@ DISSECTOR_SRC = \
        packet-pcep.c           \
        packet-pcli.c           \
        packet-pcnfsd.c         \
-       packet-pdcp-lte.c               \
+       packet-pdcp-lte.c       \
        packet-per.c            \
        packet-pflog.c          \
        packet-pgm.c            \
@@ -803,18 +804,18 @@ DISSECTOR_SRC = \
        packet-ppi-antenna.c    \
        packet-ppi-geolocation-common.c \
        packet-ppi-gps.c        \
-       packet-ppi-vector.c     \
        packet-ppi-sensor.c     \
+       packet-ppi-vector.c     \
        packet-ppp.c            \
        packet-pppoe.c          \
        packet-pptp.c           \
        packet-prp.c            \
        packet-ptp.c            \
        packet-pvfs2.c          \
-       packet-pw-common.c      \
        packet-pw-atm.c         \
        packet-pw-cesopsn.c     \
-       packet-pw-eth.c         \
+       packet-pw-common.c      \
+       packet-pw-eth.c         \
        packet-pw-fr.c          \
        packet-pw-hdlc.c        \
        packet-pw-satop.c       \
@@ -835,16 +836,16 @@ DISSECTOR_SRC = \
        packet-rdm.c            \
        packet-rdp.c            \
        packet-rdt.c            \
-       packet-redback.c        \
-       packet-redbackli.c      \
+       packet-redback.c        \
+       packet-redbackli.c      \
        packet-reload.c         \
        packet-reload-framing.c \
-       packet-retix-bpdu.c     \
-       packet-rfc2190.c        \
+       packet-retix-bpdu.c     \
+       packet-rfc2190.c        \
        packet-rgmp.c           \
        packet-rip.c            \
        packet-ripng.c          \
-       packet-rfid-mifare.c    \
+       packet-rfid-mifare.c    \
        packet-rlc.c            \
        packet-rlc-lte.c        \
        packet-rlm.c            \
@@ -858,7 +859,7 @@ DISSECTOR_SRC = \
        packet-rmt-lct.c        \
        packet-rmt-norm.c       \
        packet-rohc.c           \
-       packet-roofnet.c        \
+       packet-roofnet.c        \
        packet-rpc.c            \
        packet-rpcap.c          \
        packet-rpl.c            \
@@ -885,7 +886,7 @@ DISSECTOR_SRC = \
        packet-sametime.c       \
        packet-sap.c            \
        packet-sasp.c           \
-       packet-sbus.c           \
+       packet-sbus.c           \
        packet-sccp.c           \
        packet-sccpmg.c         \
        packet-scop.c           \
@@ -946,7 +947,7 @@ DISSECTOR_SRC = \
        packet-stun.c           \
        packet-sua.c            \
        packet-symantec.c       \
-       packet-synergy.c        \
+       packet-synergy.c        \
        packet-synphasor.c      \
        packet-syslog.c         \
        packet-t30.c            \
@@ -973,9 +974,9 @@ DISSECTOR_SRC = \
        packet-tns.c            \
        packet-tpkt.c           \
        packet-tpncp.c          \
-       packet-tr.c                     \
-       packet-trill.c      \
-       packet-mim.c        \
+       packet-tr.c             \
+       packet-trill.c          \
+       packet-mim.c            \
        packet-trmac.c          \
        packet-tsp.c            \
        packet-tte.c            \
@@ -984,7 +985,7 @@ DISSECTOR_SRC = \
        packet-turnchannel.c    \
        packet-tuxedo.c         \
        packet-tzsp.c           \
-       packet-ua.c                     \
+       packet-ua.c             \
        packet-uaudp.c          \
        packet-ucp.c            \
        packet-udld.c           \
@@ -1035,7 +1036,6 @@ DISSECTOR_SRC = \
        packet-wsp.c            \
        packet-wtls.c           \
        packet-wtp.c            \
-       packet-x11.c            \
        packet-x25.c            \
        packet-x29.c            \
        packet-xcsl.c           \
@@ -1044,11 +1044,11 @@ DISSECTOR_SRC = \
        packet-xmcp.c           \
        packet-xmpp.c           \
        packet-xmpp-conference.c \
-       packet-xmpp-core.c      \
-       packet-xmpp-gtalk.c     \
-       packet-xmpp-jingle.c    \
-       packet-xmpp-other.c     \
-       packet-xmpp-utils.c     \
+       packet-xmpp-core.c      \
+       packet-xmpp-gtalk.c     \
+       packet-xmpp-jingle.c    \
+       packet-xmpp-other.c     \
+       packet-xmpp-utils.c     \
        packet-xot.c            \
        packet-xtp.c            \
        packet-xyplex.c         \
@@ -1072,11 +1072,18 @@ DISSECTOR_SRC = \
        packet-zrtp.c   \
        $(CUSTOM_DISSECTOR_SRC)
 
+#
+# Files that create warnings while building
+#
+DIRTY_DISSECTOR_SRC = \
+       packet-gsm_a_common.c   \
+       packet-x11.c
+
 #
 # Headers for dissectors.
 #
 DISSECTOR_INCLUDES =   \
-       $(PIDL_DISSECTOR_INCLUDES)      \
+       $(PIDL_DISSECTOR_INCLUDES)      \
        packet-acn.h    \
        packet-acp133.h \
        packet-acse.h   \
@@ -1087,7 +1094,7 @@ DISSECTOR_INCLUDES =      \
        packet-alcap.h  \
        packet-ansi_a.h \
        packet-ansi_map.h       \
-       packet-ansi_tcap.h \
+       packet-ansi_tcap.h      \
        packet-ap1394.h \
        packet-arcnet.h \
        packet-arp.h    \
@@ -1163,7 +1170,7 @@ DISSECTOR_INCLUDES =      \
        packet-e212.h   \
        packet-edonkey.h        \
        packet-enc.h    \
-       packet-epmd.h   \
+       packet-epmd.h   \
        packet-esis.h   \
        packet-ess.h    \
        packet-eth.h    \
@@ -1369,7 +1376,7 @@ DISSECTOR_INCLUDES =      \
        packet-stat.h   \
        packet-stat-notify.h    \
        packet-sv.h     \
-       packet-t124.h   \
+       packet-t124.h   \
        packet-t30.h    \
        packet-t38.h    \
        packet-tacacs.h \
@@ -1461,6 +1468,7 @@ noinst_HEADERS =  \
 
 ALL_DISSECTORS_SRC = \
        $(DISSECTOR_SRC) \
+       $(DIRTY_DISSECTOR_SRC) \
        $(PIDL_DISSECTOR_SRC) \
        $(DIRTY_PIDL_DISSECTOR_SRC) \
        $(ASN1_DISSECTOR_SRC) \

diff --git a/wiretap/CMakeLists.txt b/wiretap/CMakeLists.txt
index c051758deb69446ff6fc42ef83f1c9176e899970..d7b8bad2e4af1edad4998d431ca9719fb6f88675 100644 (file)
--- a/wiretap/CMakeLists.txt
+++ b/wiretap/CMakeLists.txt
@@ -77,7 +77,7 @@ set(CLEAN_FILES
        ${WIRETAP_FILES}
 )
 
-if (WERROR) 
+if (WERROR)
        set_source_files_properties(
                ${CLEAN_FILES}
                PROPERTIES