Changeset 2832

Timestamp:

02/05/06 19:35:55 (3 years ago)

Author:

nils

Message:

sc_mutex_destroy should have a return value

Location:

trunk/src

Files:

• libopensc/card.c (modified) (1 diff)
• libopensc/ctbcs.c (modified) (2 diffs)
• libopensc/ctx.c (modified) (1 diff)
• libopensc/internal.h (modified) (1 diff)
• libopensc/opensc.h (modified) (1 diff)
• libopensc/sc.c (modified) (1 diff)
• pkcs11/pkcs11-global.c (modified) (1 diff)

trunk/src/libopensc/card.c

@@ -88 +88 @@
         if (card->algorithms != NULL)
                 free(card->algorithms);
-        if (card->mutex != NULL)
-                sc_mutex_destroy(card->ctx, card->mutex);
+        if (card->mutex != NULL) {
+                int r = sc_mutex_destroy(card->ctx, card->mutex);
+                if (r != SC_SUCCESS)
+                        sc_error(card->ctx, "unable to destroy mutex\n");
+        }
         sc_mem_clear(card, sizeof(*card));
         free(card);

trunk/src/libopensc/ctbcs.c

@@ -159 +159 @@
         sc_apdu_t apdu;
         struct sc_card_operations ops;
-        int r;
+        int r, s;
 
         switch (data->cmd) {
@@ -186 +186 @@
 
         r = sc_transmit_apdu(card, &apdu);
-        sc_mutex_destroy(reader->ctx, card->mutex);
+        s = sc_mutex_destroy(reader->ctx, card->mutex);
+        if (s != SC_SUCCESS) {
+                sc_error(reader->ctx, "unable to destroy mutex\n");
+                return s;
+        }
         SC_TEST_RET(card->ctx, r, "APDU transmit failed");
         

trunk/src/libopensc/ctx.c

@@ -747 +747 @@
                         _sc_free_atr(ctx, drv);
         }
+        if (ctx->preferred_language != NULL)
+                free(ctx->preferred_language);
+        if (ctx->mutex != NULL) {
+                int r = sc_mutex_destroy(ctx, ctx->mutex);
+                if (r != SC_SUCCESS) {
+                        sc_error(ctx, "unable to destroy mutex\n");
+                        return r;
+                }
+        }
+        if (ctx->conf != NULL)
+                scconf_free(ctx->conf);
         if (ctx->debug_file && ctx->debug_file != stdout)
                 fclose(ctx->debug_file);
         if (ctx->error_file && ctx->error_file != stderr)
                 fclose(ctx->error_file);
-        if (ctx->preferred_language != NULL)
-                free(ctx->preferred_language);
-        if (ctx->conf != NULL)
-                scconf_free(ctx->conf);
-        if (ctx->mutex != NULL)
-                sc_mutex_destroy(ctx, ctx->mutex);
         if (ctx->app_name != NULL)
                 free(ctx->app_name);

trunk/src/libopensc/internal.h

@@ -149 +149 @@
  * @param  ctx    sc_context_t object with the thread context
  * @param  mutex  mutex object to be destroyed
+ * @return SC_SUCCESS on success and an error code otherwise
  */
-void sc_mutex_destroy(const sc_context_t *ctx, void *mutex);
+int sc_mutex_destroy(const sc_context_t *ctx, void *mutex);
 /**
  * Returns a unique id for every thread.

trunk/src/libopensc/opensc.h

@@ -630 +630 @@
         int (*unlock_mutex)(void *);
         /** destroys a mutex object */
-        void (*destroy_mutex)(void *);
+        int (*destroy_mutex)(void *);
         /** returns unique identifier for the thread (can be NULL) */
         unsigned long (*thread_id)(void);

trunk/src/libopensc/sc.c

@@ -706 +706 @@
 }
 
-void sc_mutex_destroy(const sc_context_t *ctx, void *mutex)
-{
-        if (ctx == NULL || ctx->thread_ctx == NULL ||
-            ctx->thread_ctx->destroy_mutex == NULL)
-                return;
-        ctx->thread_ctx->destroy_mutex(mutex);
+int sc_mutex_destroy(const sc_context_t *ctx, void *mutex)
+{
+        if (ctx == NULL)
+                return SC_ERROR_INVALID_ARGUMENTS;
+        if (ctx->thread_ctx != NULL && ctx->thread_ctx->destroy_mutex != NULL)
+                return ctx->thread_ctx->destroy_mutex(mutex);
+        else
+                return SC_SUCCESS;
 }
 

trunk/src/pkcs11/pkcs11-global.c

@@ -152 +152 @@
 }
 
-static void sc_destroy_mutex(void *m)
+static int sc_destroy_mutex(void *m)
 {
         if (_locking == NULL)
-                return;
-        _locking->DestroyMutex(m);
+                return SC_SUCCESS;
+        if (_locking->DestroyMutex(m) == CKR_OK)
+                return SC_SUCCESS;
+        else
+                return SC_ERROR_INTERNAL;
 }