[Pcsclite-cvs-commit] CVS PKCS11/src

[CVS User rousseau]

Update of /cvsroot/muscleapps/PKCS11/src
In directory haydn:/tmp/cvs-serv11014

Modified Files:
	p11_object.c p11x_object.c 
Log Message:
use CK_ULONG instead of int for some fields.
Solves a compiler warning under Windows.

Thanks to Martin Leung for the patch


--- /cvsroot/muscleapps/PKCS11/src/p11_object.c	2004/11/28 14:30:31	1.26
+++ /cvsroot/muscleapps/PKCS11/src/p11_object.c	2005/07/25 08:07:03	1.27
@@ -1,6 +1,6 @@
 /******************************************************************************
 ** 
-**  $Id: p11_object.c,v 1.26 2004/11/28 14:30:31 rousseau Exp $
+**  $Id: p11_object.c,v 1.27 2005/07/25 08:07:03 rousseau Exp $
 **
 **  Package: PKCS-11
 **  Author : Chris Osgood <oznet at mac.com>
@@ -511,14 +511,14 @@
 			}
             else
             {
-		int i;
+		CK_ULONG i;
                 memcpy(session->search_attrib, pTemplate, ulCount * sizeof(CK_ATTRIBUTE));
 		for (i=0; i<ulCount; i++) {
 		    session->search_attrib[i].pValue = 
 			malloc(session->search_attrib[i].ulValueLen);
 		    if (NULL == session->search_attrib[i].pValue) {
 			/* avoid leaking memory here */
-			int k; 
+			CK_ULONG k; 
 			for (k=0 ; k<i ; k++)
 			    free(session->search_attrib[k].pValue);
 
@@ -682,7 +682,7 @@
 
         if (session->search_attrib)
         {
-	    int j;
+	    CK_ULONG j;
 	    for (j=0 ; j<session->search_attrib_count; j++) {
 		if (session->search_attrib[j].pValue) {
 		    /* redundant if, actually */
--- /cvsroot/muscleapps/PKCS11/src/p11x_object.c	2005/05/24 07:13:21	1.46
+++ /cvsroot/muscleapps/PKCS11/src/p11x_object.c	2005/07/25 08:07:03	1.47
@@ -1,6 +1,6 @@
 /******************************************************************************
 ** 
-**  $Id: p11x_object.c,v 1.46 2005/05/24 07:13:21 rousseau Exp $
+**  $Id: p11x_object.c,v 1.47 2005/07/25 08:07:03 rousseau Exp $
 **
 **  Package: PKCS-11
 **  Author : Chris Osgood <oznet at mac.com>
@@ -711,7 +711,7 @@
         {
             {
               CK_BYTE *buf; 
-              int len = attrib->ulValueLen;
+              CK_ULONG len = attrib->ulValueLen;
 
               /* be sure object_GetAttrib() worked before dereferencing
                * obj_attrib */