---
trunk/lib/msg.c | 75 ++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 61 insertions(+), 14 deletions(-)
diff --git a/trunk/lib/msg.c b/trunk/lib/msg.c
index cc0a9b5..2c688f9 100644
--- a/trunk/lib/msg.c
+++ b/trunk/lib/msg.c
@@ -665,6 +665,9 @@ saMsgQueueClose (
1,
&res_lib_msg_queueclose,
sizeof (struct res_lib_msg_queueclose));
+ if (error != SA_AIS_OK) {
+ goto error_put;
+ }
if (res_lib_msg_queueclose.header.error != SA_AIS_OK) {
error = res_lib_msg_queueclose.header.error;
@@ -721,8 +724,9 @@ saMsgQueueStatusGet (
1,
&res_lib_msg_queuestatusget,
sizeof (struct res_lib_msg_queuestatusget));
-
- /* if (error != SA_AIS_OK) */
+ if (error != SA_AIS_OK) {
+ goto error_put;
+ }
if (res_lib_msg_queuestatusget.header.error != SA_AIS_OK) {
error = res_lib_msg_queuestatusget.header.error;
@@ -782,6 +786,9 @@ saMsgQueueRetentionTimeSet (
1,
&res_lib_msg_queueretentiontimeset,
sizeof (struct res_lib_msg_queueretentiontimeset));
+ if (error != SA_AIS_OK) {
+ goto error_put;
+ }
if (res_lib_msg_queueretentiontimeset.header.error != SA_AIS_OK) {
error = res_lib_msg_queueretentiontimeset.header.error;
@@ -837,6 +844,9 @@ saMsgQueueUnlink (
1,
&res_lib_msg_queueunlink,
sizeof (struct res_lib_msg_queueunlink));
+ if (error != SA_AIS_OK) {
+ goto error_put;
+ }
if (res_lib_msg_queueunlink.header.error != SA_AIS_OK) {
error = res_lib_msg_queueunlink.header.error;
@@ -895,6 +905,9 @@ saMsgQueueGroupCreate (
1,
&res_lib_msg_queuegroupcreate,
sizeof (struct res_lib_msg_queuegroupcreate));
+ if (error != SA_AIS_OK) {
+ goto error_put;
+ }
if (res_lib_msg_queuegroupcreate.header.error != SA_AIS_OK) {
error = res_lib_msg_queuegroupcreate.header.error;
@@ -953,6 +966,9 @@ saMsgQueueGroupInsert (
1,
&res_lib_msg_queuegroupinsert,
sizeof (struct res_lib_msg_queuegroupinsert));
+ if (error != SA_AIS_OK) {
+ goto error_put;
+ }
if (res_lib_msg_queuegroupinsert.header.error != SA_AIS_OK) {
error = res_lib_msg_queuegroupinsert.header.error;
@@ -1012,6 +1028,10 @@ saMsgQueueGroupRemove (
&res_lib_msg_queuegroupremove,
sizeof (struct res_lib_msg_queuegroupremove));
+ if (error != SA_AIS_OK) {
+ goto error_put;
+ }
+
if (res_lib_msg_queuegroupremove.header.error != SA_AIS_OK) {
error = res_lib_msg_queuegroupremove.header.error;
goto error_put; /* ! */
@@ -1066,6 +1086,9 @@ saMsgQueueGroupDelete (
1,
&res_lib_msg_queuegroupdelete,
sizeof (struct res_lib_msg_queuegroupdelete));
+ if (error != SA_AIS_OK) {
+ goto error_put;
+ }
if (res_lib_msg_queuegroupdelete.header.error != SA_AIS_OK) {
error = res_lib_msg_queuegroupdelete.header.error;
@@ -1152,6 +1175,9 @@ saMsgQueueGroupTrack (
&iov,
1,
&buffer);
+ if (error != SA_AIS_OK) {
+ goto error_unlock;
+ }
res_lib_msg_queuegrouptrack = buffer;
@@ -1227,6 +1253,9 @@ saMsgQueueGroupTrackStop (
1,
&res_lib_msg_queuegrouptrackstop,
sizeof (struct res_lib_msg_queuegrouptrackstop));
+ if (error != SA_AIS_OK) {
+ goto error_put;
+ }
if (res_lib_msg_queuegrouptrackstop.header.error != SA_AIS_OK) {
error = res_lib_msg_queuegrouptrackstop.header.error;
@@ -1274,6 +1303,9 @@ saMsgQueueGroupNotificationFree (
1,
&res_lib_msg_queuegroupnotificationfree,
sizeof (struct res_lib_msg_queuegroupnotificationfree));
+ if (error != SA_AIS_OK) {
+ goto error_put;
+ }
if (res_lib_msg_queuegroupnotificationfree.header.error != SA_AIS_OK) {
error = res_lib_msg_queuegroupnotificationfree.header.error;
@@ -1348,8 +1380,9 @@ saMsgMessageSend (
2,
&res_lib_msg_messagesend,
sizeof (struct res_lib_msg_messagesend));
-
- /* if (error != SA_AIS_OK) */
+ if (error != SA_AIS_OK) {
+ goto error_put;
+ }
if (res_lib_msg_messagesend.header.error != SA_AIS_OK) {
error = res_lib_msg_messagesend.header.error;
@@ -1426,8 +1459,9 @@ saMsgMessageSendAsync (
2,
&res_lib_msg_messagesendasync,
sizeof (struct res_lib_msg_messagesendasync));
-
- /* if (error != SA_AIS_OK) */
+ if (error != SA_AIS_OK) {
+ goto error_put;
+ }
if (res_lib_msg_messagesendasync.header.error != SA_AIS_OK) {
error = res_lib_msg_messagesendasync.header.error;
@@ -1617,6 +1651,9 @@ saMsgMessageCancel (
1,
&res_lib_msg_messagecancel,
sizeof (struct res_lib_msg_messagecancel));
+ if (error != SA_AIS_OK) {
+ goto error_put;
+ }
if (res_lib_msg_messagecancel.header.error != SA_AIS_OK) {
error = res_lib_msg_messagecancel.header.error;
@@ -1787,8 +1824,9 @@ saMsgMessageReply (
2,
&res_lib_msg_messagereply,
sizeof (struct res_lib_msg_messagereply));
-
- /* if (error != SA_AIS_OK) */
+ if (error != SA_AIS_OK) {
+ goto error_put;
+ }
if (res_lib_msg_messagereply.header.error != SA_AIS_OK) {
error = res_lib_msg_messagereply.header.error;
@@ -1859,8 +1897,9 @@ saMsgMessageReplyAsync (
2,
&res_lib_msg_messagereplyasync,
sizeof (struct res_lib_msg_messagereplyasync));
-
- /* if (error != SA_AIS_OK) */
+ if (error != SA_AIS_OK) {
+ goto error_put;
+ }
if (res_lib_msg_messagereplyasync.header.error != SA_AIS_OK) {
error = res_lib_msg_messagereplyasync.header.error;
@@ -1931,8 +1970,9 @@ saMsgQueueCapacityThresholdSet (
1,
&res_lib_msg_queuecapacitythresholdset,
sizeof (struct res_lib_msg_queuecapacitythresholdset));
-
- /* if (error != SA_AIS_OK) */
+ if (error != SA_AIS_OK) {
+ goto error_put;
+ }
if (res_lib_msg_queuecapacitythresholdset.header.error != SA_AIS_OK) {
error = res_lib_msg_queuecapacitythresholdset.header.error;
@@ -1990,8 +2030,9 @@ saMsgQueueCapacityThresholdGet (
1,
&res_lib_msg_queuecapacitythresholdget,
sizeof (struct res_lib_msg_queuecapacitythresholdget));
-
- /* if (error != SA_AIS_OK) */
+ if (error != SA_AIS_OK) {
+ goto error_put;
+ }
if (res_lib_msg_queuecapacitythresholdget.header.error != SA_AIS_OK) {
error = res_lib_msg_queuecapacitythresholdget.header.error;
@@ -2042,6 +2083,9 @@ saMsgMetadataSizeGet (
1,
&res_lib_msg_metadatasizeget,
sizeof (struct res_lib_msg_metadatasizeget));
+ if (error != SA_AIS_OK) {
+ goto error_put;
+ }
if (res_lib_msg_metadatasizeget.header.error != SA_AIS_OK) {
error = res_lib_msg_metadatasizeget.header.error;
@@ -2096,6 +2140,9 @@ saMsgLimitGet (
1,
&res_lib_msg_limitget,
sizeof (struct res_lib_msg_limitget));
+ if (error != SA_AIS_OK) {
+ goto error_put;
+ }
if (res_lib_msg_limitget.header.error != SA_AIS_OK) {
error = res_lib_msg_limitget.header.error;
--
1.5.5.6
_______________________________________________
Openais mailing list
Openais@lists.linux-foundation.org
https://lists.linux-foundation.org/mailman/listinfo/openais
