diff options
| author | Jeff Morriss <jeff.morriss@ulticom.com> | 2008-05-22 15:46:27 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2008-05-22 15:46:27 +0000 |
| commit | a5cee04fad8ca23a2f3a3ac5b5233ca6b01fe71e (patch) | |
| tree | 65a7d5c702bf3392494b33ddd7ed43c94e491670 /plugins/asn1 | |
| parent | da2f447a9bda3a05dd8e61b1c1f5dea4b5912f6b (diff) | |
Move the file utility functions from wiretap to libwsutil so that
libwireshark (and the plugins using those functions) do not depend on
wiretap on Windows.
While doing that, rename the eth_* functions to ws_*.
svn path=/trunk/; revision=25354
Diffstat (limited to 'plugins/asn1')
| -rw-r--r-- | plugins/asn1/Makefile.nmake | 10 | ||||
| -rw-r--r-- | plugins/asn1/packet-asn1.c | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/plugins/asn1/Makefile.nmake b/plugins/asn1/Makefile.nmake index b5e4e84d9b..2902af11b1 100644 --- a/plugins/asn1/Makefile.nmake +++ b/plugins/asn1/Makefile.nmake @@ -9,16 +9,16 @@ include moduleinfo.nmake include Makefile.common -CFLAGS=/WX /DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \ +CFLAGS=/WX /DHAVE_CONFIG_H /I../.. $(GLIB_CFLAGS) \ /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS) .c.obj:: $(CC) $(CFLAGS) -Fd.\ -c $< - + LDFLAGS = $(PLUGIN_LDFLAGS) !IFDEF ENABLE_LIBWIRESHARK -LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib ..\..\wiretap\wiretap-$(WTAP_VERSION).lib +LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib ..\..\wsutil\libwsutil.lib CFLAGS=/DHAVE_WIN32_LIBWIRESHARK_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS) DISSECTOR_OBJECTS = $(DISSECTOR_SRC:.c=.obj) @@ -93,12 +93,12 @@ plugin.c: $(DISSECTOR_SRC) moduleinfo.h ../../tools/make-dissector-reg clean: rm -f $(OBJECTS) $(RESOURCE) plugin.c *.pdb \ $(PLUGIN_NAME).dll $(PLUGIN_NAME).dll.manifest $(PLUGIN_NAME).lib \ - $(PLUGIN_NAME).exp $(PLUGIN_NAME).rc + $(PLUGIN_NAME).exp $(PLUGIN_NAME).rc distclean: clean maintainer-clean: distclean -checkapi: +checkapi: # TODO: Fix api's :) # $(PERL) ../../tools/checkAPIs.pl $(DISSECTOR_SRC) diff --git a/plugins/asn1/packet-asn1.c b/plugins/asn1/packet-asn1.c index 7d8ad9524e..98789ff5da 100644 --- a/plugins/asn1/packet-asn1.c +++ b/plugins/asn1/packet-asn1.c @@ -85,7 +85,7 @@ #include <epan/dissectors/packet-tcp.h> #include <epan/oids.h> #include <plugins/asn1/asn1.h> -#include <wiretap/file_util.h> +#include <wsutil/file_util.h> #ifdef DISSECTOR_WITH_GUI #include <gtk/gtk.h> @@ -2797,7 +2797,7 @@ static char eol[] = "\r\n"; (void) log_domain; (void) log_level; (void) user_data; /* make references */ if (logf == NULL && asn1_logfile) { - logf = eth_fopen(asn1_logfile, "w"); + logf = ws_fopen(asn1_logfile, "w"); } if (logf) { fputs(message, logf); @@ -2818,7 +2818,7 @@ read_asn1_type_table(const char *filename) if ((filename == 0) || (strlen(filename) == 0)) return; /* no filename provided */ - f = eth_fopen(filename, "rb"); + f = ws_fopen(filename, "rb"); if (f == 0) { /* * Ignore "file not found" errors if it's the old default @@ -3929,7 +3929,7 @@ create_message_window(void) model = gtk_tree_store_new(N_COLUMNS, G_TYPE_STRING, G_TYPE_INT, G_TYPE_INT, G_TYPE_STRING, G_TYPE_STRING); - namelist = eth_fopen("namelist.txt", "w"); + namelist = ws_fopen("namelist.txt", "w"); build_tree_view(model, PDUtree, NULL); fclose(namelist); namelist = 0; |