diff options
author | Vincent Sanders <vince@kyllikki.org> | 2014-05-07 16:38:58 +0100 |
---|---|---|
committer | Vincent Sanders <vince@kyllikki.org> | 2014-05-07 16:38:58 +0100 |
commit | 6349704b5e7c48caa8cae4cfa612ce12b6446aae (patch) | |
tree | 4e28d8078b42143d6ad760ca4883c8fce7cbfb67 | |
parent | c56642819eed87431dff3446fe111f7f3eefaa7d (diff) | |
download | netsurf-6349704b5e7c48caa8cae4cfa612ce12b6446aae.tar.gz netsurf-6349704b5e7c48caa8cae4cfa612ce12b6446aae.tar.bz2 |
fix silly errors in atari and amiga file operation table change
-rw-r--r-- | amiga/gui.c | 16 | ||||
-rwxr-xr-x | atari/misc.c | 2 | ||||
-rw-r--r-- | utils/file.c | 4 |
3 files changed, 17 insertions, 5 deletions
diff --git a/amiga/gui.c b/amiga/gui.c index 9fce7b0e0..8e56c483e 100644 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -238,7 +238,7 @@ static void gui_window_place_caret(struct gui_window *g, int x, int y, int heigh * @return NSERROR_OK and the complete path is written to str * or error code on faliure. */ -static nserror amiga_mkpath(char **str, size_t *size, size_t nelm, va_list ap) +static nserror amiga_vmkpath(char **str, size_t *size, size_t nelm, va_list ap) { const char *elm[16]; size_t elm_len[16]; @@ -300,6 +300,18 @@ static nserror amiga_mkpath(char **str, size_t *size, size_t nelm, va_list ap) return NSERROR_OK; } +static nserror amiga_mkpath(char **str, size_t *size, size_t nelm, ...) +{ + va_list ap; + nserror ret; + + va_start(ap, nelm); + ret = amiga_vmkpath(str, size, nelm, ap); + va_end(ap); + + return ret; +} + /** * Get the basename of a file using posix path handling. * @@ -5195,7 +5207,7 @@ static struct gui_window_table amiga_window_table = { /* amiga file handling operations */ static struct gui_file_table amiga_file_table = { - .mkpath = amiga_mkpath, + .mkpath = amiga_vmkpath, .basename = amiga_basename, }; diff --git a/atari/misc.c b/atari/misc.c index a8eff288b..4d1365fa6 100755 --- a/atari/misc.c +++ b/atari/misc.c @@ -231,7 +231,7 @@ hlcache_handle *load_icon(const char *name, hlcache_handle_callback cb, err = netsurf_mkpath(&native_path, NULL, 2, icons_dir, name); if (err != NSERROR_OK) { - warn_user(messages_get_errorcode(err)); + warn_user(messages_get_errorcode(err), 0); return NULL; } diff --git a/utils/file.c b/utils/file.c index 7b0a4677a..2ae198840 100644 --- a/utils/file.c +++ b/utils/file.c @@ -43,7 +43,7 @@ * @return NSERROR_OK and the complete path is written to str * or error code on faliure. */ -static nserror posix_mkpath(char **str, size_t *size, size_t nelm, va_list ap) +static nserror posix_vmkpath(char **str, size_t *size, size_t nelm, va_list ap) { return vsnstrjoin(str, size, '/', nelm, ap); } @@ -110,7 +110,7 @@ nserror netsurf_mkpath(char **str, size_t *size, size_t nelm, ...) /* default to using the posix file handling */ static struct gui_file_table file_table = { - .mkpath = posix_mkpath, + .mkpath = posix_vmkpath, .basename = posix_basename, }; |