diff options
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | capture.c | 4 | ||||
| -rw-r--r-- | colors.c | 4 | ||||
| -rw-r--r-- | file.c | 6 | ||||
| -rw-r--r-- | filter.c | 4 | ||||
| -rw-r--r-- | follow.c | 4 | ||||
| -rw-r--r-- | gtk/Makefile.am | 6 | ||||
| -rw-r--r-- | gtk/main.c (renamed from ethereal.c) | 10 | ||||
| -rw-r--r-- | gtk/main.h (renamed from ethereal.h) | 12 | ||||
| -rw-r--r-- | gtk/menu.c | 4 | ||||
| -rw-r--r-- | gtk/proto_draw.c (renamed from gtkpacket.c) | 8 | ||||
| -rw-r--r-- | gtk/proto_draw.h (renamed from gtkpacket.h) | 2 | ||||
| -rw-r--r-- | prefs.c | 4 | ||||
| -rw-r--r-- | print.c | 3 | ||||
| -rw-r--r-- | resolv.c | 4 | ||||
| -rw-r--r-- | summary.c | 4 |
16 files changed, 35 insertions, 48 deletions
diff --git a/Makefile.am b/Makefile.am index b6f7d72cad..9a5108c4f3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -22,8 +22,6 @@ ethereal_SOURCES = \ dfilter.h \ display.c \ display.h \ - ethereal.c \ - ethereal.h \ ethertype.c \ etypes.h \ file.c \ @@ -33,8 +31,6 @@ ethereal_SOURCES = \ follow.c \ follow.h \ globals.h \ - gtkpacket.c \ - gtkpacket.h \ packet-aarp.c \ packet-arp.c \ packet-atalk.c \ @@ -1,7 +1,7 @@ /* capture.c * Routines for packet capture windows * - * $Id: capture.c,v 1.64 1999/09/08 05:41:25 guy Exp $ + * $Id: capture.c,v 1.65 1999/09/09 02:42:22 gram Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -77,7 +77,7 @@ # include <sys/sockio.h> #endif -#include "ethereal.h" +#include "gtk/main.h" #include "packet.h" #include "file.h" #include "gtk/menu.h" @@ -1,7 +1,7 @@ /* colors.c * Definitions for color structures and routines * - * $Id: colors.c,v 1.6 1999/08/28 23:47:41 gram Exp $ + * $Id: colors.c,v 1.7 1999/09/09 02:42:23 gram Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -36,7 +36,7 @@ #include <errno.h> #include <sys/types.h> -#include "ethereal.h" +#include "gtk/main.h" #include "packet.h" #include "colors.h" #include "file.h" @@ -1,7 +1,7 @@ /* file.c * File I/O routines * - * $Id: file.c,v 1.86 1999/09/01 03:04:10 gram Exp $ + * $Id: file.c,v 1.87 1999/09/09 02:42:24 gram Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -68,14 +68,14 @@ # include <netinet/in.h> #endif -#include "ethereal.h" +#include "gtk/main.h" #include "column.h" #include "gtk/menu.h" #include "packet.h" #include "print.h" #include "file.h" #include "util.h" -#include "gtkpacket.h" +#include "gtk/proto_draw.h" #include "dfilter.h" #include "timestamp.h" @@ -1,7 +1,7 @@ /* filter.c * Routines for managing filter sets * - * $Id: filter.c,v 1.15 1999/09/01 03:04:11 gram Exp $ + * $Id: filter.c,v 1.16 1999/09/09 02:42:25 gram Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -40,7 +40,7 @@ #include <direct.h> #endif -#include "ethereal.h" +#include "gtk/main.h" #include "filter.h" #include "packet.h" #include "file.h" @@ -1,6 +1,6 @@ /* follow.c * - * $Id: follow.c,v 1.14 1999/07/31 13:55:16 deniel Exp $ + * $Id: follow.c,v 1.15 1999/09/09 02:42:25 gram Exp $ * * Copyright 1998 Mike Hall <mlh@io.com> * @@ -42,7 +42,7 @@ #endif #include <glib.h> -#include "ethereal.h" +#include "gtk/main.h" #include "packet.h" #include "follow.h" diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 50241b3c5a..0db778dea6 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -12,8 +12,12 @@ libui_a_SOURCES = \ gtkdnd.h \ gtkmain.h \ keys.h \ + main.c \ + main.h \ menu.c \ menu.h \ print_dlg.c \ print_prefs.c \ - print_prefs.h + print_prefs.h \ + proto_draw.c \ + proto_draw.h diff --git a/ethereal.c b/gtk/main.c index aedba45b55..a8f80a555d 100644 --- a/ethereal.c +++ b/gtk/main.c @@ -1,6 +1,6 @@ /* ethereal.c * - * $Id: ethereal.c,v 1.110 1999/09/01 03:04:09 gram Exp $ + * $Id: main.c,v 1.1 1999/09/09 02:42:39 gram Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -79,22 +79,22 @@ #include "strerror.h" #endif -#include "ethereal.h" +#include "main.h" #include "timestamp.h" #include "packet.h" #include "capture.h" #include "summary.h" #include "file.h" -#include "gtk/menu.h" +#include "menu.h" #include "prefs.h" #include "column.h" #include "print.h" #include "resolv.h" #include "follow.h" #include "util.h" -#include "gtkpacket.h" +#include "proto_draw.h" #include "dfilter.h" -#include "gtk/keys.h" +#include "keys.h" FILE *data_out_file = NULL; packet_info pi; diff --git a/ethereal.h b/gtk/main.h index 049bc7380c..ba314ef30f 100644 --- a/ethereal.h +++ b/gtk/main.h @@ -1,7 +1,7 @@ /* ethereal.h * Global defines, etc. * - * $Id: ethereal.h,v 1.23 1999/08/28 01:51:58 guy Exp $ + * $Id: main.h,v 1.1 1999/09/09 02:42:40 gram Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -62,16 +62,6 @@ #define BYTE_ORDER LITTLE_ENDIAN #endif #endif - -/* From the K&R book, p. 89 */ -#ifndef MAX - #define MAX(x, y) ((x) > (y) ? (x) : (y)) -#endif - -#ifndef MIN - #define MIN(x, y) ((x) < (y) ? (x) : (y)) -#endif - typedef struct _selection_info { GtkWidget *tree; diff --git a/gtk/menu.c b/gtk/menu.c index 97a37883d1..7bd8089958 100644 --- a/gtk/menu.c +++ b/gtk/menu.c @@ -1,7 +1,7 @@ /* menu.c * Menu routines * - * $Id: menu.c,v 1.1 1999/09/01 03:04:23 gram Exp $ + * $Id: menu.c,v 1.2 1999/09/09 02:42:40 gram Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -36,7 +36,7 @@ # include <sys/types.h> #endif -#include "ethereal.h" +#include "main.h" #include "menu.h" #include "packet.h" #include "capture.h" diff --git a/gtkpacket.c b/gtk/proto_draw.c index 2b81e5d6d7..80f53bc534 100644 --- a/gtkpacket.c +++ b/gtk/proto_draw.c @@ -1,7 +1,7 @@ /* gtkpacket.c * Routines for GTK+ packet display * - * $Id: gtkpacket.c,v 1.6 1999/07/07 22:51:39 gram Exp $ + * $Id: proto_draw.c,v 1.1 1999/09/09 02:42:40 gram Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -41,12 +41,10 @@ #endif #include <stdio.h> -#include "ethereal.h" +#include "main.h" #include "packet.h" -#ifndef __GTKPACKET_H__ -#include "gtkpacket.h" -#endif +#include "proto_draw.h" #define BYTE_VIEW_WIDTH 16 #define BYTE_VIEW_SEP 8 diff --git a/gtkpacket.h b/gtk/proto_draw.h index 3344aa9fe3..e2f95fa500 100644 --- a/gtkpacket.h +++ b/gtk/proto_draw.h @@ -1,7 +1,7 @@ /* gtkpacket.h * Definitions for GTK+ packet display structures and routines * - * $Id: gtkpacket.h,v 1.2 1999/07/07 22:51:39 gram Exp $ + * $Id: proto_draw.h,v 1.1 1999/09/09 02:42:40 gram Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -1,7 +1,7 @@ /* prefs.c * Routines for handling preferences * - * $Id: prefs.c,v 1.20 1999/09/01 03:04:12 gram Exp $ + * $Id: prefs.c,v 1.21 1999/09/09 02:42:25 gram Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -47,7 +47,7 @@ #include <sys/stat.h> -#include "ethereal.h" +#include "gtk/main.h" #include "packet.h" #include "file.h" #include "prefs.h" @@ -1,7 +1,7 @@ /* print.c * Routines for printing packet analysis trees. * - * $Id: print.c,v 1.17 1999/09/01 03:04:12 gram Exp $ + * $Id: print.c,v 1.18 1999/09/09 02:42:25 gram Exp $ * * Gilbert Ramirez <gram@verdict.uthscsa.edu> * @@ -37,7 +37,6 @@ # include <sys/types.h> #endif -/*#include "ethereal.h"*/ #include "packet.h" #include "prefs.h" #include "print.h" @@ -1,7 +1,7 @@ /* resolv.c * Routines for network object lookup * - * $Id: resolv.c,v 1.8 1999/07/13 02:52:58 gram Exp $ + * $Id: resolv.c,v 1.9 1999/09/09 02:42:26 gram Exp $ * * Laurent Deniel <deniel@worldnet.fr> * @@ -67,7 +67,7 @@ # include <setjmp.h> #endif -#include "ethereal.h" +#include "gtk/main.h" #include "packet.h" #include "packet-ipv6.h" #include "resolv.h" @@ -1,7 +1,7 @@ /* summary.c * Routines for capture file summary window * - * $Id: summary.c,v 1.11 1999/09/01 03:04:12 gram Exp $ + * $Id: summary.c,v 1.12 1999/09/09 02:42:26 gram Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -55,7 +55,7 @@ # include <sys/sockio.h> #endif -#include "ethereal.h" +#include "gtk/main.h" #include "packet.h" #include "file.h" #include "summary.h" |