diff options
| author | Jaap Keuter <jaap.keuter@xs4all.nl> | 2010-11-04 06:37:58 +0000 |
|---|---|---|
| committer | Jaap Keuter <jaap.keuter@xs4all.nl> | 2010-11-04 06:37:58 +0000 |
| commit | d6c7ebee866e72124d0e1f62e8c84570435a0b74 (patch) | |
| tree | b33faddded3ed67bdaaf7f2ef521ffbd7f250b91 /wiretap | |
| parent | 562eb76905beceb0e74b747810b671744af0dc3d (diff) | |
| download | wireshark-d6c7ebee866e72124d0e1f62e8c84570435a0b74.tar.gz wireshark-d6c7ebee866e72124d0e1f62e8c84570435a0b74.tar.bz2 wireshark-d6c7ebee866e72124d0e1f62e8c84570435a0b74.zip | |
From Alexis La Goutte:
Replace all *_min()/*_max() by MIN() and MAX().
svn path=/trunk/; revision=34770
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/erf.c | 5 | ||||
| -rw-r--r-- | wiretap/netscaler.c | 6 |
2 files changed, 2 insertions, 9 deletions
diff --git a/wiretap/erf.c b/wiretap/erf.c index ba31714f69..1562fb3d70 100644 --- a/wiretap/erf.c +++ b/wiretap/erf.c @@ -56,9 +56,6 @@ #include "atm.h" #include "erf.h" -#ifndef min -#define min(a, b) ((a) > (b) ? (b) : (a)) -#endif static int erf_read_header(FILE_T fh, struct wtap_pkthdr *phdr, @@ -447,7 +444,7 @@ static int erf_read_header(FILE_T fh, if (phdr != NULL) { phdr->len = g_htons(erf_header->wlen); - phdr->caplen = min( g_htons(erf_header->wlen), + phdr->caplen = MIN( g_htons(erf_header->wlen), g_htons(erf_header->rlen) - (guint32)sizeof(*erf_header) - skiplen ); } return TRUE; diff --git a/wiretap/netscaler.c b/wiretap/netscaler.c index 74cdeeda3b..f3e756f4ad 100644 --- a/wiretap/netscaler.c +++ b/wiretap/netscaler.c @@ -30,10 +30,6 @@ #include "buffer.h" #include "netscaler.h" -/* Defines imported from netscaler code: nstypes.h */ - -#define ns_min(a, b) ((a<b)?a:b) - /* Defines imported from netscaler code: nsperfrc.h */ #define NSPR_SIGSTR_V10 "NetScaler Performance Data" @@ -574,7 +570,7 @@ nspm_signature_version(wtap *wth, gchar *nstrace_buf, gint32 len) bytes_read = file_read(dp, 1, len, wth->fh); if (bytes_read == len) { - for ( ; len > (gint32)(ns_min(sizeof(NSPR_SIGSTR_V10), sizeof(NSPR_SIGSTR_V20))); dp++, len--) + for ( ; len > (gint32)(MIN(sizeof(NSPR_SIGSTR_V10), sizeof(NSPR_SIGSTR_V20))); dp++, len--) { #define sigv10p ((nspr_signature_v10_t*)dp) if ((pletohs(&sigv10p->nsprRecordType) == NSPR_SIGNATURE_V10) && |