From: Josef Bacik <jbacik@xxxxxx>
Instead of a string let's use this as a character so we can search for
it in path names.
Signed-off-by: Josef Bacik <jbacik@xxxxxx>
---
filesetup.c | 2 +-
os/os-windows.h | 2 +-
os/os.h | 2 +-
verify.c | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/filesetup.c b/filesetup.c
index 0631a01f96a6..a7bbcede08d1 100644
--- a/filesetup.c
+++ b/filesetup.c
@@ -1725,7 +1725,7 @@ static int recurse_dir(struct thread_data *td, const char *dirname)
if (!strcmp(dir->d_name, ".") || !strcmp(dir->d_name, ".."))
continue;
- sprintf(full_path, "%s%s%s", dirname, FIO_OS_PATH_SEPARATOR, dir->d_name);
+ sprintf(full_path, "%s%c%s", dirname, FIO_OS_PATH_SEPARATOR, dir->d_name);
if (lstat(full_path, &sb) == -1) {
if (errno != ENOENT) {
diff --git a/os/os-windows.h b/os/os-windows.h
index 36b421ee45ad..9e6f21ef5a5d 100644
--- a/os/os-windows.h
+++ b/os/os-windows.h
@@ -37,7 +37,7 @@ int rand_r(unsigned *);
#define FIO_PREFERRED_ENGINE "windowsaio"
#define FIO_PREFERRED_CLOCK_SOURCE CS_CGETTIME
-#define FIO_OS_PATH_SEPARATOR "\\"
+#define FIO_OS_PATH_SEPARATOR '\'
#define FIO_MAX_CPUS MAXIMUM_PROCESSORS
diff --git a/os/os.h b/os/os.h
index f62b4270f838..1a4437c940ad 100644
--- a/os/os.h
+++ b/os/os.h
@@ -155,7 +155,7 @@ extern int fio_cpus_split(os_cpu_mask_t *mask, unsigned int cpu);
#endif
#ifndef FIO_OS_PATH_SEPARATOR
-#define FIO_OS_PATH_SEPARATOR "/"
+#define FIO_OS_PATH_SEPARATOR '/'
#endif
#ifndef FIO_PREFERRED_CLOCK_SOURCE
diff --git a/verify.c b/verify.c
index 1f177d756d24..db6e17e4def8 100644
--- a/verify.c
+++ b/verify.c
@@ -252,7 +252,7 @@ static void dump_buf(char *buf, unsigned int len, unsigned long long offset,
memset(fname, 0, sizeof(fname));
if (aux_path)
- sprintf(fname, "%s%s", aux_path, FIO_OS_PATH_SEPARATOR);
+ sprintf(fname, "%s%c", aux_path, FIO_OS_PATH_SEPARATOR);
strncpy(fname + strlen(fname), basename(ptr), buf_left - 1);
@@ -1726,7 +1726,7 @@ void verify_save_state(int mask)
char prefix[PATH_MAX];
if (aux_path)
- sprintf(prefix, "%s%slocal", aux_path, FIO_OS_PATH_SEPARATOR);
+ sprintf(prefix, "%s%clocal", aux_path, FIO_OS_PATH_SEPARATOR);
else
strcpy(prefix, "local");
--
2.7.4
--
To unsubscribe from this list: send the line "unsubscribe fio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
