From 2874c802a07bd22eb0d8c130ea201dfb576f35b9 Mon Sep 17 00:00:00 2001 From: guy Date: Mon, 23 Jun 2008 21:06:42 +0000 Subject: Rename a variable to avoid collisions with the old V7 index() function, still declared by on some platforms (at least the way we compile, with all sorts of non-ANSI C/non-POSIX stuff added). git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25551 f5534014-38df-0310-8fa8-9805f1628bb7 --- epan/crypt/airpdcap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'epan/crypt/airpdcap.c') 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; -- cgit v1.2.3