X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/2d6231deeb914bf37b13c0948e4433f5cea33969..1c05c2ce1d889dcee4bc4cf5b729018df88c8ad8:/util.c

diff --git a/util.c b/util.c
index 7f1840dd..47d7a136 100644
--- a/util.c
+++ b/util.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/util.c,v 1.91 2004-04-28 22:06:33 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/util.c,v 1.95.2.1 2005-04-25 16:15:07 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -116,19 +116,25 @@ ts_print(register const struct timeval *tvp)
 	static unsigned b_sec;
 	static unsigned b_usec;
 
-	switch(tflag) {
-	case 1: /* Default */
+	switch (tflag) {
+
+	case 0: /* Default */
 		s = (tvp->tv_sec + thiszone) % 86400;
 		(void)printf("%02d:%02d:%02d.%06u ",
 			     s / 3600, (s % 3600) / 60, s % 60,
 			     (unsigned)tvp->tv_usec);
 		break;
-	case -1: /* Unix timeval style */
+
+	case 1: /* No time stamp */
+		break;
+
+	case 2: /* Unix timeval style */
 		(void)printf("%u.%06u ",
 			     (unsigned)tvp->tv_sec,
 			     (unsigned)tvp->tv_usec);
 		break;
-	case -2:
+
+	case 3: /* Microseconds since previous packet */
 		if (b_sec == 0) {
 			printf("000000 ");
 		} else {
@@ -146,7 +152,8 @@ ts_print(register const struct timeval *tvp)
 		b_sec = tvp->tv_sec;
 		b_usec = tvp->tv_usec;
 		break;
-	case -3: /* Default + Date*/
+
+	case 4: /* Default + Date*/
 		s = (tvp->tv_sec + thiszone) % 86400;
 		Time = (tvp->tv_sec + thiszone) - s;
 		tm = gmtime (&Time);
@@ -205,6 +212,27 @@ print_unknown_data(const u_char *cp,const char *ident,int len)
 	return(1); /* everything is ok */
 }
 
+/*
+ * Convert a token value to a string; use "fmt" if not found.
+ */
+const char *
+tok2strbuf(register const struct tok *lp, register const char *fmt,
+	   register int v, char *buf, size_t bufsize)
+{
+	if (lp != NULL) {
+		while (lp->s != NULL) {
+			if (lp->v == v)
+				return (lp->s);
+			++lp;
+		}
+	}
+	if (fmt == NULL)
+		fmt = "#%d";
+
+	(void)snprintf(buf, bufsize, fmt, v);
+	return (const char *)buf;
+}
+
 /*
  * Convert a token value to a string; use "fmt" if not found.
  */
@@ -216,17 +244,9 @@ tok2str(register const struct tok *lp, register const char *fmt,
 	static int idx = 0;
 	char *ret;
 
-	while (lp->s != NULL) {
-		if (lp->v == v)
-			return (lp->s);
-		++lp;
-	}
-	if (fmt == NULL)
-		fmt = "#%d";
 	ret = buf[idx];
-	(void)snprintf(ret, sizeof(buf[0]), fmt, v);
 	idx = (idx+1) & 3;
-	return (ret);
+	return tok2strbuf(lp, fmt, v, ret, sizeof(buf[0]));
 }
 
 /*
@@ -235,14 +255,14 @@ tok2str(register const struct tok *lp, register const char *fmt,
  */
 char *
 bittok2str(register const struct tok *lp, register const char *fmt,
-	register int v)
+	   register int v)
 {
         static char buf[256]; /* our stringbuffer */
         int buflen=0;
         register int rotbit; /* this is the bit we rotate through all bitpositions */
         register int tokval;
 
-	while (lp->s != NULL) {
+	while (lp->s != NULL && lp != NULL) {
             tokval=lp->v;   /* load our first value */
             rotbit=1;
             while (rotbit != 0) {