Cleanup bit operations.

bareos · Feb 17, 2015 · 2ce0c0c · 2ce0c0c
1 parent 48bb37c
commit 2ce0c0c
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/src/filed/fd_plugins.c b/src/filed/fd_plugins.c
@@ -467,7 +467,7 @@ bRC plugin_option_handle_file(JCR *jcr, FF_PKT *ff_pkt, struct save_pkt *sp)
    memset(sp, 0, sizeof(struct save_pkt));
    sp->pkt_size = sp->pkt_end = sizeof(struct save_pkt);
    sp->portable = true;
-   clone_bits(FO_MAX, ff_pkt->flags, sp->flags);
+   copy_bits(FO_MAX, ff_pkt->flags, sp->flags);
    sp->cmd = cmd;
    sp->link = ff_pkt->link;
    sp->statp = ff_pkt->statp;
@@ -599,7 +599,7 @@ int plugin_save(JCR *jcr, FF_PKT *ff_pkt, bool top_level)
          sp.pkt_end = sizeof(sp);
          sp.portable = true;
          sp.no_read = false;
-         clone_bits(FO_MAX, ff_pkt->flags, sp.flags);
+         copy_bits(FO_MAX, ff_pkt->flags, sp.flags);
          sp.cmd = cmd;
          Dmsg3(dbglvl, "startBackup st_size=%p st_blocks=%p sp=%p\n", &sp.statp.st_size, &sp.statp.st_blocks, &sp);
 
@@ -622,7 +622,7 @@ int plugin_save(JCR *jcr, FF_PKT *ff_pkt, bool top_level)
          /*
           * Save original flags.
           */
-         memcpy(flags, ff_pkt->flags, sizeof(flags));
+         copy_bits(FO_MAX, ff_pkt->flags, flags);
 
          /*
           * Copy fname and link because save_file() zaps them.  This avoids zaping the plugin's strings.
@@ -724,7 +724,7 @@ int plugin_save(JCR *jcr, FF_PKT *ff_pkt, bool top_level)
          /*
           * Restore original flags.
           */
-         memcpy(ff_pkt->flags, flags, sizeof(flags));
+         copy_bits(FO_MAX, flags, ff_pkt->flags);
 
          ret = plug_func(ctx->plugin)->endBackupFile(ctx);
          if (ret == bRC_More || ret == bRC_OK) {
@@ -825,7 +825,7 @@ int plugin_estimate(JCR *jcr, FF_PKT *ff_pkt, bool top_level)
          sp.pkt_size = sizeof(sp);
          sp.pkt_end = sizeof(sp);
          sp.portable = true;
-         clone_bits(FO_MAX, ff_pkt->flags, sp.flags);
+         copy_bits(FO_MAX, ff_pkt->flags, sp.flags);
          sp.cmd = cmd;
          Dmsg3(dbglvl, "startBackup st_size=%p st_blocks=%p sp=%p\n",
                &sp.statp.st_size, &sp.statp.st_blocks, &sp);

diff --git a/src/findlib/find.c b/src/findlib/find.c
@@ -138,7 +138,7 @@ int find_files(JCR *jcr, FF_PKT *ff,
             findFOPTS *fo;
 
             fo = (findFOPTS *)incexe->opts_list.get(j);
-            clone_bits(FO_MAX, fo->flags, ff->flags);
+            copy_bits(FO_MAX, fo->flags, ff->flags);
             ff->Compress_algo = fo->Compress_algo;
             ff->Compress_level = fo->Compress_level;
             ff->strip_path = fo->strip_path;
@@ -257,7 +257,7 @@ bool accept_file(FF_PKT *ff)
       findFOPTS *fo;
 
       fo = (findFOPTS *)incexe->opts_list.get(j);
-      clone_bits(FO_MAX, fo->flags, ff->flags);
+      copy_bits(FO_MAX, fo->flags, ff->flags);
       ff->Compress_algo = fo->Compress_algo;
       ff->Compress_level = fo->Compress_level;
       ff->fstypes = fo->fstype;

diff --git a/src/findlib/match.c b/src/findlib/match.c
@@ -403,7 +403,7 @@ struct s_included_file *get_next_included_file(FF_PKT *ff, struct s_included_fil
     * copy inc_options for this file into the ff packet
     */
    if (inc) {
-      clone_bits(FO_MAX, inc->options, ff->flags);
+      copy_bits(FO_MAX, inc->options, ff->flags);
       ff->Compress_algo = inc->algo;
       ff->Compress_level = inc->level;
    }

diff --git a/src/lib/bits.h b/src/lib/bits.h
@@ -52,7 +52,7 @@
 /*
  * Clear all bits
  */
-#define clear_all_bits(b, var) memset(var, 0, nbytes_for_bits((b)))
+#define clear_all_bits(b, var) memset((var), 0, nbytes_for_bits((b)))
 
 /*
  * Set range of bits
@@ -82,4 +82,9 @@
          set_bit(bit, (var2)); \
 }
 
+/*
+ * Copy all bits from var1 to var2
+ */
+#define copy_bits(b, var1, var2) memcpy((var2), (var1), nbytes_for_bits((b)))
+
 #endif /* __BITS_H_ */