Cleanup and generalize os string class.

3 files changed, 9 insertions, 9 deletions

diff --git a/cli/cli_diff.cpp b/cli/cli_diff.cpp
index 4d24973..d9d6257 100644
--- a/cli/cli_diff.cpp
+++ b/cli/cli_diff.cpp
@@ -29,7 +29,7 @@
 #include <iostream>
 
 #include "cli.hpp"
-#include "os_path.hpp"
+#include "os_string.hpp"
 #include "os_process.hpp"
 #include "trace_tools.hpp"
 
@@ -83,7 +83,7 @@ command(int argc, char *argv[])
 
 #define CLI_DIFF_TRACEDIFF_COMMAND "tracediff.sh"
 
-    os::Path command = trace::findFile("scripts/" CLI_DIFF_TRACEDIFF_COMMAND,
+    os::String command = trace::findFile("scripts/" CLI_DIFF_TRACEDIFF_COMMAND,
                  APITRACE_SCRIPTS_INSTALL_DIR "/" CLI_DIFF_TRACEDIFF_COMMAND,
                                        true);
 
@@ -98,7 +98,7 @@ command(int argc, char *argv[])
     std::cerr << "The 'apitrace diff' command is not yet supported on this O/S.\n";
     return 1;
 #else
-    os::Path apitrace = os::getProcessName();
+    os::String apitrace = os::getProcessName();
     setenv("APITRACE", apitrace.str(), 1);
 
     return os::execute(args);
diff --git a/cli/cli_diff_images.cpp b/cli/cli_diff_images.cpp
index 390174c..91f07c1 100644
--- a/cli/cli_diff_images.cpp
+++ b/cli/cli_diff_images.cpp
@@ -29,12 +29,12 @@
 #include <iostream>
 
 #include "cli.hpp"
-#include "os_path.hpp"
+#include "os_string.hpp"
 #include "trace_tools.hpp"
 
 static const char *synopsis = "Identify differences between two image dumps.";
 
-static os::Path
+static os::String
 find_command(void)
 {
 #define CLI_DIFF_IMAGES_COMMAND "snapdiff.py"
@@ -50,7 +50,7 @@ usage(void)
 {
     char *args[3];
 
-    os::Path command = find_command();
+    os::String command = find_command();
 
     args[0] = (char *) command.str();
     args[1] = (char *) "--help";
@@ -71,7 +71,7 @@ command(int argc, char *argv[])
     int i;
     char **args = new char* [argc+2];
 
-    os::Path command = find_command();
+    os::String command = find_command();
 
     args[0] = (char *) command.str();
 
diff --git a/cli/cli_diff_state.cpp b/cli/cli_diff_state.cpp
index 5dd0fbe..55d8083 100644
--- a/cli/cli_diff_state.cpp
+++ b/cli/cli_diff_state.cpp
@@ -29,7 +29,7 @@
 #include <iostream>
 
 #include "cli.hpp"
-#include "os_path.hpp"
+#include "os_string.hpp"
 #include "os_process.hpp"
 #include "trace_tools.hpp"
 
@@ -83,7 +83,7 @@ command(int argc, char *argv[])
 
 #define CLI_DIFF_STATE_COMMAND "jsondiff.py"
 
-    os::Path command = trace::findFile("scripts/" CLI_DIFF_STATE_COMMAND,
+    os::String command = trace::findFile("scripts/" CLI_DIFF_STATE_COMMAND,
                  APITRACE_SCRIPTS_INSTALL_DIR "/" CLI_DIFF_STATE_COMMAND,
                                        true);