Changeset 930 for trunk/src

Timestamp:

12/07/06 10:50:58 (5 years ago)

Author:

aj

Message:

index is a function in glibc <string.h>.
use a different name to avoid confusion / shadowing.

Location:

trunk/src/ifd

Files:

• ifd-ikey2k.c (modified) (1 diff)
• ifd-ikey3k.c (modified) (1 diff)
• sys-linux.c (modified) (2 diffs)

trunk/src/ifd/ifd-ikey2k.c

@@ -166 +166 @@
                        const unsigned char *buffer, size_t len)
 {
-        int value, index;
+        int value, idx;
         value = buffer[1] << 8 | buffer[0];
-        index = buffer[3] << 8 | buffer[2];
-
-        return ifd_usb_control(reader->device, 0x41, 0x17, value, index,
+        idx = buffer[3] << 8 | buffer[2];
+
+        return ifd_usb_control(reader->device, 0x41, 0x17, value, idx,
                                (void *)&buffer[4], len - 4, -1);
 }

trunk/src/ifd/ifd-ikey3k.c

@@ -143 +143 @@
                        const unsigned char *buffer, size_t len)
 {
-        int value, index;
+        int value, idx;
         value = buffer[1] << 8 | buffer[0];
-        index = buffer[3] << 8 | buffer[2];
+        idx = buffer[3] << 8 | buffer[2];
 
-        return ifd_usb_control(reader->device, 0x41, 0x17, value, index,
+        return ifd_usb_control(reader->device, 0x41, 0x17, value, idx,
                                (void *)&buffer[4], len - 4, -1);
 }

trunk/src/ifd/sys-linux.c

@@ -161 +161 @@
 int ifd_sysdep_usb_control(ifd_device_t * dev, unsigned int requesttype,
                            unsigned int request, unsigned int value,
-                           unsigned int index, void *data, size_t len,
+                           unsigned int idx, void *data, size_t len,
                            long timeout)
 {
@@ -170 +170 @@
         ctrl.bRequest = request;
         ctrl.wValue = value;
-        ctrl.wIndex = index;
+        ctrl.wIndex = idx;
         ctrl.wLength = len;
         ctrl.data = data;