Add namespace Storage to Path

jackburton79 · Feb 12, 2024 · 5c20e77 · 5c20e77
1 parent 3442bfa
commit 5c20e77
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/support/Path.cpp b/support/Path.cpp
@@ -29,7 +29,7 @@ is_absolute_path(const char *path)
 	return (path && path[0] == '/');
 }
 
-
+using namespace Storage;
 
 //! Creates an uninitialized BPath object.
 Path::Path()

diff --git a/support/Path.h b/support/Path.h
@@ -7,6 +7,8 @@
 
 #include "SupportDefs.h"
 
+namespace Storage {
+
 class Path {
 public:
 							Path();
@@ -43,4 +45,6 @@ class Path {
 			status_t		fCStatus;
 };
 
+}; // namespace Storage
+
 #endif	// _PATH_H
diff --git a/support/Utils.cpp b/support/Utils.cpp
@@ -3,12 +3,13 @@
 
 #include <assert.h>
 #include <algorithm>
+#include <cerrno>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <dirent.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
+
 #include <string>
-#include <string.h>
 
 #include <iostream>
 
@@ -45,9 +46,9 @@ fopen_case(const char* filename, const char* flags)
 	assert(filename != NULL);
 	assert(::strlen(filename) > 1);
 
-	Path normalizedFileName(filename);
+	Storage::Path normalizedFileName(filename);
 	std::string newPath("/");
-	char* start = (char*)normalizedFileName.String() + 1;
+	char* start = const_cast<char*>(normalizedFileName.String()) + 1;
 	char* end = start + ::strlen(normalizedFileName.String());
 	size_t where = 0;
 	while ((where = ::strcspn(start, "/")) > 0) {