storage: continue namespace

bareos · Aug 17, 2018 · 83905bd · 83905bd
1 parent a8c2528
commit 83905bd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/core/src/stored/ansi_label.cc b/core/src/stored/ansi_label.cc
@@ -31,12 +31,9 @@
 #include "include/bareos.h"                   /* pull in global headers */
 #include "stored/stored.h"                   /* pull in Storage Daemon headers */
 #include "stored/label.h"
+#include "stored/ebcdic.h"
 #include "include/jcr.h"
 
-/* Imported functions */
-void AsciiToEbcdic(char *dst, char *src, int count);
-void EbcdicToAscii(char *dst, char *src, int count);
-
 namespace storagedaemon {
 
 /* Forward referenced functions */
@@ -118,7 +115,7 @@ int ReadAnsiIbmLabel(DeviceControlRecord *dcr)
                /*
                 * Try EBCDIC
                 */
-               EbcdicToAscii(label, label, sizeof(label));
+               storagedaemon::EbcdicToAscii(label, label, sizeof(label));
                if (bstrncmp("VOL1", label, 4)) {
                   ok = true;;
                   dev->label_type = B_IBM_LABEL;

diff --git a/core/src/stored/ebcdic.cc b/core/src/stored/ebcdic.cc
@@ -29,6 +29,8 @@
  * ebcdic <-> ascii conversion routines
  */
 
+namespace storagedaemon {
+
 /* Mapping of EBCDIC codes to ASCII equivalents. */
 static char to_ascii_table[256] = {
    '\000', '\001', '\002', '\003',
@@ -187,3 +189,5 @@ void EbcdicToAscii(char *dst, char *src, int count)
       *dst++ = to_ascii_table[0377 & *src++];
    }
 }
+
+} /* namespace storagedaemon */