diff options
| author | Guy Harris <guy@alum.mit.edu> | 2008-06-23 21:06:42 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2008-06-23 21:06:42 +0000 |
| commit | 11848b9efe23535e5434033a81f0d4447aad7aa5 (patch) | |
| tree | ece0c86ba6606a6409bea92c37d4fa57ff6e1c54 | |
| parent | 3235c5b4f47ce35f6fb86d55fbb56e3d96a2c035 (diff) | |
Rename a variable to avoid collisions with the old V7 index() function,
still declared by <string.h> on some platforms (at least the way we
compile, with all sorts of non-ANSI C/non-POSIX stuff added).
svn path=/trunk/; revision=25551
| -rw-r--r-- | epan/crypt/airpdcap.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/crypt/airpdcap.c b/epan/crypt/airpdcap.c index 22e8aa4e04..409ad66f07 100644 --- a/epan/crypt/airpdcap.c +++ b/epan/crypt/airpdcap.c @@ -265,7 +265,7 @@ INT AirPDcapPacketProcess( { const UCHAR *address; AIRPDCAP_SEC_ASSOCIATION_ID id; - int index; + int sa_index; PAIRPDCAP_SEC_ASSOCIATION sa; int offset = 0; guint bodyLength; @@ -331,15 +331,15 @@ INT AirPDcapPacketProcess( } /* search for a cached Security Association for current BSSID and station MAC */ - if ((index=AirPDcapGetSa(ctx, &id))==-1) { + if ((sa_index=AirPDcapGetSa(ctx, &id))==-1) { /* create a new Security Association */ - if ((index=AirPDcapStoreSa(ctx, &id))==-1) { + if ((sa_index=AirPDcapStoreSa(ctx, &id))==-1) { return AIRPDCAP_RET_UNSUCCESS; } } /* get the Security Association structure */ - sa=&ctx->sa[index]; + sa=&ctx->sa[sa_index]; /* cache offset in the packet data (to scan encryption data) */ offset = mac_header_len; |