From 741c4815de865ecaf5219d125ccd254ba00ad0df Mon Sep 17 00:00:00 2001 From: Eric Bollengier Date: Thu, 3 Feb 2011 13:00:59 +0100 Subject: [PATCH] Rename db_list_ctx.cat() to db_list_ctx.add() --- bacula/src/cats/cats.h | 4 ++-- bacula/src/cats/sql.c | 2 +- bacula/src/dird/ua_dotcmds.c | 2 +- bacula/src/dird/ua_prune.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bacula/src/cats/cats.h b/bacula/src/cats/cats.h index 970143dc46..6105fa2b67 100644 --- 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 5d822c034d..143c82e967 100644 --- 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 72645b1c91..8fb18fcadf 100644 --- 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 1fb6289c90..a993edba6d 100644 --- 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 -- 2.39.5