Move tempfile.{h,c} into wsutil.

svn path=/trunk/; revision=50163

20 files changed, 19 insertions, 30 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f2026f60e4..e7fa4b2a62 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -780,7 +780,6 @@ if( (BUILD_wireshark AND GTK_FOUND) OR (BUILD_qtshark AND QT_FOUND) )
 		merge.c
 		proto_hier_stats.c
 		summary.c
-		tempfile.c
 		u3.c
 		ws80211_utils.c
 		${SHARK_COMMON_CAPTURE_SRC}
@@ -848,7 +847,6 @@ if(BUILD_tshark)
 	set(tshark_FILES
 		capture_opts.c
 		capture_sync.c
-		tempfile.c
 		tshark-tap-register.c
 		tshark.c
 		ui/util.c
@@ -1035,7 +1033,6 @@ if(BUILD_dumpcap AND PCAP_FOUND)
 		pcapio.c
 		ringbuffer.c
 		sync_pipe_write.c
-		tempfile.c
 		version_info.c
 		ws80211_utils.c
 		${PLATFORM_SRC}
diff --git a/Makefile.common b/Makefile.common
index 6e3b3572c6..f86b4a3034 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -79,7 +79,6 @@ SHARK_COMMON_INCLUDES =	\
 	print.h			\
 	ps.h			\
 	register.h		\
-	tempfile.h		\
 	tap-megaco-common.h	\
 	tap-rtp-common.h	\
 	version_info.h		\
@@ -116,7 +115,6 @@ WIRESHARK_COMMON_SRC =	\
 	merge.c		\
 	proto_hier_stats.c	\
 	summary.c	\
-	tempfile.c	\
 	u3.c		\
 	ws80211_utils.c
 
@@ -146,7 +144,6 @@ tshark_SOURCES =	\
 	$(SHARK_COMMON_SRC)	\
 	$(SHARK_COMMON_CAPTURE_SRC) \
 	capture_opts.c		\
-	tempfile.c		\
 	tshark.c
 
 # rawshark specifics
@@ -207,7 +204,6 @@ dumpcap_SOURCES =	\
 	pcapio.c	\
 	ringbuffer.c	\
 	sync_pipe_write.c	\
-	tempfile.c	\
 	version_info.c	\
 	ws80211_utils.c
 
diff --git a/dumpcap.c b/dumpcap.c
index 286c3e457f..cda32a6ebd 100644
--- a/dumpcap.c
+++ b/dumpcap.c
@@ -117,7 +117,7 @@
 #include "conditions.h"
 #include "capture_stop_conditions.h"
 
-#include "tempfile.h"
+#include "wsutil/tempfile.h"
 #include "log.h"
 #include "wsutil/file_util.h"
 
diff --git a/dumpcap.vcproj b/dumpcap.vcproj
index 57dadb63fa..1988686955 100644
--- a/dumpcap.vcproj
+++ b/dumpcap.vcproj
@@ -105,10 +105,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\tempfile.c"
-				>
-			</File>
-			<File
 				RelativePath=".\epan\unicode-utils.c"
 				>
 			</File>
@@ -171,10 +167,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\tempfile.h"
-				>
-			</File>
-			<File
 				RelativePath=".\epan\unicode-utils.h"
 				>
 			</File>
diff --git a/file.c b/file.c
index 8aeb3fa14e..8e4984038b 100644
--- a/file.c
+++ b/file.c
@@ -55,7 +55,7 @@
 #include "print.h"
 #include "file.h"
 #include "fileset.h"
-#include "tempfile.h"
+#include "wsutil/tempfile.h"
 #include "merge.h"
 
 #include <epan/prefs.h>
diff --git a/ui/cli/tap-follow.c b/ui/cli/tap-follow.c
index 0e6262c788..71ddd5898f 100644
--- a/ui/cli/tap-follow.c
+++ b/ui/cli/tap-follow.c
@@ -46,7 +46,7 @@
 #include <epan/tvbuff-int.h>
 
 #include "wsutil/file_util.h"
-#include "tempfile.h"
+#include "wsutil/tempfile.h"
 
 #ifdef SSL_PLUGIN
 #include "packet-ssl-utils.h"
diff --git a/ui/gtk/export_pdu_dlg.c b/ui/gtk/export_pdu_dlg.c
index 03e96b7c65..f3e334434c 100644
--- a/ui/gtk/export_pdu_dlg.c
+++ b/ui/gtk/export_pdu_dlg.c
@@ -30,7 +30,7 @@
 #include "wtap.h"
 #include "pcap-encap.h"
 #include "version_info.h"
-#include "tempfile.h"
+#include "wsutil/tempfile.h"
 
 #include <epan/tap.h>
 #include <epan/exported_pdu.h>
diff --git a/ui/gtk/file_import_dlg.c b/ui/gtk/file_import_dlg.c
index fe4938385a..68990f4f7d 100644
--- a/ui/gtk/file_import_dlg.c
+++ b/ui/gtk/file_import_dlg.c
@@ -49,7 +49,7 @@
 
 #include "file.h"
 #include "wsutil/file_util.h"
-#include "tempfile.h"
+#include "wsutil/tempfile.h"
 
 #define INPUT_FRM_KEY                   "input_frame"
 
diff --git a/ui/gtk/follow_stream.c b/ui/gtk/follow_stream.c
index c00839696a..f65ffe4b12 100644
--- a/ui/gtk/follow_stream.c
+++ b/ui/gtk/follow_stream.c
@@ -60,7 +60,7 @@
 #include "ui/gtk/old-gtk-compat.h"
 
 #ifdef _WIN32
-#include "../tempfile.h"
+#include "wsutil/tempfile.h"
 #include "ui/win32/print_win32.h"
 #endif
 
diff --git a/ui/gtk/follow_tcp.c b/ui/gtk/follow_tcp.c
index b079646195..1ad1cc8bce 100644
--- a/ui/gtk/follow_tcp.c
+++ b/ui/gtk/follow_tcp.c
@@ -50,7 +50,7 @@
 #include "ui/alert_box.h"
 #include "ui/simple_dialog.h"
 #include "ui/utf8_entities.h"
-#include "../tempfile.h"
+#include "wsutil/tempfile.h"
 #include <wsutil/file_util.h>
 
 #include "gtkglobals.h"
diff --git a/ui/gtk/hostlist_table.c b/ui/gtk/hostlist_table.c
index 8e6138b6a2..350eeb57ff 100644
--- a/ui/gtk/hostlist_table.c
+++ b/ui/gtk/hostlist_table.c
@@ -50,7 +50,7 @@
 #include "ui/simple_dialog.h"
 #include "ui/alert_box.h"
 #include "ui/utf8_entities.h"
-#include "../tempfile.h"
+#include "wsutil/tempfile.h"
 
 #include "ui/gtk/hostlist_table.h"
 #include "ui/gtk/filter_utils.h"
diff --git a/ui/gtk/iax2_analysis.c b/ui/gtk/iax2_analysis.c
index 81000bd629..d412eda5b5 100644
--- a/ui/gtk/iax2_analysis.c
+++ b/ui/gtk/iax2_analysis.c
@@ -65,7 +65,7 @@
 #include "ui/util.h"
 #include "../g711.h"
 #include "../stat_menu.h"
-#include "../tempfile.h"
+#include "wsutil/tempfile.h"
 
 #include "ui/alert_box.h"
 #include "ui/last_open_dir.h"
diff --git a/ui/gtk/print_dlg.c b/ui/gtk/print_dlg.c
index 218f1fe7d8..bfbb640eec 100644
--- a/ui/gtk/print_dlg.c
+++ b/ui/gtk/print_dlg.c
@@ -53,7 +53,7 @@
 #include <windows.h>
 #include "ui/win32/file_dlg_win32.h"
 #include "ui/win32/print_win32.h"
-#include "tempfile.h"
+#include "wsutil/tempfile.h"
 #endif
 
 /* dialog output action */
diff --git a/ui/gtk/rtp_analysis.c b/ui/gtk/rtp_analysis.c
index f8ac025b24..5bd3f49558 100644
--- a/ui/gtk/rtp_analysis.c
+++ b/ui/gtk/rtp_analysis.c
@@ -63,7 +63,7 @@
 #include "ui/util.h"
 #include "../g711.h"
 #include "../stat_menu.h"
-#include "../tempfile.h"
+#include "wsutil/tempfile.h"
 
 #include "ui/alert_box.h"
 #include "ui/last_open_dir.h"
diff --git a/ui/qt/QtShark.pro b/ui/qt/QtShark.pro
index fe710a9451..d5474a8fdd 100644
--- a/ui/qt/QtShark.pro
+++ b/ui/qt/QtShark.pro
@@ -187,7 +187,6 @@ SOURCES_WS_C = \
     ../../sync_pipe_write.c       \
     ../../tap-megaco-common.c     \
     ../../tap-rtp-common.c    \
-    ../../tempfile.c      \
     ../../u3.c \
     ../../version_info.c
 
diff --git a/ui/qt/import_text_dialog.cpp b/ui/qt/import_text_dialog.cpp
index 3612b3a263..a234f7cbc9 100644
--- a/ui/qt/import_text_dialog.cpp
+++ b/ui/qt/import_text_dialog.cpp
@@ -39,7 +39,7 @@
 
 #include "file.h"
 #include "wsutil/file_util.h"
-#include "tempfile.h"
+#include "wsutil/tempfile.h"
 
 #include <ui_import_text_dialog.h>
 #include <wireshark_application.h>
diff --git a/wsutil/CMakeLists.txt b/wsutil/CMakeLists.txt
index 569f3b86a9..0437d7c7df 100644
--- a/wsutil/CMakeLists.txt
+++ b/wsutil/CMakeLists.txt
@@ -50,6 +50,7 @@ set(WSUTIL_FILES
   nstime.c
   privileges.c
   str_util.c
+  tempfile.c
   type_util.c
   ${WSUTIL_PLATFORM_FILES}
 )
diff --git a/wsutil/Makefile.common b/wsutil/Makefile.common
index 5fc9a426ba..e930e69aa5 100644
--- a/wsutil/Makefile.common
+++ b/wsutil/Makefile.common
@@ -44,6 +44,7 @@ LIBWSUTIL_SRC = 	\
 	nstime.c	\
 	privileges.c	\
 	str_util.c	\
+	tempfile.c	\
 	type_util.c
 
 # Header files that are not generated from other files
@@ -62,4 +63,5 @@ LIBWSUTIL_INCLUDES = 	\
 	nstime.h	\
 	privileges.h	\
 	str_util.h	\
+	tempfile.h	\
 	type_util.h
diff --git a/tempfile.c b/wsutil/tempfile.c
index 2fab0df257..2fab0df257 100644
--- a/tempfile.c
+++ b/wsutil/tempfile.c
diff --git a/tempfile.h b/wsutil/tempfile.h
index c39af9f3ea..65746704dd 100644
--- a/tempfile.h
+++ b/wsutil/tempfile.h
@@ -25,6 +25,8 @@
 #ifndef __TEMPFILE_H__
 #define __TEMPFILE_H__
 
+#include "ws_symbol_export.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
@@ -43,7 +45,7 @@ extern "C" {
  * @param pfx A prefix for the temporary file.
  * @return The file descriptor of the new tempfile, from mkstemp().
  */
-int create_tempfile(char **namebuf, const char *pfx);
+WS_DLL_PUBLIC int create_tempfile(char **namebuf, const char *pfx);
 
 /**
  * Create a directory with the given prefix (e.g. "wireshark"). The path
@@ -55,7 +57,7 @@ int create_tempfile(char **namebuf, const char *pfx);
  * @return The temporary directory path on success, or NULL on failure.
  *         Must NOT be freed.
  */
-const char *create_tempdir(char **namebuf, const char *pfx);
+WS_DLL_PUBLIC const char *create_tempdir(char **namebuf, const char *pfx);
 
 #ifdef __cplusplus
 }