aboutsummaryrefslogtreecommitdiffstats
path: root/epan/timestamp.h
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2004-01-19 23:03:20 +0000
committerGuy Harris <guy@alum.mit.edu>2004-01-19 23:03:20 +0000
commitd4ab584f0fd1a82cbd0f5aba36be863fc219868d (patch)
treee8877f13235bce4ddd52cb7e56a510db8e6faf34 /epan/timestamp.h
parent439159f73da4deff6aa2adbafa5be34f3617c333 (diff)
Move "ts_type_text" out of "epan/timestamp.h into "gtk/recent.c", as
it's only used in the latter; that avoids lots of warnings about "ts_type_text" being defined but not used in other source files that include "epan/timestamp.h". (If it's going to be used in more than one file, make it non-static and declare it "extern" in "epan/timestamp.h".) Define TS_NOT_SET as ((ts_type)-1), and use that when initializing "timestamp_type" in Ethereal and when checking to see whether "timestamp_type" was set, to avoid signed vs. unsigned comparison warnings. Clean up indentation. svn path=/trunk/; revision=9740
Diffstat (limited to 'epan/timestamp.h')
-rw-r--r--epan/timestamp.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/epan/timestamp.h b/epan/timestamp.h
index 291b71feb2..38f28ac507 100644
--- a/epan/timestamp.h
+++ b/epan/timestamp.h
@@ -1,13 +1,12 @@
/* timestamp.h
* Defines for packet timestamps
*
- * $Id: timestamp.h,v 1.3 2004/01/19 03:46:42 ulfl Exp $
+ * $Id: timestamp.h,v 1.4 2004/01/19 23:03:19 guy Exp $
*
* Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
* Copyright 1998 Gerald Combs
*
- *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
@@ -26,7 +25,6 @@
#ifndef __TIMESTAMP_H__
#define __TIMESTAMP_H__
-
/*
* Type of time-stamp shown in the summary display.
*/
@@ -37,10 +35,12 @@ typedef enum {
TS_DELTA
} ts_type;
-extern ts_type timestamp_type;
-
-static char *ts_type_text[] =
- { "RELATIVE", "ABSOLUTE", "ABSOLUTE_WITH_DATE", "DELTA", NULL };
+/*
+ * Special value used for the command-line setting in Ethereal, to indicate
+ * that no value has been set from the command line.
+ */
+#define TS_NOT_SET ((ts_type)-1)
+extern ts_type timestamp_type;
#endif /* timestamp.h */