[prev in list] [next in list] [prev in thread] [next in thread] 

List:       pecl-cvs
Subject:    [PECL-CVS] =?utf-8?q?svn:_/pecl/mqseries/trunk/_mqseries.c?=
From:       Pierrick_Charron <pierrick () php ! net>
Date:       2012-08-27 19:24:58
Message-ID: svn-pierrick-1346095498-327328-364128095 () svn ! php ! net
[Download RAW message or body]

pierrick                                 Mon, 27 Aug 2012 19:24:58 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=327328

Log:
Only handle some msg_desc properties if msg_desc->Version >= 2

Changed paths:
    U   pecl/mqseries/trunk/mqseries.c

Modified: pecl/mqseries/trunk/mqseries.c
===================================================================
--- pecl/mqseries/trunk/mqseries.c	2012-08-27 17:56:21 UTC (rev 327327)
+++ pecl/mqseries/trunk/mqseries.c	2012-08-27 19:24:58 UTC (rev 327328)
@@ -1655,12 +1655,15 @@

 	MQSERIES_SETOPT_RESBYTES(msg_desc, MsgId);
 	MQSERIES_SETOPT_RESBYTES(msg_desc, CorrelId);
-	MQSERIES_SETOPT_RESBYTES(msg_desc, GroupId);

 	MQSERIES_SETOPT_STRING(msg_desc, ReplyToQMgr);
 	MQSERIES_SETOPT_LONG(msg_desc, PutApplType);
-	MQSERIES_SETOPT_LONG(msg_desc, MsgSeqNumber);
-	MQSERIES_SETOPT_LONG(msg_desc, MsgFlags);
+
+	if (msg_desc->Version >=  MQMD_VERSION_2) {
+		MQSERIES_SETOPT_RESBYTES(msg_desc, GroupId);
+		MQSERIES_SETOPT_LONG(msg_desc, MsgSeqNumber);
+		MQSERIES_SETOPT_LONG(msg_desc, MsgFlags);
+	}
 }
 /* }}} */

@@ -1714,10 +1717,6 @@
 		add_assoc_stringl(array, "Format", msg_desc->Format, strlen(msg_desc->Format), 1);
 	}

-	ref = make_reference(msg_desc->GroupId, 24 TSRMLS_CC);
-	add_assoc_resource(array, "GroupId", Z_RESVAL_P(ref));
-	zend_list_addref(Z_RESVAL_P(ref));
-	zval_ptr_dtor(&ref);

 	add_assoc_long(array, "Report", msg_desc->Report);
 	add_assoc_long(array, "MsgType", msg_desc->MsgType);
@@ -1744,10 +1743,17 @@
 		add_assoc_stringl(array, "PutDate", msg_desc->PutDate, sizeof(msg_desc->PutDate), 1);
 	if (msg_desc->PutTime != NULL && strlen(msg_desc->PutTime) >0)
 		add_assoc_stringl(array, "PutTime", msg_desc->PutTime, sizeof(msg_desc->PutTime), 1);
+
+	if (msg_desc->Version >= MQMD_VERSION_2) {
+		ref = make_reference(msg_desc->GroupId, 24 TSRMLS_CC);
+		add_assoc_resource(array, "GroupId", Z_RESVAL_P(ref));
+		zend_list_addref(Z_RESVAL_P(ref));
+		zval_ptr_dtor(&ref);

-	add_assoc_long(array, "MsgSeqNumber", msg_desc->MsgSeqNumber);
-	add_assoc_long(array, "MsgFlags", msg_desc->MsgFlags);
-	add_assoc_long(array, "OriginalLength", msg_desc->OriginalLength);
+		add_assoc_long(array, "MsgSeqNumber", msg_desc->MsgSeqNumber);
+		add_assoc_long(array, "MsgFlags", msg_desc->MsgFlags);
+		add_assoc_long(array, "OriginalLength", msg_desc->OriginalLength);
+	}
 }
 /* }}} */




-- 
PECL CVS Mailing List 
To unsubscribe, visit: http://www.php.net/unsub.php

[prev in list] [next in list] [prev in thread] [next in thread]