diff options
| author | gianluca <gianluca> | 2008-04-11 16:44:17 +0000 |
|---|---|---|
| committer | gianluca <gianluca> | 2008-04-11 16:44:17 +0000 |
| commit | d4f209f4260398bb9dad3e17936ad29bb48f5dc7 (patch) | |
| tree | 6cbb4f96b4a13162b86727c68d72744a8098ad0b | |
| parent | 22894b40e411ba3c82cd75e466e785b780e70238 (diff) | |
| download | tcpdump-d4f209f4260398bb9dad3e17936ad29bb48f5dc7.tar.gz | |
Redefined ERROR into TFTP_ERROR, as ERROR is already defined in the
Microsoft header files.
| -rw-r--r-- | print-tftp.c | 6 | ||||
| -rw-r--r-- | tftp.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/print-tftp.c b/print-tftp.c index 6baf82ef..c4fc7ea2 100644 --- a/print-tftp.c +++ b/print-tftp.c @@ -23,7 +23,7 @@ #ifndef lint static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-tftp.c,v 1.38 2007-09-14 01:02:07 guy Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/print-tftp.c,v 1.38.2.1 2008-04-11 16:44:17 gianluca Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H @@ -50,7 +50,7 @@ static struct tok op2str[] = { { WRQ, "WRQ" }, /* write request */ { DATA, "DATA" }, /* data packet */ { ACK, "ACK" }, /* acknowledgement */ - { ERROR, "ERROR" }, /* error code */ + { TFTP_ERROR, "ERROR" }, /* error code */ { OACK, "OACK" }, /* option acknowledgement */ { 0, NULL } }; @@ -137,7 +137,7 @@ tftp_print(register const u_char *bp, u_int length) printf(" block %d", EXTRACT_16BITS(&tp->th_block)); break; - case ERROR: + case TFTP_ERROR: /* Print error code string */ TCHECK(tp->th_code); printf(" %s \"", tok2str(err2str, "tftp-err-#%d \"", @@ -1,4 +1,4 @@ -/* @(#) $Header: /tcpdump/master/tcpdump/tftp.h,v 1.1 2007-09-14 01:02:07 guy Exp $ (LBL) */ +/* @(#) $Header: /tcpdump/master/tcpdump/tftp.h,v 1.1.4.1 2008-04-11 16:44:17 gianluca Exp $ (LBL) */ /* * Copyright (c) 1983, 1993 * The Regents of the University of California. All rights reserved. @@ -49,7 +49,7 @@ #define WRQ 02 /* write request */ #define DATA 03 /* data packet */ #define ACK 04 /* acknowledgement */ -#define ERROR 05 /* error code */ +#define TFTP_ERROR 05 /* error code */ #define OACK 06 /* option acknowledgement */ struct tftphdr { |