Change 'append_filter' sql helper to a function

It's more safe to have a function instead of a macro in terms of type
checking at least.

diff --git a/bacula/src/cats/cats.c b/bacula/src/cats/cats.c
index a3b7bba5d78589c4359e3b8750fff10f7fe79f4f..4dbfedf9748b0b953165d3ed6799fa66486237c2 100644 (file)
--- a/bacula/src/cats/cats.c
+++ b/bacula/src/cats/cats.c
@@ -32,6 +32,17 @@
  
 #include "cats.h" 
  
+void append_filter(POOLMEM **buf, char *cond)
+{
+   if (*buf[0] != '\0') {
+      pm_strcat(buf, " AND ");
+   } else {
+      pm_strcpy(buf, " WHERE ");
+   }
+
+   pm_strcat(buf, cond);
+}
+
 bool BDB::bdb_match_database(const char *db_driver, const char *db_name, 
                              const char *db_address, int db_port) 
 { 
@@ -240,64 +251,64 @@ void OBJECT_DBR::create_db_filter(JCR *jcr, POOLMEM **where)
 
    if (ObjectId > 0) {
       Mmsg(tmp, " Object.ObjectId=%lu", ObjectId);
-      append_filter(*where, tmp.c_str());
+      append_filter(where, tmp.c_str());
    } else {
       if (JobId != 0) {
          Mmsg(tmp, " Object.JobId=%lu", JobId);
-         append_filter(*where, tmp.c_str());
+         append_filter(where, tmp.c_str());
       }
 
       if (Path[0] != 0) {
          db_escape_string(jcr, jcr->db, esc.c_str(), Path, strlen(Path));
          Mmsg(tmp, " Object.Path='%s'", esc.c_str());
-         append_filter(*where, tmp.c_str());
+         append_filter(where, tmp.c_str());
       }
 
       if (Filename[0] != 0) {
          db_escape_string(jcr, jcr->db, esc.c_str(), Filename, strlen(Filename));
          Mmsg(tmp, " Object.Filename='%s'", esc.c_str());
-         append_filter(*where, tmp.c_str());
+         append_filter(where, tmp.c_str());
       }
 
       if (PluginName[0] != 0) {
          db_escape_string(jcr, jcr->db, esc.c_str(), PluginName, strlen(PluginName));
          Mmsg(tmp, " Object.PluginName='%s'", esc.c_str());
-         append_filter(*where, tmp.c_str());
+         append_filter(where, tmp.c_str());
       }
 
       if (ObjectCategory[0] != 0) {
          db_escape_string(jcr, jcr->db, esc.c_str(), ObjectCategory, strlen(ObjectCategory));
          Mmsg(tmp, " Object.ObjectCategory='%s'", esc.c_str());
-         append_filter(*where, tmp.c_str());
+         append_filter(where, tmp.c_str());
       }
 
       if (ObjectType[0] != 0) {
          db_escape_string(jcr, jcr->db, esc.c_str(), ObjectType, strlen(ObjectType));
          Mmsg(tmp, " Object.ObjectType='%s'", esc.c_str());
-         append_filter(*where, tmp.c_str());
+         append_filter(where, tmp.c_str());
       }
 
       if (ObjectName[0] != 0) {
          db_escape_string(jcr, jcr->db, esc.c_str(), ObjectName, strlen(ObjectName));
          Mmsg(tmp, " Object.Objectname='%s'", esc.c_str());
-         append_filter(*where, tmp.c_str());
+         append_filter(where, tmp.c_str());
       }
 
       if (ObjectSource[0] != 0) {
          db_escape_string(jcr, jcr->db, esc.c_str(), ObjectSource, strlen(ObjectSource));
          Mmsg(tmp, " Object.ObjectSource='%s'", esc.c_str());
-         append_filter(*where, tmp.c_str());
+         append_filter(where, tmp.c_str());
       }
 
       if (ObjectUUID[0] != 0) {
          db_escape_string(jcr, jcr->db, esc.c_str(), ObjectUUID, strlen(ObjectUUID));
          Mmsg(tmp, " Object.ObjectUUID='%s'", esc.c_str());
-         append_filter(*where, tmp.c_str());
+         append_filter(where, tmp.c_str());
       }
 
       if (ObjectSize > 0) {
          Mmsg(tmp, " Object.ObjectSize=%llu", ObjectSize);
-         append_filter(*where, tmp.c_str());
+         append_filter(where, tmp.c_str());
       }
    }
 

diff --git a/bacula/src/cats/cats.h b/bacula/src/cats/cats.h
index 5c8fe51764cf91ef37900c60e0375bd8dd07f3b5..9e8eefcbaa724cc8eaef0088b66902e0e26d7229 100644 (file)
--- a/bacula/src/cats/cats.h
+++ b/bacula/src/cats/cats.h
@@ -69,16 +69,7 @@ typedef enum {
    SQL_DRIVER_TYPE_DBI        = 3
 } SQL_DRIVER;
 
-#define append_filter(buf, sql)  \
-   do {                          \
-      if (*buf) {                \
-         pm_strcat(buf, " AND ");\
-      } else {                   \
-         pm_strcpy(buf, " WHERE ");\
-      }                          \
-      pm_strcat(buf, sql);       \
-   } while (0)
-
+void append_filter(POOLMEM **buf, char *cond);
 
 /* ==============================================================
  *

diff --git a/bacula/src/cats/sql_list.c b/bacula/src/cats/sql_list.c
index 68708f0a74539d63df65724cf0d2572e189e3b52..a7de244ea9750cee2da6715accdea506cba57b29 100644 (file)
--- a/bacula/src/cats/sql_list.c
+++ b/bacula/src/cats/sql_list.c
@@ -160,38 +160,12 @@ void BDB::bdb_list_plugin_objects(JCR *jcr, OBJECT_DBR *obj_r, DB_LIST_HANDLER *
    bdb_lock();
 
    //TODO add ACL part
-   if (obj_r->ObjectName[0] != 0) {
-      bdb_escape_string(jcr, esc.c_str(), obj_r->ObjectName, strlen(obj_r->ObjectName));
-      Mmsg(tmp, " Object.ObjectName='%s'", esc.c_str());
-      append_filter(where.addr(), tmp.c_str());
-   }
-
-   if (obj_r->ObjectType[0] != 0) {
-      bdb_escape_string(jcr, esc.c_str(), obj_r->ObjectType, strlen(obj_r->ObjectType));
-      Mmsg(tmp, " Object.ObjectType='%s'", esc.c_str());
-      append_filter(where.addr(), tmp.c_str());
-   }
-
-   if (obj_r->ObjectCategory[0] != 0) {
-      bdb_escape_string(jcr, esc.c_str(), obj_r->ObjectCategory, strlen(obj_r->ObjectCategory));
-      Mmsg(tmp, " Object.ObjectCategory='%s'", esc.c_str());
-      append_filter(where.addr(), tmp.c_str());
-   }
-
-   if (obj_r->ObjectId != 0) {
-      Mmsg(tmp, " Object.ObjectId=%d", obj_r->ObjectId);
-      append_filter(where.addr(), tmp.c_str());
-   }
-
-   if (obj_r->JobId != 0) {
-      Mmsg(tmp, " Object.JobId=%d", obj_r->JobId);
-      append_filter(where.addr(), tmp.c_str());
-   }
+   obj_r->create_db_filter(jcr, where.handle());
 
    if (obj_r->ClientName[0] != 0) {
       bdb_escape_string(jcr, esc.c_str(), obj_r->ClientName, strlen(obj_r->ClientName));
       Mmsg(tmp, " Client.Name='%s'", esc.c_str());
-      append_filter(where.addr(), tmp.c_str());
+      append_filter(where.handle(), tmp.c_str());
       Mmsg(join, " INNER JOIN Job On Object.JobId=Job.JobId "   
                  " INNER JOIN Client ON Job.ClientId=Client.ClientId ");
    }
@@ -717,49 +691,49 @@ alist *BDB::bdb_list_job_records(JCR *jcr, JOB_DBR *jr, DB_LIST_HANDLER *sendit,
    if (jr->Name[0]) {
       bdb_escape_string(jcr, esc, jr->Name, strlen(jr->Name));
       Mmsg(tmp, " Job.Name='%s' ", esc);
-      append_filter(where, tmp);
+      append_filter(&where, tmp);
 
    } else if (jr->JobId != 0) {
       Mmsg(tmp, " Job.JobId=%s ", edit_int64(jr->JobId, ed1));
-      append_filter(where, tmp);
+      append_filter(&where, tmp);
 
    } else if (jr->Job[0] != 0) {
       bdb_escape_string(jcr, esc, jr->Job, strlen(jr->Job));
       Mmsg(tmp, " Job.Job='%s' ", esc);
-      append_filter(where, tmp);
+      append_filter(&where, tmp);
 
    } else if (jr->Reviewed > 0) {
       Mmsg(tmp, " Job.Reviewed = %d ", jr->Reviewed);
-      append_filter(where, tmp);
+      append_filter(&where, tmp);
    }
 
    if (type == INCOMPLETE_JOBS && jr->JobStatus == JS_FatalError) {
       Mmsg(tmp, " Job.JobStatus IN ('E', 'f') ");
-      append_filter(where, tmp);
+      append_filter(&where, tmp);
 
    } else if (jr->JobStatus) {
       Mmsg(tmp, " Job.JobStatus='%c' ", jr->JobStatus);
-      append_filter(where, tmp);
+      append_filter(&where, tmp);
    }
 
    if (jr->JobType) {
       Mmsg(tmp, " Job.Type='%c' ", jr->JobType);
-      append_filter(where, tmp);
+      append_filter(&where, tmp);
    }
 
    if (jr->JobLevel) {
       Mmsg(tmp, " Job.Level='%c' ", jr->JobLevel);
-      append_filter(where, tmp);
+      append_filter(&where, tmp);
    }
 
    if (jr->JobErrors > 0) {
       Mmsg(tmp, " Job.JobErrors > 0 ");
-      append_filter(where, tmp);
+      append_filter(&where, tmp);
    }
 
    if (jr->ClientId > 0) {
       Mmsg(tmp, " Job.ClientId=%s ", edit_int64(jr->ClientId, ed1));
-      append_filter(where, tmp);
+      append_filter(&where, tmp);
    }
 
    where_tmp = get_acls(DB_ACL_BIT(DB_ACL_CLIENT)  |
@@ -983,54 +957,54 @@ void BDB::bdb_list_snapshot_records(JCR *jcr, SNAPSHOT_DBR *sdbr,
    if (sdbr->Name[0]) {
       bdb_escape_string(jcr, esc, sdbr->Name, strlen(sdbr->Name));
       Mmsg(tmp, "Name='%s'", esc);
-      append_filter(filter, tmp);
+      append_filter(&filter, tmp);
    }
    if (sdbr->SnapshotId > 0) {
       Mmsg(tmp, "Snapshot.SnapshotId=%d", sdbr->SnapshotId);
-      append_filter(filter, tmp);
+      append_filter(&filter, tmp);
    }
    if (sdbr->ClientId > 0) {
       Mmsg(tmp, "Snapshot.ClientId=%d", sdbr->ClientId);
-      append_filter(filter, tmp);
+      append_filter(&filter, tmp);
    }
    if (sdbr->JobId > 0) {
       Mmsg(tmp, "Snapshot.JobId=%d", sdbr->JobId);
-      append_filter(filter, tmp);
+      append_filter(&filter, tmp);
    }
    if (*sdbr->Client) {
       bdb_escape_string(jcr, esc, sdbr->Client, strlen(sdbr->Client));
       Mmsg(tmp, "Client.Name='%s'", esc);
-      append_filter(filter, tmp);
+      append_filter(&filter, tmp);
    }
    if (sdbr->Device && *(sdbr->Device)) {
       esc = check_pool_memory_size(esc, strlen(sdbr->Device) * 2 + 1);
       bdb_escape_string(jcr, esc, sdbr->Device, strlen(sdbr->Device));
       Mmsg(tmp, "Device='%s'", esc);
-      append_filter(filter, tmp);
+      append_filter(&filter, tmp);
    }
    if (*sdbr->Type) {
       bdb_escape_string(jcr, esc, sdbr->Type, strlen(sdbr->Type));
       Mmsg(tmp, "Type='%s'", esc);
-      append_filter(filter, tmp);
+      append_filter(&filter, tmp);
    }
    if (*sdbr->created_before) {
       bdb_escape_string(jcr, esc, sdbr->created_before, strlen(sdbr->created_before));
       Mmsg(tmp, "CreateDate <= '%s'", esc);
-      append_filter(filter, tmp);
+      append_filter(&filter, tmp);
    }
    if (*sdbr->created_after) {
       bdb_escape_string(jcr, esc, sdbr->created_after, strlen(sdbr->created_after));
       Mmsg(tmp, "CreateDate >= '%s'", esc);
-      append_filter(filter, tmp);
+      append_filter(&filter, tmp);
    }
    if (sdbr->expired) {
       Mmsg(tmp, "CreateTDate < (%s - Retention)", edit_int64(time(NULL), ed1));
-      append_filter(filter, tmp);
+      append_filter(&filter, tmp);
    }
    if (*sdbr->CreateDate) {
       bdb_escape_string(jcr, esc, sdbr->CreateDate, strlen(sdbr->CreateDate));
       Mmsg(tmp, "CreateDate = '%s'", esc);
-      append_filter(filter, tmp);
+      append_filter(&filter, tmp);
    }
 
    if (sdbr->sorted_client) {