osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Run checkAPIs in epan/ftypes/ . 

Michael cleaned up the strcpy()'s which were preventing it from running
without errors.

Change-Id: I3f02150a9b1fbefddb67c0cb90fc2c58766d7d2a
Reviewed-on: https://code.wireshark.org/review/15375
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
This commit is contained in:
Jeff Morriss 2016-05-11 09:31:39 -04:00 committed by Michael Mann
parent 95f47187c7
commit bca12baa4c
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -1046,7 +1046,7 @@ checkapi: checkapi_local
## cd epan && $(MAKE) checkapi ## cd epan && $(MAKE) checkapi
cd epan/crypt && $(MAKE) checkapi cd epan/crypt && $(MAKE) checkapi
cd epan/dfilter && $(MAKE) checkapi cd epan/dfilter && $(MAKE) checkapi
## cd epan/ftypes && $(MAKE) checkapi cd epan/ftypes && $(MAKE) checkapi
cd epan/wslua && $(MAKE) checkapi cd epan/wslua && $(MAKE) checkapi
cd epan/dissectors && $(MAKE) checkapi cd epan/dissectors && $(MAKE) checkapi
cd plugins && $(MAKE) checkapi cd plugins && $(MAKE) checkapi

2
Makefile.nmake
View File

@ -1516,7 +1516,7 @@ checkapi: checkapi_local
cd ../dfilter cd ../dfilter
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake checkapi $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake checkapi
cd ../ftypes cd ../ftypes
## $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake checkapi $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake checkapi
cd ../wslua cd ../wslua
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake checkapi $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake checkapi
cd ../dissectors cd ../dissectors

17
epan/ftypes/CMakeLists.txt
View File

@ -58,15 +58,14 @@ set_target_properties(ftypes PROPERTIES
COMPILE_DEFINITIONS "WS_BUILD_DLL" COMPILE_DEFINITIONS "WS_BUILD_DLL"
) )
# Commented out as per nmake CHECKAPI(
#CHECKAPI( NAME
# NAME ftypes
# ftypes SWITCHES
# SWITCHES -g termoutput -build
# -g termoutput -build SOURCES
# SOURCES ${FTYPE_FILES}
# ${FTYPE_FILES} )
#)
# #
# Editor modelines - http://www.wireshark.org/tools/modelines.html # Editor modelines - http://www.wireshark.org/tools/modelines.html