[pkg-opensc-commit] [pkcs11-helper] 31/253: Cleanups

[Eric Dorland]

This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch master
in repository pkcs11-helper.

commit b757a734193c72da3c70612a04c0f8c9bcd51164
Author: Alon Bar-Lev <alon.barlev at gmail.com>
Date:   Sat Dec 9 09:31:24 2006 +0000

    Cleanups
---
 include/pkcs11-helper-1.0/pkcs11h-core.h |  2 +-
 lib/pkcs11h-slotevent.c                  | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/pkcs11-helper-1.0/pkcs11h-core.h b/include/pkcs11-helper-1.0/pkcs11h-core.h
index c98eb9e..39e2027 100644
--- a/include/pkcs11-helper-1.0/pkcs11h-core.h
+++ b/include/pkcs11-helper-1.0/pkcs11h-core.h
@@ -470,7 +470,7 @@ pkcs11h_setMaxLoginRetries (
  * @param allow_protected_auth	Allow this provider to use protected authentication.
  * @param mask_private_mode	Provider private mode @ref PKCS11H_PRIVATEMODE_MASK override.
  * @param slot_event_method	Provider slot event @ref PKCS11H_SLOTEVENT_METHOD method.
- * @param slot_poll_interval	Slot event poll interval (If in polling mode).
+ * @param slot_poll_interval	Slot event poll interval (If in polling mode), specify 0 for default.
  * @param cert_is_private	Provider's certificate access should be done after login.
  * @return CK_RV.
  * @attention This function must be called from the main thread.
diff --git a/lib/pkcs11h-slotevent.c b/lib/pkcs11h-slotevent.c
index 3df3cf4..814904d 100644
--- a/lib/pkcs11h-slotevent.c
+++ b/lib/pkcs11h-slotevent.c
@@ -180,7 +180,7 @@ __pkcs11h_slotevent_provider (
 		}
 	}
 	else {
-		unsigned long ulLastChecksum = 0;
+		unsigned long last_checksum = 0;
 		PKCS11H_BOOL is_first_time = TRUE;
 
 		while (
@@ -188,7 +188,7 @@ __pkcs11h_slotevent_provider (
 			provider->enabled &&
 			rv == CKR_OK
 		) {
-			unsigned long ulCurrentChecksum = 0;
+			unsigned long current_checksum = 0;
 
 			CK_SLOT_ID_PTR slots = NULL;
 			CK_ULONG slotnum;
@@ -214,7 +214,7 @@ __pkcs11h_slotevent_provider (
 					CK_TOKEN_INFO info;
 
 					if (provider->f->C_GetTokenInfo (slots[i], &info) == CKR_OK) {
-						ulCurrentChecksum += (
+						current_checksum += (
 							__pkcs11h_slotevent_checksum (
 								info.label,
 								sizeof (info.label)
@@ -241,7 +241,7 @@ __pkcs11h_slotevent_provider (
 					is_first_time = FALSE;
 				}
 				else {
-					if (ulLastChecksum != ulCurrentChecksum) {
+					if (last_checksum != current_checksum) {
 						PKCS11H_DEBUG (
 							PKCS11H_LOG_DEBUG1,
 							"PKCS#11: Slotevent provider='%s' event",
@@ -251,7 +251,7 @@ __pkcs11h_slotevent_provider (
 						_pkcs11h_threading_condSignal (&g_pkcs11h_data->slotevent.cond_event);
 					}
 				}
-				ulLastChecksum = ulCurrentChecksum;
+				last_checksum = current_checksum;
 			}
 
 			if (slots != NULL) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opensc/pkcs11-helper.git