fix review comments

bareos · Dec 1, 2022 · 84c66e1 · 84c66e1
1 parent 3f97f01
commit 84c66e1
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git a/core/src/filed/fd_plugins.cc b/core/src/filed/fd_plugins.cc
@@ -881,7 +881,6 @@ int PluginEstimate(JobControlRecord* jcr, FindFilesPacket* ff_pkt, bool)
 {
   int len;
   char* cmd = ff_pkt->top_fname;
-  save_pkt sp;
   bEvent event;
   bEventType eventType;
   PoolMem fname(PM_FNAME);
@@ -931,6 +930,7 @@ int PluginEstimate(JobControlRecord* jcr, FindFilesPacket* ff_pkt, bool)
 
     // Loop getting filenames to backup then saving them
     while (!jcr->IsJobCanceled()) {
+      save_pkt sp;
       sp.portable = true;
       CopyBits(FO_MAX, ff_pkt->flags, sp.flags);
       sp.cmd = cmd;
@@ -1427,9 +1427,9 @@ BxattrExitCode PluginBuildXattrStreams(
     int xattr_count = 0;
     xattr_t* current_xattr;
     uint32_t expected_serialize_len = 0;
-    xattr_pkt xp;
 
     while (1) {
+      xattr_pkt xp;
       xp.fname = xattr_data->last_fname;
 
       switch (PlugFunc(plugin)->getXattr(jcr->plugin_ctx, &xp)) {

diff --git a/core/src/filed/fd_plugins.h b/core/src/filed/fd_plugins.h
@@ -61,14 +61,11 @@ struct BareosFilePacket;
 struct FindFilesPacket;
 #endif /* FILE_DAEMON */
 
-namespace IoStatus {
-enum IoStatus : int
-{
-  error = -1,
-  success = 0,
-  do_io_in_core = 1,
+struct IoStatus {
+  static constexpr int error = -1;
+  static constexpr int success = 0;
+  static constexpr int do_io_in_core = 1;
 };
-}
 
 template <typename T> class alist;
 

diff --git a/core/src/plugins/filed/python/test/python-fd-module-tester.cc b/core/src/plugins/filed/python/test/python-fd-module-tester.cc
@@ -99,7 +99,7 @@ bRC bareosJobMsg(PluginContext*,
     char buffer[1024]{};
     va_list arg_ptr;
     va_start(arg_ptr, fmt);
-    vsprintf(buffer, fmt, arg_ptr);
+    vsnprintf(buffer, 1024, fmt, arg_ptr);
     va_end(arg_ptr);
     printf("bareosJobMsg file:%s line:%d type:%d time: %+" PRId64 ", %s\n",
            file, line, type, (int64_t)mtime, buffer);
@@ -118,7 +118,7 @@ static bRC bareosDebugMsg(PluginContext*,
   char buffer[1024]{};
   va_list arg_ptr;
   va_start(arg_ptr, fmt);
-  vsprintf(buffer, fmt, arg_ptr);
+  vsnprintf(buffer, 1024, fmt, arg_ptr);
   va_end(arg_ptr);
   printf("bareosDebugMsg: %s %d %d %s\n", fname, line, level, buffer);
   return bRC_OK;