diff options
Diffstat (limited to '')
| -rw-r--r-- | tools/tool.h | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/tools/tool.h b/tools/tool.h index 51301c6..ee6c8eb 100644 --- a/tools/tool.h +++ b/tools/tool.h | |||
| @@ -9,8 +9,7 @@ | |||
| 9 | #include "../src/nissy.h" | 9 | #include "../src/nissy.h" |
| 10 | #include "nissy_extra.h" | 10 | #include "nissy_extra.h" |
| 11 | 11 | ||
| 12 | static void log_stderr(const char *); | 12 | static void log_stdout(const char *, void *); |
| 13 | static void log_stdout(const char *); | ||
| 14 | static double timerun(void (*)(void)); | 13 | static double timerun(void (*)(void)); |
| 15 | static void writetable(const char *, int64_t, const char *); | 14 | static void writetable(const char *, int64_t, const char *); |
| 16 | static long long int generatetable(const char *, char **, | 15 | static long long int generatetable(const char *, char **, |
| @@ -23,13 +22,7 @@ static void derivedata_run( | |||
| 23 | const char *, const char *, const char *, const char *); | 22 | const char *, const char *, const char *, const char *); |
| 24 | 23 | ||
| 25 | static void | 24 | static void |
| 26 | log_stderr(const char *str) | 25 | log_stdout(const char *str, void *unused) |
| 27 | { | ||
| 28 | fprintf(stderr, "%s", str); | ||
| 29 | } | ||
| 30 | |||
| 31 | static void | ||
| 32 | write_stdout(const char *str) | ||
| 33 | { | 26 | { |
| 34 | fprintf(stdout, "%s", str); | 27 | fprintf(stdout, "%s", str); |
| 35 | } | 28 | } |
| @@ -211,7 +204,7 @@ gendata_run( | |||
| 211 | case -2: | 204 | case -2: |
| 212 | goto gendata_run_finish; | 205 | goto gendata_run_finish; |
| 213 | default: | 206 | default: |
| 214 | nissy_datainfo(size, buf, write_stdout); | 207 | nissy_datainfo(size, buf); |
| 215 | printf("\n"); | 208 | printf("\n"); |
| 216 | printf("Succesfully generated %lld bytes. " | 209 | printf("Succesfully generated %lld bytes. " |
| 217 | "See above for details on the tables.\n", size); | 210 | "See above for details on the tables.\n", size); |
| @@ -244,7 +237,7 @@ derivedata_run( | |||
| 244 | case -2: | 237 | case -2: |
| 245 | goto derivedata_run_finish; | 238 | goto derivedata_run_finish; |
| 246 | default: | 239 | default: |
| 247 | nissy_datainfo(size, buf, write_stdout); | 240 | nissy_datainfo(size, buf); |
| 248 | printf("\n"); | 241 | printf("\n"); |
| 249 | printf("Succesfully generated %lld bytes. " | 242 | printf("Succesfully generated %lld bytes. " |
| 250 | "See above for details on the tables.\n", size); | 243 | "See above for details on the tables.\n", size); |
