X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=verify-state.h;h=6da1585b24657a60d7357d4f04f6f445f01544f3;hp=f1dc069ec68f4c928f5aca9a0dad9d9c3519cc4e;hb=01bf5128d0581e267383f280c6a1dcd26517240f;hpb=94a6e1bb4e7d8e7fee66374841634b0f871c6d6d diff --git a/verify-state.h b/verify-state.h index f1dc069e..6da1585b 100644 --- a/verify-state.h +++ b/verify-state.h @@ -2,6 +2,9 @@ #define FIO_VERIFY_STATE_H #include +#include +#include +#include "lib/nowarn_snprintf.h" struct thread_rand32_state { uint32_t s[4]; @@ -75,14 +78,31 @@ static inline size_t thread_io_list_sz(struct thread_io_list *s) static inline struct thread_io_list *io_list_next(struct thread_io_list *s) { - return (void *) s + thread_io_list_sz(s); + return (struct thread_io_list *)((char *) s + thread_io_list_sz(s)); } static inline void verify_state_gen_name(char *out, size_t size, const char *name, const char *prefix, int num) { - snprintf(out, size, "%s-%s-%d-verify.state", prefix, name, num); + char ename[PATH_MAX]; + char *ptr; + + /* + * Escape '/', just turn them into '.' + */ + ptr = ename; + do { + *ptr = *name; + if (*ptr == '\0') + break; + else if (*ptr == '/') + *ptr = '.'; + ptr++; + name++; + } while (1); + + nowarn_snprintf(out, size, "%s-%s-%d-verify.state", prefix, ename, num); out[size - 1] = '\0'; }