Rename "wiretap/file.c" to "wiretap/file_io.c", as some tools, such as

the MS Visual Studio debugger, get confused by two files with the same
name being in a program's source, even though they're in different
directories.

svn path=/trunk/; revision=8208

diff --git a/wiretap/Makefile.am b/wiretap/Makefile.am
index 3146df6991d806b0d0fc16a3d85a216c16c2580f..260fa38b9ed4290c049721585a1134d9a1508245 100644 (file)
--- a/wiretap/Makefile.am
+++ b/wiretap/Makefile.am
@@ -1,7 +1,7 @@
 # Makefile.am
 # Automake file for Wiretap
 #
-# $Id: Makefile.am,v 1.42 2003/07/29 19:42:00 guy Exp $
+# $Id: Makefile.am,v 1.43 2003/08/22 19:07:44 guy Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@ethereal.com>
@@ -49,7 +49,7 @@ libwiretap_a_SOURCES = \
        dbs-etherwatch.h        \
        etherpeek.c             \
        etherpeek.h             \
-       file.c                  \
+       file_io.c               \
        file_wrappers.c         \
        file_wrappers.h         \
        i4btrace.c              \

diff --git a/wiretap/Makefile.nmake b/wiretap/Makefile.nmake
index a8ae6a393a868630eb18c78daa9134d2b7167114..d86d0687dbb180b8db276a038258e10aabb8df0f 100644 (file)
--- a/wiretap/Makefile.nmake
+++ b/wiretap/Makefile.nmake
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.nmake,v 1.31 2003/07/29 19:42:01 guy Exp $
+# $Id: Makefile.nmake,v 1.32 2003/08/22 19:07:44 guy Exp $
 #
 
 include ..\config.nmake
@@ -22,7 +22,7 @@ OBJECTS=ascend-grammar.obj \
        csids.obj \
        dbs-etherwatch.obj \
        etherpeek.obj \
-       file.obj \
+       file_io.obj \
        file_wrappers.obj \
        i4btrace.obj \
        iptrace.obj \

diff --git a/wiretap/file.c b/wiretap/file_io.c
similarity index 99%
rename from wiretap/file.c
rename to wiretap/file_io.c
index aa81a8db94f45b821b382193ebd6e49e830c4d8e..59325122c49c6db04935521e9b2cb21cdb6186af 100644 (file)
--- a/wiretap/file.c
+++ b/wiretap/file_io.c
@@ -1,6 +1,6 @@
-/* file.c
+/* file_io.c
  *
- * $Id: file.c,v 1.100 2003/07/29 19:42:01 guy Exp $
+ * $Id: file_io.c,v 1.1 2003/08/22 19:07:45 guy Exp $
  *
  * Wiretap Library
  * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>