comparison util.c @ 884:252dfd29831d

Selecting a second game from the menu now works
author Michael Pavone <pavone@retrodev.com>
date Fri, 13 Nov 2015 22:56:59 -0800
parents 9f149f0e98b7
children 229c23b3ab73
comparison
equal deleted inserted replaced
883:9f149f0e98b7 884:252dfd29831d
17 17
18 #define info_printf(msg, args) __android_log_vprint(ANDROID_LOG_INFO, "BlastEm", msg, args) 18 #define info_printf(msg, args) __android_log_vprint(ANDROID_LOG_INFO, "BlastEm", msg, args)
19 #define warning_printf(msg, args) __android_log_vprint(ANDROID_LOG_WARN, "BlastEm", msg, args) 19 #define warning_printf(msg, args) __android_log_vprint(ANDROID_LOG_WARN, "BlastEm", msg, args)
20 #define fatal_printf(msg, args) __android_log_vprint(ANDROID_LOG_FATAL, "BlastEm", msg, args) 20 #define fatal_printf(msg, args) __android_log_vprint(ANDROID_LOG_FATAL, "BlastEm", msg, args)
21 #else 21 #else
22 #define info_puts(msg) fputs(stdout, msg); 22 #define info_puts(msg) fputs(msg, stdout);
23 #define warning_puts(msg) fputs(stderr, msg); 23 #define warning_puts(msg) fputs(msg, stderr);
24 #define fatal_puts(msg) fputs(stderr, msg); 24 #define fatal_puts(msg) fputs(msg, stderr);
25 25
26 #define info_printf(msg, args) vprintf(msg, args) 26 #define info_printf(msg, args) vprintf(msg, args)
27 #define warning_printf(msg, args) vfprintf(stderr, msg, args) 27 #define warning_printf(msg, args) vfprintf(stderr, msg, args)
28 #define fatal_printf(msg, args) vfprintf(stderr, msg, args) 28 #define fatal_printf(msg, args) vfprintf(stderr, msg, args)
29 #endif 29 #endif
386 if (sizeret) { 386 if (sizeret) {
387 *sizeret = -1; 387 *sizeret = -1;
388 } 388 }
389 return NULL; 389 return NULL;
390 } 390 }
391 char *pieces[] = {exe_dir, "/", name}; 391 char const *pieces[] = {exe_dir, "/", name};
392 char *path = alloc_concat_m(3, pieces); 392 char *path = alloc_concat_m(3, pieces);
393 FILE *f = fopen(path, "rb"); 393 FILE *f = fopen(path, "rb");
394 free(path); 394 free(path);
395 if (!f) { 395 if (!f) {
396 if (sizeret) { 396 if (sizeret) {