Add -Werror for gcc to a few more directories and fix a few warnings

svn path=/trunk/; revision=21129

5 files changed, 16 insertions, 28 deletions

diff --git a/epan/crypt/Makefile.am b/epan/crypt/Makefile.am
index d2c87430cb..6c46fefcab 100644
--- a/epan/crypt/Makefile.am
+++ b/epan/crypt/Makefile.am
@@ -25,6 +25,10 @@ INCLUDES = -I$(top_srcdir)
 
 include Makefile.common
 
+if USING_GCC
+AM_CFLAGS = -Werror
+endif
+
 noinst_LTLIBRARIES = libairpdcap.la
 
 CLEANFILES = \
diff --git a/epan/crypt/airpdcap.c b/epan/crypt/airpdcap.c
index abcde6a830..8059602bd8 100644
--- a/epan/crypt/airpdcap.c
+++ b/epan/crypt/airpdcap.c
@@ -208,11 +208,6 @@ static INT AirPDcapGetSa(
         AIRPDCAP_SEC_ASSOCIATION_ID *id)
         ;
 
-static INT AirPDcapFreeSa(
-        PAIRPDCAP_CONTEXT ctx,
-        INT index)	/* index of the structure to free		*/
-        ;
-
 static INT AirPDcapStoreSa(
         PAIRPDCAP_CONTEXT ctx,
         AIRPDCAP_SEC_ASSOCIATION_ID *id)
@@ -1152,29 +1147,6 @@ AirPDcapGetSa(
 }
 
 static INT
-AirPDcapFreeSa(
-        PAIRPDCAP_CONTEXT ctx,
-        INT index)								/* index of the structure to free		*/
-{
-        /* set the structure as free (the reset will be done in AIRPDCAP_store_sta_info)	*/
-        ctx->sa[index].used=0;
-
-        /* set the first_free_index to avoid free blocks in the middle	*/
-        if (index<ctx->first_free_index)
-                ctx->first_free_index=index;
-
-        /* decrement the last_stored_index if this was the last stored block	*/
-        if (index==ctx->last_stored_index)
-                ctx->last_stored_index--;
-
-        /* if the list is empty, set the index	*/
-        if (ctx->last_stored_index==-1)
-                ctx->index=-1;
-
-        return ctx->index;
-}
-
-static INT
 AirPDcapStoreSa(
         PAIRPDCAP_CONTEXT ctx,
         AIRPDCAP_SEC_ASSOCIATION_ID *id)
diff --git a/epan/dfilter/Makefile.am b/epan/dfilter/Makefile.am
index 9de326ea39..09d80c8752 100644
--- a/epan/dfilter/Makefile.am
+++ b/epan/dfilter/Makefile.am
@@ -21,6 +21,10 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
+if USING_GCC
+AM_CFLAGS = -Werror
+endif
+
 noinst_LTLIBRARIES = libdfilter.la
 
 CLEANFILES = \
diff --git a/epan/ftypes/Makefile.am b/epan/ftypes/Makefile.am
index 052925a979..ff07f73a58 100644
--- a/epan/ftypes/Makefile.am
+++ b/epan/ftypes/Makefile.am
@@ -21,6 +21,10 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+if USING_GCC
+AM_CFLAGS = -Werror
+endif
+
 noinst_LTLIBRARIES = libftypes.la
 
 CLEANFILES = \
diff --git a/epan/wslua/Makefile.am b/epan/wslua/Makefile.am
index b9d9ecfa0d..919a318ed2 100644
--- a/epan/wslua/Makefile.am
+++ b/epan/wslua/Makefile.am
@@ -21,6 +21,10 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 
+if USING_GCC
+AM_CFLAGS = -Werror
+endif
+
 INCLUDES = -I$(top_srcdir) @LUA_INCLUDES@
 
 noinst_LTLIBRARIES = libwslua.la