Add simple way to add string elements to db_list_ctx

diff --git a/bacula/src/cats/cats.h b/bacula/src/cats/cats.h
index d70540f6eabe1d34a6bd536fa04db898bd53d778..970143dc46288b5814c0fd837d26ea05f96138b1 100644 (file)
--- a/bacula/src/cats/cats.h
+++ b/bacula/src/cats/cats.h
@@ -395,6 +395,13 @@ public:
          count += str.count;
       }
    }
+   void cat(const char *str) {
+      if (count > 0) {
+         pm_strcat(list, ",");
+      }
+      pm_strcat(list, str);
+      count++;
+   }
 private:
    db_list_ctx(const db_list_ctx&);            /* prohibit pass by value */
    db_list_ctx &operator=(const db_list_ctx&); /* prohibit class assignment */

diff --git a/bacula/src/cats/sql.c b/bacula/src/cats/sql.c
index 8c1105d2c69f0e79d6d64bbfbca7e0ca3bad6db0..5d822c034d63895deaffd9f505714ea081a06a5d 100644 (file)
--- a/bacula/src/cats/sql.c
+++ b/bacula/src/cats/sql.c
@@ -106,11 +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]) {
-      if (lctx->list[0]) {
-         pm_strcat(lctx->list, ",");
-      }
-      pm_strcat(lctx->list, row[0]);
-      lctx->count++;
+      lctx->cat(row[0]);
    }
    return 0;
 }