Move strnatcmp.{h,c} from epan into wsutil: there's nothing epan-specific

there and moving it avoids having to recompile the file for use in editcap
and mergecap (which don't link against libwireshark).

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 367076779b5b7111b9453a5ed154d4d36d2c6fab..5761253086a94b15b999246d3aa49ebb687968cc 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -930,7 +930,6 @@ if(BUILD_mergecap)
        set(mergecap_FILES
                mergecap.c
                merge.c
-               epan/strnatcmp.c
                svnversion.h
                ${WTAP_PLUGIN_SOURCES}
        )
@@ -984,7 +983,6 @@ if(BUILD_editcap)
        set(editcap_FILES
                editcap.c
                epan/crypt/md5.c
-               epan/strnatcmp.c
                ${WTAP_PLUGIN_SOURCES}
        )
        add_executable(editcap ${editcap_FILES})

diff --git a/Makefile.common b/Makefile.common
index 4f5cb333ccc773e2f77bad3efc630fa0f95b75fe..8ee66f40b8ffefeecaee035854d3aab6c0ebce0c 100644 (file)
--- a/Makefile.common
+++ b/Makefile.common
@@ -150,14 +150,12 @@ text2pcap_INCLUDES = \
 # mergecap specifics
 mergecap_SOURCES = \
        mergecap.c \
-       merge.c \
-       epan/strnatcmp.c
+       merge.c
 
 # editcap specifics
 editcap_SOURCES = \
        editcap.c       \
        epan/crypt/md5.c \
-       epan/strnatcmp.c \
        $(WTAP_PLUGIN_SOURCES)
 
 # reordercap specifics

diff --git a/editcap.c b/editcap.c
index 08a3d29dac21bf2487bf8063f5afdeae673bd7ae..94b954f1064b92e9077a5c9c41a1bf9e9e7df87d 100644 (file)
--- a/editcap.c
+++ b/editcap.c
@@ -76,7 +76,8 @@
 #endif
 
 #include <wsutil/privileges.h>
-#include "wsutil/report_err.h"
+#include <wsutil/report_err.h>
+#include <wsutil/strnatcmp.h>
 
 /*
  * The symbols declared in the below are exported from libwireshark,
@@ -89,7 +90,6 @@
 #include "epan/crypt/md5.h"
 #include "epan/plugins.h"
 #include "epan/filesystem.h"
-#include "epan/strnatcmp.h"
 #undef WS_BUILD_DLL
 #define RESET_SYMBOL_EXPORT
 

diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt
index 8b8d3efd25ccc64f960bfbb1b237f3172a800105..d1080ec797452fe940ca6338ddec414efe106263 100644 (file)
--- a/epan/CMakeLists.txt
+++ b/epan/CMakeLists.txt
@@ -1485,7 +1485,6 @@ set(LIBWIRESHARK_FILES
        sna-utils.c
        stat_cmd_args.c
        stats_tree.c
-       strnatcmp.c
        strutil.c
        stream.c
        t35.c

diff --git a/epan/Makefile.common b/epan/Makefile.common
index c8a142bb70b3cc126cd705f13e4aa026d4fc0cf5..480f16ce22692813c5f927faa305084750c03751 100644 (file)
--- a/epan/Makefile.common
+++ b/epan/Makefile.common
@@ -86,7 +86,6 @@ LIBWIRESHARK_SRC =            \
        sna-utils.c             \
        stat_cmd_args.c         \
        stats_tree.c            \
-       strnatcmp.c             \
        strutil.c               \
        stream.c                \
        t35.c                   \
@@ -243,7 +242,6 @@ LIBWIRESHARK_INCLUDES =             \
        stats_tree.h            \
        stats_tree_priv.h       \
        stream.h                \
-       strnatcmp.h             \
        strutil.h               \
        t35.h                   \
        tap.h                   \

diff --git a/mergecap.c b/mergecap.c
index 74b0c004aaec91492be6c6db502de1c2a084a12a..35609ee07433b658c3d4036d883e5038a24c56b0 100644 (file)
--- a/mergecap.c
+++ b/mergecap.c
@@ -47,9 +47,10 @@
 #include "wsutil/wsgetopt.h"
 #endif
 
+#include "wsutil/strnatcmp.h"
+
 #define WS_BUILD_DLL
 #define RESET_SYMBOL_EXPORT /* wsutil/wsgetopt.h set export behavior above. */
-#include "epan/strnatcmp.h"
 #undef WS_BUILD_DLL
 #define RESET_SYMBOL_EXPORT
 

diff --git a/wsutil/CMakeLists.txt b/wsutil/CMakeLists.txt
index adeb364ea47dccfba917582f73440a145dea205c..086410143590e254dc1d96f41db62fd79f247763 100644 (file)
--- a/wsutil/CMakeLists.txt
+++ b/wsutil/CMakeLists.txt
@@ -49,6 +49,7 @@ set(WSUTIL_FILES
   mpeg-audio.c
   nstime.c
   privileges.c
+  strnatcmp.c
   str_util.c
   report_err.c
   tempfile.c

diff --git a/wsutil/Makefile.common b/wsutil/Makefile.common
index f334d5f95ba22c9a9db8a8d84b31404bfc62a3f8..dd15f9fb5158ed263952ee2152b6daef752b79b5 100644 (file)
--- a/wsutil/Makefile.common
+++ b/wsutil/Makefile.common
@@ -43,6 +43,7 @@ LIBWSUTIL_SRC =       \
        mpeg-audio.c    \
        nstime.c        \
        privileges.c    \
+       strnatcmp.c     \
        str_util.c      \
        report_err.c    \
        tempfile.c      \
@@ -63,6 +64,7 @@ LIBWSUTIL_INCLUDES =  \
        mpeg-audio.h    \
        nstime.h        \
        privileges.h    \
+       strnatcmp.h     \
        str_util.h      \
        report_err.h    \
        tempfile.h      \

diff --git a/epan/strnatcmp.c b/wsutil/strnatcmp.c
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from epan/strnatcmp.c
rename to wsutil/strnatcmp.c

diff --git a/epan/strnatcmp.h b/wsutil/strnatcmp.h
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from epan/strnatcmp.h
rename to wsutil/strnatcmp.h