From: Guy Harris <guy@alum.mit.edu>
Date: Wed, 23 Sep 2015 21:12:35 +0000 (-0700)
Subject: Define ffs() in optimize.c; that's all that uses it.
X-Git-Tag: libpcap-1.8.0-bp~179
X-Git-Url: https://git.tcpdump.org/libpcap/commitdiff_plain/c82a08e93128e63ae1ca843fd6fd08e76e7eda40

Define ffs() in optimize.c; that's all that uses it.
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 709ecf5a..892591f7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -200,7 +200,6 @@ if( WIN32 )
     file(GLOB PROJECT_SOURCE_LIST_WIN32_C
         fad-win32.c
         pcap-win32.c
-        Win32/Src/ffs.c
         Win32/Src/getservent.c
     )
 
diff --git a/Makefile.in b/Makefile.in
index cbc52aa1..b0ffa741 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -351,7 +351,6 @@ EXTRA_DIST = \
 	Win32/Include/net/paths.h \
 	Win32/Prj/libpcap.dsp \
 	Win32/Prj/libpcap.dsw \
-	Win32/Src/ffs.c \
 	Win32/Src/gai_strerror.c \
 	Win32/Src/getnetbynm.c \
 	Win32/Src/getnetent.c \
diff --git a/Win32/Prj/libpcap.dsp b/Win32/Prj/libpcap.dsp
index 358007c8..c6828c81 100644
--- a/Win32/Prj/libpcap.dsp
+++ b/Win32/Prj/libpcap.dsp
@@ -102,10 +102,6 @@ SOURCE="..\..\fad-win32.c"
 # End Source File
 # Begin Source File
 
-SOURCE=..\Src\ffs.c
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\gencode.c
 # End Source File
 # Begin Source File
diff --git a/Win32/Src/ffs.c b/Win32/Src/ffs.c
deleted file mode 100644
index 099ff8e4..00000000
--- a/Win32/Src/ffs.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)ffs.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
-#include <string.h>
-
-/*
- * ffs -- vax ffs instruction
- */
-int
-ffs(mask)
-	register int mask;
-{
-	register int bit;
-
-	if (mask == 0)
-		return(0);
-	for (bit = 1; !(mask & 1); bit++)
-		mask >>= 1;
-	return(bit);
-}
diff --git a/optimize.c b/optimize.c
index dba8edfd..a284d413 100644
--- a/optimize.c
+++ b/optimize.c
@@ -63,8 +63,26 @@ extern int _w32_ffs (int mask);
 #define ffs _w32_ffs
 #endif
 
+/*
+ * So is the check for _MSC_VER done because MinGW has this?
+ */
 #if defined(_WIN32) && defined (_MSC_VER)
-int ffs(int mask);
+/*
+ * ffs -- vax ffs instruction
+ *
+ * XXX - with versions of VS that have it, use _BitScanForward()?
+ */
+static int
+ffs(int mask)
+{
+	int bit;
+
+	if (mask == 0)
+		return(0);
+	for (bit = 1; !(mask & 1); bit++)
+		mask >>= 1;
+	return(bit);
+}
 #endif
 
 /*