Skip to content

Commit 92214f1

Browse files
authored
Merge pull request #351 from josefnpat/master
Warning Cleanup
2 parents 5d50811 + d7dbadf commit 92214f1

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

src/ext/duktape/duktape.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -456,21 +456,21 @@ DUK_API_NORETURN(DUK_EXTERNAL_DECL void duk_error_raw(duk_context *ctx, duk_errc
456456

457457
#if defined(DUK_API_VARIADIC_MACROS)
458458
#define duk_error(ctx,err_code,...) \
459-
(duk_error_raw((ctx), (duk_errcode_t) (err_code), (const char *) (DUK_FILE_MACRO), (duk_int_t) (DUK_LINE_MACRO), __VA_ARGS__), (duk_ret_t) 0)
459+
(duk_error_raw((ctx), (duk_errcode_t) (err_code), (const char *) (DUK_FILE_MACRO), (duk_int_t) (DUK_LINE_MACRO), __VA_ARGS__))
460460
#define duk_generic_error(ctx,...) \
461-
(duk_error_raw((ctx), (duk_errcode_t) DUK_ERR_ERROR, (const char *) (DUK_FILE_MACRO), (duk_int_t) (DUK_LINE_MACRO), __VA_ARGS__), (duk_ret_t) 0)
461+
(duk_error_raw((ctx), (duk_errcode_t) DUK_ERR_ERROR, (const char *) (DUK_FILE_MACRO), (duk_int_t) (DUK_LINE_MACRO), __VA_ARGS__))
462462
#define duk_eval_error(ctx,...) \
463-
(duk_error_raw((ctx), (duk_errcode_t) DUK_ERR_EVAL_ERROR, (const char *) (DUK_FILE_MACRO), (duk_int_t) (DUK_LINE_MACRO), __VA_ARGS__), (duk_ret_t) 0)
463+
(duk_error_raw((ctx), (duk_errcode_t) DUK_ERR_EVAL_ERROR, (const char *) (DUK_FILE_MACRO), (duk_int_t) (DUK_LINE_MACRO), __VA_ARGS__))
464464
#define duk_range_error(ctx,...) \
465-
(duk_error_raw((ctx), (duk_errcode_t) DUK_ERR_RANGE_ERROR, (const char *) (DUK_FILE_MACRO), (duk_int_t) (DUK_LINE_MACRO), __VA_ARGS__), (duk_ret_t) 0)
465+
(duk_error_raw((ctx), (duk_errcode_t) DUK_ERR_RANGE_ERROR, (const char *) (DUK_FILE_MACRO), (duk_int_t) (DUK_LINE_MACRO), __VA_ARGS__))
466466
#define duk_reference_error(ctx,...) \
467-
(duk_error_raw((ctx), (duk_errcode_t) DUK_ERR_REFERENCE_ERROR, (const char *) (DUK_FILE_MACRO), (duk_int_t) (DUK_LINE_MACRO), __VA_ARGS__), (duk_ret_t) 0)
467+
(duk_error_raw((ctx), (duk_errcode_t) DUK_ERR_REFERENCE_ERROR, (const char *) (DUK_FILE_MACRO), (duk_int_t) (DUK_LINE_MACRO), __VA_ARGS__))
468468
#define duk_syntax_error(ctx,...) \
469-
(duk_error_raw((ctx), (duk_errcode_t) DUK_ERR_SYNTAX_ERROR, (const char *) (DUK_FILE_MACRO), (duk_int_t) (DUK_LINE_MACRO), __VA_ARGS__), (duk_ret_t) 0)
469+
(duk_error_raw((ctx), (duk_errcode_t) DUK_ERR_SYNTAX_ERROR, (const char *) (DUK_FILE_MACRO), (duk_int_t) (DUK_LINE_MACRO), __VA_ARGS__))
470470
#define duk_type_error(ctx,...) \
471-
(duk_error_raw((ctx), (duk_errcode_t) DUK_ERR_TYPE_ERROR, (const char *) (DUK_FILE_MACRO), (duk_int_t) (DUK_LINE_MACRO), __VA_ARGS__), (duk_ret_t) 0)
471+
(duk_error_raw((ctx), (duk_errcode_t) DUK_ERR_TYPE_ERROR, (const char *) (DUK_FILE_MACRO), (duk_int_t) (DUK_LINE_MACRO), __VA_ARGS__))
472472
#define duk_uri_error(ctx,...) \
473-
(duk_error_raw((ctx), (duk_errcode_t) DUK_ERR_URI_ERROR, (const char *) (DUK_FILE_MACRO), (duk_int_t) (DUK_LINE_MACRO), __VA_ARGS__), (duk_ret_t) 0)
473+
(duk_error_raw((ctx), (duk_errcode_t) DUK_ERR_URI_ERROR, (const char *) (DUK_FILE_MACRO), (duk_int_t) (DUK_LINE_MACRO), __VA_ARGS__))
474474
#else /* DUK_API_VARIADIC_MACROS */
475475
/* For legacy compilers without variadic macros a macro hack is used to allow
476476
* variable arguments. While the macro allows "return duk_error(...)", it

src/fs.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -674,7 +674,7 @@ void fsMakeDir(FileSystem* fs, const char* name)
674674

675675
#if defined(__WINDOWS__) || defined(__LINUX__) || defined(__MACOSX__)
676676

677-
void fsOpenSystemPath(FileSystem* fs, const char* path)
677+
int fsOpenSystemPath(FileSystem* fs, const char* path)
678678
{
679679
char command[FILENAME_MAX];
680680

@@ -692,7 +692,7 @@ void fsOpenSystemPath(FileSystem* fs, const char* path)
692692

693693
#endif
694694

695-
tic_system(UTF8ToString(command));
695+
return tic_system(UTF8ToString(command));
696696
}
697697

698698
#else

src/fs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ bool fsCopyFile(const char* src, const char* dst);
6767
void fsGetFileData(GetCallback callback, const char* name, void* buffer, size_t size, u32 mode, void* data);
6868
void fsOpenFileData(OpenCallback callback, void* data);
6969
void fsOpenWorkingFolder(FileSystem* fs);
70-
void fsOpenSystemPath(FileSystem* fs, const char* path);
70+
int fsOpenSystemPath(FileSystem* fs, const char* path);
7171
bool fsIsDir(FileSystem* fs, const char* dir);
7272
bool fsIsInPublicDir(FileSystem* fs);
7373
bool fsChangeDir(FileSystem* fs, const char* dir);

0 commit comments

Comments
 (0)