lots of whitespace changes

remove commented out code

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@939 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/cats/postgresql.c b/bacula/src/cats/postgresql.c
index c502330fc6304227f036cb3ec93f8aa4435de990..2a3cb5736f52b21f5864dd3ef7e172706a8d21b5 100644 (file)
--- a/bacula/src/cats/postgresql.c
+++ b/bacula/src/cats/postgresql.c
@@ -72,9 +72,9 @@ db_init_database(JCR *jcr, char *db_name, char *db_user, char *db_password,
    for (mdb=NULL; (mdb=(B_DB *)qnext(&db_list, &mdb->bq)); ) {
       if (strcmp(mdb->db_name, db_name) == 0) {
          Dmsg2(100, "DB REopen %d %s\n", mdb->ref_count, db_name);
-        mdb->ref_count++;
-        V(mutex);
-        return mdb;                  /* already open */
+         mdb->ref_count++;
+         V(mutex);
+         return mdb;                 /* already open */
       }
    }
    Dmsg0(100, "db_open first time\n");
@@ -95,7 +95,7 @@ db_init_database(JCR *jcr, char *db_name, char *db_user, char *db_password,
    mdb->have_insert_id = TRUE;
    mdb->errmsg        = get_pool_memory(PM_EMSG); /* get error message buffer */
    *mdb->errmsg        = 0;
-   mdb->cmd           = get_pool_memory(PM_EMSG);    /* get command buffer */
+   mdb->cmd               = get_pool_memory(PM_EMSG); /* get command buffer */
    mdb->cached_path    = get_pool_memory(PM_FNAME);
    mdb->cached_path_id = 0;
    mdb->ref_count      = 1;
@@ -160,7 +160,7 @@ db_open_database(JCR *jcr, B_DB *mdb)
       Mmsg2(&mdb->errmsg, _("Unable to connect to PostgreSQL server.\n"
             "Database=%s User=%s\n"
             "It is probably not running or your password is incorrect.\n"),
-           mdb->db_name, mdb->db_user);
+      mdb->db_name, mdb->db_user);
       V(mutex);
       return 0;
    }
@@ -184,7 +184,7 @@ db_close_database(JCR *jcr, B_DB *mdb)
    if (mdb->ref_count == 0) {
       qdchain(&mdb->bq);
       if (mdb->connected && mdb->db) {
-        sql_close(mdb);
+         sql_close(mdb);
       }
       rwl_destroy(&mdb->lock);      
       free_pool_memory(mdb->errmsg);
@@ -194,19 +194,19 @@ db_close_database(JCR *jcr, B_DB *mdb)
       free_pool_memory(mdb->path);
       free_pool_memory(mdb->esc_name);
       if (mdb->db_name) {
-        free(mdb->db_name);
+         free(mdb->db_name);
       }
       if (mdb->db_user) {
-        free(mdb->db_user);
+         free(mdb->db_user);
       }
       if (mdb->db_password) {
-        free(mdb->db_password);
+         free(mdb->db_password);
       }
       if (mdb->db_address) {
-        free(mdb->db_address);
+         free(mdb->db_address);
       }
       if (mdb->db_socket) {
-        free(mdb->db_socket);
+         free(mdb->db_socket);
       }
       free(mdb);
    }
@@ -262,17 +262,17 @@ int db_sql_query(B_DB *mdb, char *query, DB_RESULT_HANDLER *result_handler, void
    if (result_handler != NULL) {
       Dmsg0(50, "db_sql_query invoking handler\n");
       if ((mdb->result = sql_store_result(mdb)) != NULL) {
-        int num_fields = sql_num_fields(mdb);
+         int num_fields = sql_num_fields(mdb);
 
          Dmsg0(50, "db_sql_query sql_store_result suceeded\n");
-        while ((row = sql_fetch_row(mdb)) != NULL) {
+         while ((row = sql_fetch_row(mdb)) != NULL) {
 
             Dmsg0(50, "db_sql_query sql_fetch_row worked\n");
-           if (result_handler(ctx, num_fields, row))
-                  break;
-        }
+            if (result_handler(ctx, num_fields, row))
+               break;
+         }
 
-        sql_free_result(mdb);
+        sql_free_result(mdb);
       }
    }
    db_unlock(mdb);
@@ -289,11 +289,11 @@ POSTGRESQL_ROW my_postgresql_fetch_row(B_DB *mdb)
        int            j;
        POSTGRESQL_ROW row = NULL; // by default, return NULL
 
-        Dmsg0(50, "my_postgresql_fetch_row start\n");
+       Dmsg0(50, "my_postgresql_fetch_row start\n");
 
        if (mdb->row_number == -1 || mdb->row == NULL) {
 
-                Dmsg1(50, "we have need space of %d bytes\n", sizeof(char *) * mdb->num_fields);
+               Dmsg1(50, "we have need space of %d bytes\n", sizeof(char *) * mdb->num_fields);
 
                if (mdb->row != NULL) {
                         Dmsg0(50, "my_postgresql_fetch_row freeing space\n");
@@ -313,17 +313,17 @@ POSTGRESQL_ROW my_postgresql_fetch_row(B_DB *mdb)
                // get each value from this row
                for (j = 0; j < mdb->num_fields; j++) {
                        mdb->row[j] = PQgetvalue(mdb->result, mdb->row_number, j);
-                        Dmsg2(50, "my_postgresql_fetch_row field '%d' has value '%s'\n", j, mdb->row[j]);
+                       Dmsg2(50, "my_postgresql_fetch_row field '%d' has value '%s'\n", j, mdb->row[j]);
                }
                // increment the row number for the next call
                mdb->row_number++;
 
                row = mdb->row;
        } else {
-                Dmsg2(50, "my_postgresql_fetch_row row number '%d' is NOT acceptable (0..%d)\n", mdb->row_number, mdb->num_rows);
+               Dmsg2(50, "my_postgresql_fetch_row row number '%d' is NOT acceptable (0..%d)\n", mdb->row_number, mdb->num_rows);
        }
 
-        Dmsg1(50, "my_postgresql_fetch_row finishes returning %x\n", row);
+       Dmsg1(50, "my_postgresql_fetch_row finishes returning %x\n", row);
 
        return row;
 }
@@ -344,8 +344,8 @@ POSTGRESQL_FIELD * my_postgresql_fetch_field(B_DB *mdb)
 //     }
        mdb->field.flags = 0;
 
-        Dmsg4(50, "my_postgresql_fetch_field finds field '%s' has length='%d' type='%d' and IsNull=%d\n", 
-               mdb->field.name, mdb->field.max_length, mdb->field.type, mdb->field.flags);
+       Dmsg4(50, "my_postgresql_fetch_field finds field '%s' has length='%d' type='%d' and IsNull=%d\n", 
+       mdb->field.name, mdb->field.max_length, mdb->field.type, mdb->field.flags);
 
        // increment this for the next time around
        mdb->field_number++;
@@ -361,38 +361,38 @@ void my_postgresql_data_seek(B_DB *mdb, int row)
 }
 
 void my_postgresql_field_seek(B_DB *mdb, int field)
- {
+{
        mdb->field_number = field;
 }
 
 int my_postgresql_query(B_DB *mdb, char *query) {
-        Dmsg0(50, "my_postgresql_query started\n");
+       Dmsg0(50, "my_postgresql_query started\n");
        // We are starting a new query.  reset everything.
        mdb->num_rows     = -1;
        mdb->row_number   = -1;
        mdb->field_number = -1;
 
 
-        Dmsg1(50, "my_postgresql_query starts with '%s'\n", query);
+       Dmsg1(50, "my_postgresql_query starts with '%s'\n", query);
        mdb->result = PQexec(mdb->db, query);
        mdb->status = PQresultStatus(mdb->result);
        if (mdb->status == PGRES_TUPLES_OK || mdb->status == PGRES_COMMAND_OK) {
-                Dmsg1(50, "we have a result\n", query);
+               Dmsg1(50, "we have a result\n", query);
 
                // how many fields in the set?
                mdb->num_fields = (int) PQnfields(mdb->result);
-                Dmsg1(50, "we have %d fields\n", mdb->num_fields);
+               Dmsg1(50, "we have %d fields\n", mdb->num_fields);
 
                mdb->num_rows   = PQntuples(mdb->result);
-                Dmsg1(50, "we have %d rows\n", mdb->num_rows);
+               Dmsg1(50, "we have %d rows\n", mdb->num_rows);
 
                mdb->status = 0;
        } else {
-                Dmsg1(50, "we failed\n", query);
+               Dmsg1(50, "we failed\n", query);
                mdb->status = 1;
        }
 
-        Dmsg0(50, "my_postgresql_query finishing\n");
+       Dmsg0(50, "my_postgresql_query finishing\n");
 
        return mdb->status;
 }
@@ -429,12 +429,11 @@ int my_postgresql_currval(B_DB *mdb, char *table_name)
 
        char      sequence[NAMEDATALEN-1];
        char      query   [NAMEDATALEN+50];
-//     POOLMEM  *query;
        PGresult *result;
        int       id = 0;
 
-        if (strcasecmp(table_name, "basefiles") == 0) {
-                bstrncpy(sequence, "basefiles_baseid", sizeof(sequence));
+       if (strcasecmp(table_name, "basefiles") == 0) {
+               bstrncpy(sequence, "basefiles_baseid", sizeof(sequence));
        } else {
                bstrncpy(sequence, table_name, sizeof(sequence));
                 bstrncat(sequence, "_",        sizeof(sequence));
@@ -442,24 +441,23 @@ int my_postgresql_currval(B_DB *mdb, char *table_name)
                 bstrncat(sequence, "id",       sizeof(sequence));
        }
 
-        bstrncat(sequence, "_seq", sizeof(sequence));
-        bsnprintf(query, sizeof(query), "SELECT currval('%s')", sequence);
+       bstrncat(sequence, "_seq", sizeof(sequence));
+       bsnprintf(query, sizeof(query), "SELECT currval('%s')", sequence);
 
-//      Mmsg(&query, "SELECT currval('%s')", sequence);
-        Dmsg1(50, "my_postgresql_currval invoked with '%s'\n", query);
+//     Mmsg(&query, "SELECT currval('%s')", sequence);
+       Dmsg1(50, "my_postgresql_currval invoked with '%s'\n", query);
        result = PQexec(mdb->db, query);
 
-        Dmsg0(50, "exec done");
+       Dmsg0(50, "exec done");
 
        if (PQresultStatus(result) == PGRES_TUPLES_OK) {
-                Dmsg0(50, "getting value");
+               Dmsg0(50, "getting value");
                id = atoi(PQgetvalue(result, 0, 0));
-                Dmsg2(50, "got value '%s' which became %d\n", PQgetvalue(result, 0, 0), id);
+               Dmsg2(50, "got value '%s' which became %d\n", PQgetvalue(result, 0, 0), id);
        } else {
-                Mmsg1(&mdb->errmsg, _("error fetching currval: %s\n"), PQerrorMessage(mdb->db));
+               Mmsg1(&mdb->errmsg, _("error fetching currval: %s\n"), PQerrorMessage(mdb->db));
        }
 
-//     free_pool_memory(query);
        PQclear(result);
 
        return id;