diff options
author | mcr <mcr> | 2004-04-29 02:15:16 +0000 |
---|---|---|
committer | mcr <mcr> | 2004-04-29 02:15:16 +0000 |
commit | 4217d3321a8a0830fed7e55ecf2dd89ffea210b9 (patch) | |
tree | 80ff574dd282a141fbb59450aac0c94d5af549f8 /util.c | |
parent | 6ed2536f5d3b193db656ef179412fa62dd6fd5f2 (diff) | |
download | tcpdump-4217d3321a8a0830fed7e55ecf2dd89ffea210b9.tar.gz |
merge error for tok2str.
Diffstat (limited to 'util.c')
-rw-r--r-- | util.c | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -21,7 +21,7 @@ #ifndef lint static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/util.c,v 1.92 2004-04-29 01:32:47 mcr Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/util.c,v 1.93 2004-04-29 02:15:16 mcr Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H @@ -235,6 +235,8 @@ tok2str(register const struct tok *lp, register const char *fmt, static int idx = 0; char *ret; + ret = buf[idx]; + idx = (idx+1) & 3; return tok2strbuf(lp, fmt, v, ret, sizeof(buf[0])); } @@ -244,7 +246,7 @@ 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; |