lib: added a function to create a qualified resource name with given …

…separator
bareos · Jul 4, 2019 · e95bfb7 · e95bfb7
1 parent 46c25a0
commit e95bfb7
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/core/src/lib/qualified_resource_name_type_converter.cc b/core/src/lib/qualified_resource_name_type_converter.cc
@@ -67,15 +67,25 @@ int QualifiedResourceNameTypeConverter::StringToResourceType(
 bool QualifiedResourceNameTypeConverter::ResourceToString(
     const std::string& name_of_resource,
     const int& r_type,
+    const std::string separator,
     std::string& str_out) const
 {
   std::string r_name = ResourceTypeToString(r_type);
   if (r_name.empty()) { return false; }
-  str_out =
-      r_name + AsciiControlCharacters::RecordSeparator() + name_of_resource;
+  str_out = r_name + separator + name_of_resource;
   return true;
 }
 
+
+bool QualifiedResourceNameTypeConverter::ResourceToString(
+    const std::string& name_of_resource,
+    const int& r_type,
+    std::string& str_out) const
+{
+  std::string separator(1, AsciiControlCharacters::RecordSeparator());
+  return ResourceToString(name_of_resource, r_type, separator, str_out);
+}
+
 bool QualifiedResourceNameTypeConverter::StringToResource(
     std::string& name_of_resource,
     int& r_type,

diff --git a/core/src/lib/qualified_resource_name_type_converter.h b/core/src/lib/qualified_resource_name_type_converter.h
@@ -29,7 +29,11 @@ class QualifiedResourceNameTypeConverter {
   QualifiedResourceNameTypeConverter(const std::map<int, std::string>& map);
   bool ResourceToString(const std::string& name_of_resource,
                         const int& r_type,
-                        std::string& out) const;
+                        std::string& str_out) const;
+  bool ResourceToString(const std::string& name_of_resource,
+                        const int& r_type,
+                        const std::string separator,
+                        std::string& str_out) const;
   bool StringToResource(std::string& name_of_resource,
                         int& r_type,
                         const std::string& in) const;