From b773e6217a1ce1f38668118211b0c0289cda5f33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Bl=C3=A4sing?= Date: Wed, 8 Aug 2018 20:36:33 +0200 Subject: [PATCH] Fix GCC8 warnings --- native/dispatch.c | 6 +++--- native/testlib.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/native/dispatch.c b/native/dispatch.c index 072aed4176..6cee809fb1 100644 --- a/native/dispatch.c +++ b/native/dispatch.c @@ -653,7 +653,7 @@ dispatch(JNIEnv *env, void* func, jint flags, jobjectArray args, int err = GET_LAST_ERROR(); JNA_set_last_error(env, err); if ((flags & THROW_LAST_ERROR) && err) { - char emsg[MSG_SIZE]; + char emsg[MSG_SIZE - 3 /* literal characters */ - 10 /* max length of %d */]; snprintf(msg, sizeof(msg), "[%d] %s", err, STR_ERROR(err, emsg, sizeof(emsg))); throw_type = ELastError; throw_msg = msg; @@ -1896,7 +1896,7 @@ dispatch_direct(ffi_cif* cif, void* volatile resp, void** argp, void *cdata) { int err = GET_LAST_ERROR(); JNA_set_last_error(env, err); if (data->throw_last_error && err) { - char emsg[MSG_SIZE]; + char emsg[MSG_SIZE - 3 /* literal characters */ - 10 /* max length of %d */]; snprintf(msg, sizeof(msg), "[%d] %s", err, STR_ERROR(err, emsg, sizeof(emsg))); throw_type = ELastError; throw_msg = msg; @@ -3096,7 +3096,7 @@ Java_com_sun_jna_Native_getWindowHandle0(JNIEnv* UNUSED_JAWT(env), jclass UNUSED return -1; } if ((pJAWT_GetAWT = (void*)FIND_ENTRY(jawt_handle, METHOD_NAME)) == NULL) { - char msg[MSG_SIZE], buf[MSG_SIZE]; + char msg[MSG_SIZE], buf[MSG_SIZE - 31 /* literal characters */ - sizeof(METHOD_NAME)]; snprintf(msg, sizeof(msg), "Error looking up JAWT method %s: %s", METHOD_NAME, LOAD_ERROR(buf, sizeof(buf))); throwByName(env, EUnsatisfiedLink, msg); diff --git a/native/testlib.c b/native/testlib.c index 575cf010ae..609ed75ede 100644 --- a/native/testlib.c +++ b/native/testlib.c @@ -805,7 +805,7 @@ callCallbackWithStructByValue(TestStructureByValue (*func)(TestStructureByValue) EXPORT callback_t callCallbackWithCallback(cb_callback_t cb) { - return (*cb)((callback_t)cb); + return (*cb)((callback_t)(void*)cb); } static int32_t