apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bo...@apache.org
Subject svn commit: r789971 - in /apr/apr-util/branches/1.3.x: ./ CHANGES buckets/apr_brigade.c dbd/apr_dbd_pgsql.c misc/apr_queue.c
Date Tue, 30 Jun 2009 21:41:49 GMT
Author: bojan
Date: Tue Jun 30 21:41:48 2009
New Revision: 789971

URL: http://svn.apache.org/viewvc?rev=789971&view=rev
Log:
Backport r789965 from the trunk.
Use locally scoped variables to avoid stomping on return codes.
PR 47431.
Patch by Wayne Jensen <wayne_jensen trendmicro.com>.

Modified:
    apr/apr-util/branches/1.3.x/   (props changed)
    apr/apr-util/branches/1.3.x/CHANGES
    apr/apr-util/branches/1.3.x/buckets/apr_brigade.c   (props changed)
    apr/apr-util/branches/1.3.x/dbd/apr_dbd_pgsql.c   (contents, props changed)
    apr/apr-util/branches/1.3.x/misc/apr_queue.c   (props changed)

Propchange: apr/apr-util/branches/1.3.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun 30 21:41:48 2009
@@ -1,3 +1,3 @@
-/apr/apr/trunk:781403,784592
+/apr/apr/trunk:781403,784592,789965
 /apr/apr-util/branches/1.3.x:692751
 /apr/apr-util/trunk:692751,731225,743986,744009,745771,747612,747623,747630,781403

Modified: apr/apr-util/branches/1.3.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/CHANGES?rev=789971&r1=789970&r2=789971&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/CHANGES [utf-8] (original)
+++ apr/apr-util/branches/1.3.x/CHANGES [utf-8] Tue Jun 30 21:41:48 2009
@@ -1,6 +1,10 @@
                                                      -*- coding: utf-8 -*-
 Changes with APR-util 1.3.8
 
+  *) Use locally scoped variables in PostgreSQL driver to avoid stomping
+     on return codes. PR 47431
+     [Wayne Jensen <wayne_jensen trendmicro.com>]
+
   *) Fix race conditions in initialisation of DBD, DBM and DSO.
      [Bojan Smojver]
 

Propchange: apr/apr-util/branches/1.3.x/buckets/apr_brigade.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun 30 21:41:48 2009
@@ -1,3 +1,3 @@
-/apr/apr/trunk/buckets/apr_brigade.c:768417,781403,784592
+/apr/apr/trunk/buckets/apr_brigade.c:768417,781403,784592,789965
 /apr/apr-util/branches/1.3.x/buckets/apr_brigade.c:692751
 /apr/apr-util/trunk/buckets/apr_brigade.c:692751,731225,743986,744009,745771,747612,747623,747630,781403

Modified: apr/apr-util/branches/1.3.x/dbd/apr_dbd_pgsql.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/dbd/apr_dbd_pgsql.c?rev=789971&r1=789970&r2=789971&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/dbd/apr_dbd_pgsql.c (original)
+++ apr/apr-util/branches/1.3.x/dbd/apr_dbd_pgsql.c Tue Jun 30 21:41:48 2009
@@ -92,7 +92,7 @@
         if (TXN_IGNORE_ERRORS(sql->trans)) {
             PGresult *res = PQexec(sql->conn, "SAVEPOINT APR_DBD_TXN_SP");
             if (res) {
-                ret = PQresultStatus(res);
+                int ret = PQresultStatus(res);
                 PQclear(res);
                 if (!dbd_pgsql_is_success(ret)) {
                     sql->trans->errnum = ret;
@@ -118,7 +118,7 @@
                 PGresult *res = PQexec(sql->conn,
                                        "ROLLBACK TO SAVEPOINT APR_DBD_TXN_SP");
                 if (res) {
-                    ret = PQresultStatus(res);
+                    int ret = PQresultStatus(res);
                     PQclear(res);
                     if (!dbd_pgsql_is_success(ret)) {
                         sql->trans->errnum = ret;
@@ -136,7 +136,7 @@
                 PGresult *res = PQexec(sql->conn,
                                        "RELEASE SAVEPOINT APR_DBD_TXN_SP");
                 if (res) {
-                    ret = PQresultStatus(res);
+                    int ret = PQresultStatus(res);
                     PQclear(res);
                     if (!dbd_pgsql_is_success(ret)) {
                         sql->trans->errnum = ret;
@@ -162,7 +162,7 @@
         if (TXN_IGNORE_ERRORS(sql->trans)) {
             PGresult *res = PQexec(sql->conn, "SAVEPOINT APR_DBD_TXN_SP");
             if (res) {
-                ret = PQresultStatus(res);
+                int ret = PQresultStatus(res);
                 PQclear(res);
                 if (!dbd_pgsql_is_success(ret)) {
                     sql->trans->errnum = ret;
@@ -177,7 +177,7 @@
                 PGresult *res = PQexec(sql->conn,
                                        "ROLLBACK TO SAVEPOINT APR_DBD_TXN_SP");
                 if (res) {
-                    ret = PQresultStatus(res);
+                    int ret = PQresultStatus(res);
                     PQclear(res);
                     if (!dbd_pgsql_is_success(ret)) {
                         sql->trans->errnum = ret;
@@ -195,7 +195,7 @@
                 PGresult *res = PQexec(sql->conn,
                                        "RELEASE SAVEPOINT APR_DBD_TXN_SP");
                 if (res) {
-                    ret = PQresultStatus(res);
+                    int ret = PQresultStatus(res);
                     PQclear(res);
                     if (!dbd_pgsql_is_success(ret)) {
                         sql->trans->errnum = ret;
@@ -401,7 +401,7 @@
     if (TXN_IGNORE_ERRORS(sql->trans)) {
         PGresult *res = PQexec(sql->conn, "SAVEPOINT APR_DBD_TXN_SP");
         if (res) {
-            ret = PQresultStatus(res);
+            int ret = PQresultStatus(res);
             PQclear(res);
             if (!dbd_pgsql_is_success(ret)) {
                 sql->trans->errnum = ret;
@@ -431,7 +431,7 @@
             PGresult *res = PQexec(sql->conn,
                                    "ROLLBACK TO SAVEPOINT APR_DBD_TXN_SP");
             if (res) {
-                ret = PQresultStatus(res);
+                int ret = PQresultStatus(res);
                 PQclear(res);
                 if (!dbd_pgsql_is_success(ret)) {
                     sql->trans->errnum = ret;
@@ -449,7 +449,7 @@
             PGresult *res = PQexec(sql->conn,
                                    "RELEASE SAVEPOINT APR_DBD_TXN_SP");
             if (res) {
-                ret = PQresultStatus(res);
+                int ret = PQresultStatus(res);
                 PQclear(res);
                 if (!dbd_pgsql_is_success(ret)) {
                     sql->trans->errnum = ret;
@@ -616,7 +616,7 @@
     if (TXN_IGNORE_ERRORS(sql->trans)) {
         PGresult *res = PQexec(sql->conn, "SAVEPOINT APR_DBD_TXN_SP");
         if (res) {
-            ret = PQresultStatus(res);
+            int ret = PQresultStatus(res);
             PQclear(res);
             if (!dbd_pgsql_is_success(ret)) {
                 sql->trans->errnum = ret;
@@ -652,7 +652,7 @@
             PGresult *res = PQexec(sql->conn,
                                    "ROLLBACK TO SAVEPOINT APR_DBD_TXN_SP");
             if (res) {
-                ret = PQresultStatus(res);
+                int ret = PQresultStatus(res);
                 PQclear(res);
                 if (!dbd_pgsql_is_success(ret)) {
                     sql->trans->errnum = ret;
@@ -670,7 +670,7 @@
             PGresult *res = PQexec(sql->conn,
                                    "RELEASE SAVEPOINT APR_DBD_TXN_SP");
             if (res) {
-                ret = PQresultStatus(res);
+                int ret = PQresultStatus(res);
                 PQclear(res);
                 if (!dbd_pgsql_is_success(ret)) {
                     sql->trans->errnum = ret;
@@ -772,7 +772,7 @@
         if (TXN_IGNORE_ERRORS(sql->trans)) {
             PGresult *res = PQexec(sql->conn, "SAVEPOINT APR_DBD_TXN_SP");
             if (res) {
-                ret = PQresultStatus(res);
+                int ret = PQresultStatus(res);
                 PQclear(res);
                 if (!dbd_pgsql_is_success(ret)) {
                     sql->trans->errnum = ret;
@@ -808,7 +808,7 @@
                 PGresult *res = PQexec(sql->conn,
                                        "ROLLBACK TO SAVEPOINT APR_DBD_TXN_SP");
                 if (res) {
-                    ret = PQresultStatus(res);
+                    int ret = PQresultStatus(res);
                     PQclear(res);
                     if (!dbd_pgsql_is_success(ret)) {
                         sql->trans->errnum = ret;
@@ -827,7 +827,7 @@
                 PGresult *res = PQexec(sql->conn,
                                        "RELEASE SAVEPOINT APR_DBD_TXN_SP");
                 if (res) {
-                    ret = PQresultStatus(res);
+                    int ret = PQresultStatus(res);
                     PQclear(res);
                     if (!dbd_pgsql_is_success(ret)) {
                         sql->trans->errnum = ret;
@@ -854,7 +854,7 @@
         if (TXN_IGNORE_ERRORS(sql->trans)) {
             PGresult *res = PQexec(sql->conn, "SAVEPOINT APR_DBD_TXN_SP");
             if (res) {
-                ret = PQresultStatus(res);
+                int ret = PQresultStatus(res);
                 PQclear(res);
                 if (!dbd_pgsql_is_success(ret)) {
                     sql->trans->errnum = ret;
@@ -878,7 +878,7 @@
                 PGresult *res = PQexec(sql->conn,
                                        "ROLLBACK TO SAVEPOINT APR_DBD_TXN_SP");
                 if (res) {
-                    ret = PQresultStatus(res);
+                    int ret = PQresultStatus(res);
                     PQclear(res);
                     if (!dbd_pgsql_is_success(ret)) {
                         sql->trans->errnum = ret;
@@ -897,7 +897,7 @@
                 PGresult *res = PQexec(sql->conn,
                                        "RELEASE SAVEPOINT APR_DBD_TXN_SP");
                 if (res) {
-                    ret = PQresultStatus(res);
+                    int ret = PQresultStatus(res);
                     PQclear(res);
                     if (!dbd_pgsql_is_success(ret)) {
                         sql->trans->errnum = ret;

Propchange: apr/apr-util/branches/1.3.x/dbd/apr_dbd_pgsql.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun 30 21:41:48 2009
@@ -1,3 +1,3 @@
-/apr/apr/trunk/dbd/apr_dbd_pgsql.c:781403,784592
+/apr/apr/trunk/dbd/apr_dbd_pgsql.c:781403,784592,789965
 /apr/apr-util/branches/1.3.x/dbd/apr_dbd_pgsql.c:692751
 /apr/apr-util/trunk/dbd/apr_dbd_pgsql.c:692751,704986,731225,743986,744009,745771,747612,747623,747630,781403

Propchange: apr/apr-util/branches/1.3.x/misc/apr_queue.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun 30 21:41:48 2009
@@ -1,4 +1,4 @@
-/apr/apr/trunk/misc/apr_queue.c:781403,784592
+/apr/apr/trunk/misc/apr_queue.c:781403,784592,789965
 /apr/apr/trunk/util-misc/apr_queue.c:784520
 /apr/apr-util/branches/1.3.x/misc/apr_queue.c:692751
 /apr/apr-util/trunk/misc/apr_queue.c:692751,731225,743986,744009,745771,747612,747623,747630,781403



Mime
View raw message