Correct compile error

[bacula/bacula] / bacula / src / cats / postgresql.c

diff --git a/bacula/src/cats/postgresql.c b/bacula/src/cats/postgresql.c
index 0c2b195ac5441779522e1243bbae4c0096a63491..bc5190e70b0c81efe906742a7297f209fa684e03 100644 (file)
--- a/bacula/src/cats/postgresql.c
+++ b/bacula/src/cats/postgresql.c
@@ -7,8 +7,8 @@
    many others, a complete list can be found in the file AUTHORS.
    This program is Free Software; you can redistribute it and/or
    modify it under the terms of version two of the GNU General Public
-   License as published by the Free Software Foundation plus additions
-   that are listed in the file LICENSE.
+   License as published by the Free Software Foundation and included
+   in the file LICENSE.
 
    This program is distributed in the hope that it will be useful, but
    WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -254,7 +254,6 @@ db_close_database(JCR *jcr, B_DB *mdb)
       if (mdb->db_socket) {
          free(mdb->db_socket);
       }
-      my_postgresql_free_result(mdb);
       free(mdb);
    }
    V(mutex);
@@ -341,16 +340,15 @@ POSTGRESQL_ROW my_postgresql_fetch_row(B_DB *mdb)
 
    Dmsg0(500, "my_postgresql_fetch_row start\n");
 
-   if (mdb->row_number == -1 || mdb->row == NULL) {
+   if (!mdb->row || mdb->row_size < mdb->num_fields) {
       Dmsg1(500, "we have need space of %d bytes\n", sizeof(char *) * mdb->num_fields);
 
-      if (mdb->row != NULL) {
+      if (mdb->row) {
          Dmsg0(500, "my_postgresql_fetch_row freeing space\n");
          free(mdb->row);
-         mdb->row = NULL;
       }
-
       mdb->row = (POSTGRESQL_ROW) malloc(sizeof(char *) * mdb->num_fields);
+      mdb->row_size = mdb->num_fields;
 
       // now reset the row_number now that we have the space allocated
       mdb->row_number = 0;
@@ -406,9 +404,14 @@ POSTGRESQL_FIELD * my_postgresql_fetch_field(B_DB *mdb)
    int     i;
 
    Dmsg0(500, "my_postgresql_fetch_field starts\n");
-   if (mdb->fields == NULL) {
+
+   if (!mdb->fields || mdb->fields_size < mdb->num_fields) {
+      if (mdb->fields) {
+         free(mdb->fields);
+      }
       Dmsg1(500, "allocating space for %d fields\n", mdb->num_fields);
       mdb->fields = (POSTGRESQL_FIELD *)malloc(sizeof(POSTGRESQL_FIELD) * mdb->num_fields);
+      mdb->fields_size = mdb->num_fields;
 
       for (i = 0; i < mdb->num_fields; i++) {
          Dmsg1(500, "filling field %d\n", i);
@@ -473,7 +476,7 @@ int my_postgresql_query(B_DB *mdb, const char *query)
       bmicrosleep(5, 0);
    }
    if (!mdb->result) {
-      Dmsg1(000, "Query failed: %s\n", query);
+      Dmsg1(50, "Query failed: %s\n", query);
       goto bail_out;
    }
 
@@ -490,7 +493,7 @@ int my_postgresql_query(B_DB *mdb, const char *query)
 
       mdb->status = 0;                  /* succeed */
    } else {
-      Dmsg1(000, "Result status failed: %s\n", query);
+      Dmsg1(50, "Result status failed: %s\n", query);
       goto bail_out;
    }
 
@@ -507,6 +510,8 @@ bail_out:
 
 void my_postgresql_free_result(B_DB *mdb)
 {
+   
+   db_lock(mdb);
    if (mdb->result) {
       PQclear(mdb->result);
       mdb->result = NULL;
@@ -521,6 +526,7 @@ void my_postgresql_free_result(B_DB *mdb)
       free(mdb->fields);
       mdb->fields = NULL;
    }
+   db_unlock(mdb);
 }
 
 int my_postgresql_currval(B_DB *mdb, char *table_name)
@@ -567,7 +573,7 @@ int my_postgresql_currval(B_DB *mdb, char *table_name)
       bmicrosleep(5, 0);
    }
    if (!result) {
-      Dmsg1(000, "Query failed: %s\n", query);
+      Dmsg1(50, "Query failed: %s\n", query);
       goto bail_out;
    }
 
@@ -578,7 +584,7 @@ int my_postgresql_currval(B_DB *mdb, char *table_name)
       id = atoi(PQgetvalue(result, 0, 0));
       Dmsg2(500, "got value '%s' which became %d\n", PQgetvalue(result, 0, 0), id);
    } else {
-      Dmsg1(000, "Result status failed: %s\n", query);
+      Dmsg1(50, "Result status failed: %s\n", query);
       Mmsg1(&mdb->errmsg, _("error fetching currval: %s\n"), PQerrorMessage(mdb->db));
    }
 
@@ -612,9 +618,7 @@ int my_postgresql_batch_start(JCR *jcr, B_DB *mdb)
    mdb->row_number   = -1;
    mdb->field_number = -1;
 
-   if (mdb->result != NULL) {
-      my_postgresql_free_result(mdb);
-   }
+   my_postgresql_free_result(mdb);
 
    for (int i=0; i < 10; i++) {
       mdb->result = PQexec(mdb->db, query);
@@ -624,7 +628,7 @@ int my_postgresql_batch_start(JCR *jcr, B_DB *mdb)
       bmicrosleep(5, 0);
    }
    if (!mdb->result) {
-      Dmsg1(000, "Query failed: %s\n", query);
+      Dmsg1(50, "Query failed: %s\n", query);
       goto bail_out;
    }
 
@@ -635,7 +639,7 @@ int my_postgresql_batch_start(JCR *jcr, B_DB *mdb)
       mdb->num_rows   = 0;
       mdb->status = 1;
    } else {
-      Dmsg1(000, "Result status failed: %s\n", query);
+      Dmsg1(50, "Result status failed: %s\n", query);
       goto bail_out;
    }