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

1 files changed, 5 insertions, 6 deletions

diff --git a/epan/emem.c b/epan/emem.c
index 9d2dec4a4b..84cab06da2 100644
--- a/epan/emem.c
+++ b/epan/emem.c
@@ -44,7 +44,6 @@
 #include <glib.h>
 #include <proto.h>
 #include "emem.h"
-#include <wiretap/file_util.h>
 
 #ifdef _WIN32
 #include <windows.h>	/* VirtualAlloc, VirtualProtect */
@@ -1410,7 +1409,7 @@ emem_tree_lookup32_array(emem_tree_t *se_tree, emem_tree_key_t *key)
 
 
 /* Strings are stored as an array of uint32 containing the string characters
-   with 4 characters in each uint32. 
+   with 4 characters in each uint32.
    The first byte of the string is stored as the most significant byte.
    If the string is not a multiple of 4 characters in length the last
    uint32 containing the string bytes are padded with 0 bytes.
@@ -1445,7 +1444,7 @@ emem_tree_insert_string(emem_tree_t* se_tree, const gchar* k, void* v, guint32 f
 		if (i%4 == 3) {
 			aligned[i/4] = tmp;
 			tmp = 0;
-		}		
+		}
 	}
 	/* add required padding to the last uint32 */
 	if (i%4 != 0) {
@@ -1455,7 +1454,7 @@ emem_tree_insert_string(emem_tree_t* se_tree, const gchar* k, void* v, guint32 f
 		}
 		aligned[i/4-1] = tmp;
 	}
-	
+
 	/* add the terminator */
 	aligned[div-1] = 0x00000001;
 
@@ -1498,7 +1497,7 @@ emem_tree_lookup_string(emem_tree_t* se_tree, const gchar* k, guint32 flags)
 		if (i%4 == 3) {
 			aligned[i/4] = tmp;
 			tmp = 0;
-		}		
+		}
 	}
 	/* add required padding to the last uint32 */
 	if (i%4 != 0) {
@@ -1508,7 +1507,7 @@ emem_tree_lookup_string(emem_tree_t* se_tree, const gchar* k, guint32 flags)
 		}
 		aligned[i/4-1] = tmp;
 	}
-	
+
 	/* add the terminator */
 	aligned[div-1] = 0x00000001;