Clean up some ANSI C nits pointed out by "gcc -pedantic".

svn path=/trunk/; revision=1060

3 files changed, 6 insertions, 13 deletions

diff --git a/file.h b/file.h
index 839af0855f..4443e6704c 100644
--- a/file.h
+++ b/file.h
@@ -1,7 +1,7 @@
 /* file.h
  * Definitions for file structures and routines
  *
- * $Id: file.h,v 1.52 1999/11/08 01:03:32 guy Exp $
+ * $Id: file.h,v 1.53 1999/11/18 21:04:54 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -60,12 +60,6 @@
 #define file_read(buf, bsize, count, file) gzread((file),(buf),((count)*(bsize)))
 #define file_write(buf, bsize, count, file) gzwrite((file),(buf),((count)*(bsize)))
 #define file_close gzclose
-static inline int file_error(void *fh) {
-    int errnum;
-    gzerror(fh, &errnum);
-    if (errnum<0) return errnum;
-    return 0;
-}
 
 #else /* No zLib */
 #define FILE_T FILE *
@@ -75,7 +69,6 @@ static inline int file_error(void *fh) {
 #define file_read fread
 #define file_write fwrite
 #define file_close fclose
-#define file_error ferror
 #endif /* HAVE_LIBZ */
 
 typedef struct bpf_program bpf_prog;
diff --git a/follow.c b/follow.c
index e24b495eb8..4122db74a3 100644
--- a/follow.c
+++ b/follow.c
@@ -1,6 +1,6 @@
 /* follow.c
  *
- * $Id: follow.c,v 1.16 1999/10/22 07:17:29 guy Exp $
+ * $Id: follow.c,v 1.17 1999/11/18 21:04:53 guy Exp $
  *
  * Copyright 1998 Mike Hall <mlh@io.com>
  *
@@ -54,7 +54,7 @@ static guint32 ip_address[2];
 static u_int   tcp_port[2];
 
 static int check_fragments( int );
-static void write_packet_data( const u_char *, int );
+static void write_packet_data( const char *, int );
 
 /* this will build libpcap filter text that will only 
    pass the packets related to the stream. There is a 
@@ -262,7 +262,7 @@ reset_tcp_reassembly() {
 }
 
 static void 
-write_packet_data( const u_char* data, int length ) {
+write_packet_data( const char* data, int length ) {
   fwrite( data, 1, length, data_out_file );
 }
   
diff --git a/packet-icq.c b/packet-icq.c
index 36abd8f527..3081697d2c 100644
--- a/packet-icq.c
+++ b/packet-icq.c
@@ -1,7 +1,7 @@
 /* packet-icq.c
  * Routines for ICQ packet disassembly
  *
- * $Id: packet-icq.c,v 1.6 1999/11/16 11:42:32 guy Exp $
+ * $Id: packet-icq.c,v 1.7 1999/11/18 21:04:53 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Johan Feyaerts
@@ -395,7 +395,7 @@ static char*
 findSubCmd(int num)
 {
     return findcmd(serverMetaSubCmdCode, num);
-};
+}
 
 static char*
 findClientCmd(int num)