Generate braces in find_used_compressalgos function.

bareos · May 5, 2013 · d355b16 · d355b16
1 parent 3fa8dea
commit d355b16
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/dird/backup.c b/src/dird/backup.c
@@ -878,7 +878,7 @@ void generate_backup_summary(JCR *jcr, MEDIA_DBR *mr, CLIENT_DBR *cr,
               jcr->res.client->GraceTime +
               jcr->res.client->SoftQuotaGracePeriod);
 
-   find_used_compressalgos( &compress_algo_list, jcr);
+   find_used_compressalgos(&compress_algo_list, jcr);
 
    if (RunTime <= 0) {
       kbps = 0;
@@ -996,7 +996,7 @@ void generate_backup_summary(JCR *jcr, MEDIA_DBR *mr, CLIENT_DBR *cr,
       } else {
          if (jcr->HasBase) {
             Mmsg(client_options, _(
-                 "  Software Compression:   %s (%s)\n"
+                 "  Software Compression:   %s%s\n"
                  "  Base files/Used files:  %lld/%lld (%.2f%%)\n"
                  "  VSS:                    %s\n"
                  "  Encryption:             %s\n"
@@ -1011,7 +1011,7 @@ void generate_backup_summary(JCR *jcr, MEDIA_DBR *mr, CLIENT_DBR *cr,
                  jcr->accurate ? _("yes") : _("no"));
          } else {
             Mmsg(client_options, _(
-                 "  Software Compression:   %s (%s)\n"
+                 "  Software Compression:   %s%s\n"
                  "  VSS:                    %s\n"
                  "  Encryption:             %s\n"
                  "  Accurate:               %s\n"),

diff --git a/src/dird/inc_conf.c b/src/dird/inc_conf.c
@@ -316,6 +316,8 @@ void find_used_compressalgos(POOL_MEM *compressalgos, JCR *jcr)
                   if (bstrncmp(k, fs_opt->option, strlen(fs_opt->option))) {
                      if (cnt > 0) {
                         compressalgos->strcat(",");
+                     } else {
+                        compressalgos->strcat(" (");
                      }
                      compressalgos->strcat(fs_opt->name);
                      k += strlen(fs_opt->option) - 1;
@@ -330,6 +332,10 @@ void find_used_compressalgos(POOL_MEM *compressalgos, JCR *jcr)
          }
       }
    }
+
+   if (cnt > 0) {
+      compressalgos->strcat(")");
+   }
 }
 
 /*