Use locally scoped variables to avoid stomping on return codes.

PR 47431.
Patch by Wayne Jensen <wayne_jensen trendmicro.com>.

git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@789965 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 18 insertions, 18 deletions

diff --git a/dbd/apr_dbd_pgsql.c b/dbd/apr_dbd_pgsql.c
index 606accd5b..21f2179b8 100644
--- a/dbd/apr_dbd_pgsql.c
+++ b/dbd/apr_dbd_pgsql.c
@@ -92,7 +92,7 @@ static int dbd_pgsql_select(apr_pool_t *pool, apr_dbd_t *sql,
         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 @@ static int dbd_pgsql_select(apr_pool_t *pool, apr_dbd_t *sql,
                 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 @@ static int dbd_pgsql_select(apr_pool_t *pool, apr_dbd_t *sql,
                 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 @@ static int dbd_pgsql_select(apr_pool_t *pool, apr_dbd_t *sql,
         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 @@ static int dbd_pgsql_select(apr_pool_t *pool, apr_dbd_t *sql,
                 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 @@ static int dbd_pgsql_select(apr_pool_t *pool, apr_dbd_t *sql,
                 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 @@ static int dbd_pgsql_query(apr_dbd_t *sql, int *nrows, const char *query)
     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 @@ static int dbd_pgsql_query(apr_dbd_t *sql, int *nrows, const char *query)
             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 @@ static int dbd_pgsql_query(apr_dbd_t *sql, int *nrows, const char *query)
             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 @@ static int dbd_pgsql_pquery_internal(apr_pool_t *pool, apr_dbd_t *sql,
     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 @@ static int dbd_pgsql_pquery_internal(apr_pool_t *pool, apr_dbd_t *sql,
             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 @@ static int dbd_pgsql_pquery_internal(apr_pool_t *pool, apr_dbd_t *sql,
             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 @@ static int dbd_pgsql_pselect_internal(apr_pool_t *pool, apr_dbd_t *sql,
         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 @@ static int dbd_pgsql_pselect_internal(apr_pool_t *pool, apr_dbd_t *sql,
                 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 @@ static int dbd_pgsql_pselect_internal(apr_pool_t *pool, apr_dbd_t *sql,
                 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 @@ static int dbd_pgsql_pselect_internal(apr_pool_t *pool, apr_dbd_t *sql,
         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 @@ static int dbd_pgsql_pselect_internal(apr_pool_t *pool, apr_dbd_t *sql,
                 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 @@ static int dbd_pgsql_pselect_internal(apr_pool_t *pool, apr_dbd_t *sql,
                 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;