Rename db_list_ctx.cat() to db_list_ctx.add()

diff --git a/bacula/src/cats/cats.h b/bacula/src/cats/cats.h
index 970143dc46288b5814c0fd837d26ea05f96138b1..6105fa2b67dd8671cdfe753b53974b34a7844c81 100644 (file)
--- a/bacula/src/cats/cats.h
+++ b/bacula/src/cats/cats.h
@@ -386,7 +386,7 @@ public:
    db_list_ctx() { list = get_pool_memory(PM_FNAME); reset(); }
    ~db_list_ctx() { free_pool_memory(list); list = NULL; }
    void reset() { *list = 0; count = 0;}
-   void cat(const db_list_ctx &str) {
+   void add(const db_list_ctx &str) {
       if (str.count > 0) {
          if (*list) {
             pm_strcat(list, ",");
@@ -395,7 +395,7 @@ public:
          count += str.count;
       }
    }
-   void cat(const char *str) {
+   void add(const char *str) {
       if (count > 0) {
          pm_strcat(list, ",");
       }

diff --git a/bacula/src/cats/sql.c b/bacula/src/cats/sql.c
index 5d822c034d63895deaffd9f505714ea081a06a5d..143c82e96736f3f4420efe4d2b93396199393e3a 100644 (file)
--- a/bacula/src/cats/sql.c
+++ b/bacula/src/cats/sql.c
@@ -106,7 +106,7 @@ int db_list_handler(void *ctx, int num_fields, char **row)
 {
    db_list_ctx *lctx = (db_list_ctx *)ctx;
    if (num_fields == 1 && row[0]) {
-      lctx->cat(row[0]);
+      lctx->add(row[0]);
    }
    return 0;
 }

diff --git a/bacula/src/dird/ua_dotcmds.c b/bacula/src/dird/ua_dotcmds.c
index 72645b1c914651b75a4fc296f55ba1bac34a6c76..8fb18fcadfc59da5dd0d4dac7ac9a3e806b5f309 100644 (file)
--- a/bacula/src/dird/ua_dotcmds.c
+++ b/bacula/src/dird/ua_dotcmds.c
@@ -541,7 +541,7 @@ static bool dot_bvfs_get_jobids(UAContext *ua, const char *cmd)
       if (!db_accurate_get_jobids(ua->jcr, ua->db, &jr, &tempids)) {
          return true;
       }
-      jobids.cat(tempids);
+      jobids.add(tempids);
    }
 
    ua->send_msg("%s\n", jobids.list);

diff --git a/bacula/src/dird/ua_prune.c b/bacula/src/dird/ua_prune.c
index 1fb6289c908dfb64c25fc5ed59115f646a13a331..a993edba6dde0cd73fcf7bb200878794ca49c561 100644 (file)
--- a/bacula/src/dird/ua_prune.c
+++ b/bacula/src/dird/ua_prune.c
@@ -539,7 +539,7 @@ int prune_jobs(UAContext *ua, CLIENT *client, POOL *pool, int JobType)
       jr.ClientId = elt->ClientId;   /* should be always the same */
       jr.FileSetId = elt->FileSetId;
       db_accurate_get_jobids(ua->jcr, ua->db, &jr, &tempids);
-      jobids.cat(tempids);
+      jobids.add(tempids);
    }
 
    /* Discard latest Verify level=InitCatalog job