[Openais] [PATCH]: openais/trunk: Fix up lib calls to use error_exit consistently

[Ryan O'Hara]

This patch adds a check to saTmrTimerCancel such that **timerDataP
must not be NULL.

Also, this patch changes several library calls to use error_exit
consistently. Minor change just to be consistent throughout the code.


Index: lib/tmr.c
===================================================================
--- lib/tmr.c   (revision 1766)
+++ lib/tmr.c   (working copy)
@@ -117,17 +117,18 @@
        printf ("[DEBUG]: saTmrInitialize\n");
 
        if (tmrHandle == NULL) {
-               return (SA_AIS_ERR_INVALID_PARAM);
+               error = SA_AIS_ERR_INVALID_PARAM;
+               goto error_exit;
        }
 
        error = saVersionVerify (&tmrVersionDatabase, version);
        if (error != SA_AIS_OK) {
-               goto error_no_destroy;
+               goto error_exit;
        }
 
        error = saHandleCreate (&tmrHandleDatabase, sizeof (struct 
tmrInstance), tmrHandle);
        if (error != SA_AIS_OK) {
-               goto error_no_destroy;
+               goto error_exit;
        }
 
        error = saHandleInstanceGet (&tmrHandleDatabase, *tmrHandle, (void 
*)&tmrInstance);
@@ -158,7 +159,7 @@
        saHandleInstancePut (&tmrHandleDatabase, *tmrHandle);
 error_destroy:
        saHandleDestroy (&tmrHandleDatabase, *tmrHandle);
-error_no_destroy:
+error_exit:
        return (error);
 }
 
@@ -174,18 +175,20 @@
        printf ("[DEBUG]: saTmrSelectionObjectGet\n");
 
        if (selectionObject == NULL) {
-               return (SA_AIS_ERR_INVALID_PARAM);
+               error = SA_AIS_ERR_INVALID_PARAM;
+               goto error_exit;
        }
 
        error = saHandleInstanceGet (&tmrHandleDatabase, tmrHandle, (void 
*)&tmrInstance);
        if (error != SA_AIS_OK) {
-               return (error);
+               goto error_exit;
        }
 
        *selectionObject = coroipcc_fd_get (&tmrInstance->ipc_ctx);
 
        saHandleInstancePut (&tmrHandleDatabase, tmrHandle);
 
+error_exit:
        return (SA_AIS_OK);
 }
 
@@ -208,7 +211,8 @@
            dispatchFlags != SA_DISPATCH_ALL &&
            dispatchFlags != SA_DISPATCH_BLOCKING)
        {
-               return (SA_AIS_ERR_INVALID_PARAM);
+               error = SA_AIS_ERR_INVALID_PARAM;
+               goto error_exit;
        }
 
        error = saHandleInstanceGet (&tmrHandleDatabase, tmrHandle,
@@ -286,7 +290,6 @@
 
 error_unlock:
        pthread_mutex_unlock (&tmrInstance->dispatch_mutex);
-
        saHandleInstancePut (&tmrHandleDatabase, tmrHandle);
 error_exit:
        return (error);
@@ -304,7 +307,7 @@
 
        error = saHandleInstanceGet (&tmrHandleDatabase, tmrHandle, (void 
*)&tmrInstance);
        if (error != SA_AIS_OK) {
-               return (error);
+               goto error_exit;
        }
 
        pthread_mutex_lock (&tmrInstance->response_mutex);
@@ -312,7 +315,8 @@
        if (tmrInstance->finalize) {
                pthread_mutex_unlock (&tmrInstance->response_mutex);
                saHandleInstancePut (&tmrHandleDatabase, tmrHandle);
-               return (SA_AIS_ERR_BAD_HANDLE);
+               error = SA_AIS_ERR_BAD_HANDLE;
+               goto error_exit;
        }
 
        tmrInstance->finalize = 1;
@@ -325,6 +329,7 @@
 
        saHandleInstancePut (&tmrHandleDatabase, tmrHandle);
 
+error_exit:
        return (SA_AIS_OK);
 }
 
@@ -433,18 +438,20 @@
                (unsigned int)(timerId));
 
        if ((timerAttributes == NULL) || (callTime == NULL)) {
-               return (SA_AIS_ERR_INVALID_PARAM);
+               error = SA_AIS_ERR_INVALID_PARAM;
+               goto error_exit;
        }
 
        if ((timerAttributes->type != SA_TIME_ABSOLUTE) &&
            (timerAttributes->type != SA_TIME_DURATION))
        {
-               return (SA_AIS_ERR_INVALID_PARAM);
+               error = SA_AIS_ERR_INVALID_PARAM;
+               goto error_exit;
        }
 
        error = saHandleInstanceGet (&tmrHandleDatabase, tmrHandle, (void 
*)&tmrInstance);
        if (error != SA_AIS_OK) {
-               return (error);
+               goto error_exit;
        }
 
        req_lib_tmr_timerreschedule.header.size =
@@ -476,6 +483,7 @@
 
        saHandleInstancePut (&tmrHandleDatabase, tmrHandle);
 
+error_exit:
        return (error);
 }
 
@@ -496,6 +504,11 @@
        printf ("[DEBUG]: saTmrTimerCancel { id=%u }\n",
                (unsigned int)(timerId));
 
+       if (*timerDataP == NULL) {
+               error = SA_AIS_ERR_INVALID_PARAM;
+               goto error_exit;
+       }
+
        error = saHandleInstanceGet (&tmrHandleDatabase, tmrHandle, (void 
*)&tmrInstance);
        if (error != SA_AIS_OK) {
                goto error_exit;
@@ -551,7 +564,7 @@
 
        error = saHandleInstanceGet (&tmrHandleDatabase, tmrHandle, (void 
*)&tmrInstance);
        if (error != SA_AIS_OK) {
-               return (error);
+               goto error_exit;
        }
 
        req_lib_tmr_periodictimerskip.header.size =
@@ -578,6 +591,7 @@
                error = res_lib_tmr_periodictimerskip.header.error;
        }
 
+error_exit:
        return (error);
 }
 
@@ -605,7 +619,7 @@
 
        error = saHandleInstanceGet (&tmrHandleDatabase, tmrHandle, (void 
*)&tmrInstance);
        if (error != SA_AIS_OK) {
-               return (error);
+               goto error_exit;
        }
 
        req_lib_tmr_timerremainingtimeget.header.size =
@@ -651,7 +665,6 @@
        struct res_lib_tmr_timerattributesget res_lib_tmr_timerattributesget;
        struct iovec iov;
 
-
        /* DEBUG */
        printf ("[DEBUG]: saTmrTimerAttributesGet { id=%u }\n",
                (unsigned int)(timerId));

_______________________________________________
Openais mailing list
Openais@lists.linux-foundation.org
https://lists.linux-foundation.org/mailman/listinfo/openais