From 45c7ac6b8bed33fdbbcd3a2a497af5dcc6eafdc8 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Fri, 5 Sep 2014 00:32:17 +0200 Subject: add names to the parameters in the .c files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- src/libgamma_AdjustmentMethod.c | 14 +++++++++----- src/libgamma_CRTC.c | 36 ++++++++++++++++++++---------------- src/libgamma_GammaRamps.c | 28 ++++++++++++++++------------ src/libgamma_LibgammaException.c | 14 +++++++++----- src/libgamma_Partition.c | 10 +++++++--- src/libgamma_Ramp.c | 28 ++++++++++++++++------------ src/libgamma_Site.c | 10 +++++++--- 7 files changed, 84 insertions(+), 56 deletions(-) diff --git a/src/libgamma_AdjustmentMethod.c b/src/libgamma_AdjustmentMethod.c index c8d9e4e..b338307 100644 --- a/src/libgamma_AdjustmentMethod.c +++ b/src/libgamma_AdjustmentMethod.c @@ -18,6 +18,10 @@ #include "libgamma_AdjustmentMethod.h" +#define J JNIEnv* env, jclass class + + + /** * List available adjustment methods by their order of preference based on the environment. * @@ -30,7 +34,7 @@ * Other values invoke undefined behaviour. * @return List available adjustment methods by their order of preference. */ -jintArray Java_libgamma_AdjustmentMethod_libgamma_1list_1methods(JNIEnv *, jclass, jint); +jintArray Java_libgamma_AdjustmentMethod_libgamma_1list_1methods(J, jint operation); /** @@ -40,7 +44,7 @@ jintArray Java_libgamma_AdjustmentMethod_libgamma_1list_1methods(JNIEnv *, jclas * @param method The adjustment method. * @return Whether the adjustment method is available. */ -jint Java_libgamma_AdjustmentMethod_libgamma_1is_1method_1available(JNIEnv *, jclass, jint); +jint Java_libgamma_AdjustmentMethod_libgamma_1is_1method_1available(J, jint method); @@ -50,7 +54,7 @@ jint Java_libgamma_AdjustmentMethod_libgamma_1is_1method_1available(JNIEnv *, jc * @param method The adjustment method (display server and protocol). * @return Input parameter to the constructor of {@link AdjustmentMethodCapabilities}. */ -jlong Java_libgamma_AdjustmentMethod_libgamma_1method_1capabilities(JNIEnv *, jclass, jint); +jlong Java_libgamma_AdjustmentMethod_libgamma_1method_1capabilities(J, jint method); /** @@ -60,7 +64,7 @@ jlong Java_libgamma_AdjustmentMethod_libgamma_1method_1capabilities(JNIEnv *, jc * @return The default site, {@code null} if it cannot be determined or * if multiple sites are not supported by the adjustment method. */ -jstring Java_libgamma_AdjustmentMethod_libgamma_1method_1default_1site(JNIEnv *, jclass, jint); +jstring Java_libgamma_AdjustmentMethod_libgamma_1method_1default_1site(J, jint method); /** @@ -72,5 +76,5 @@ jstring Java_libgamma_AdjustmentMethod_libgamma_1method_1default_1site(JNIEnv *, * default site. {@code null} if there is none, that is, * if the method does not support multiple sites. */ -jstring Java_libgamma_AdjustmentMethod_libgamma_1method_1default_1site_1variable(JNIEnv *, jclass, jint); +jstring Java_libgamma_AdjustmentMethod_libgamma_1method_1default_1site_1variable(J, jint method); diff --git a/src/libgamma_CRTC.c b/src/libgamma_CRTC.c index 9d6958b..b280816 100644 --- a/src/libgamma_CRTC.c +++ b/src/libgamma_CRTC.c @@ -18,6 +18,10 @@ #include "libgamma_CRTC.h" +#define J JNIEnv* env, jclass class + + + /** * Create a CRTC state. * @@ -26,7 +30,7 @@ * @return Element 0: The value for {@link #address}. * Element 1: Error code, zero on success. */ -jlongArray Java_libgamma_CRTC_libgamma_1crtc_1create(JNIEnv *, jclass, jlong, jint); +jlongArray Java_libgamma_CRTC_libgamma_1crtc_1create(J, jlong partition, jint crtc); /** @@ -35,7 +39,7 @@ jlongArray Java_libgamma_CRTC_libgamma_1crtc_1create(JNIEnv *, jclass, jlong, ji * * @param address The CRTC state. */ -void Java_libgamma_CRTC_libgamma_1crtc_1free(JNIEnv *, jclass, jlong); +void Java_libgamma_CRTC_libgamma_1crtc_1free(J, jlong address); /** @@ -44,7 +48,7 @@ void Java_libgamma_CRTC_libgamma_1crtc_1free(JNIEnv *, jclass, jlong); * @param address The CRTC state. * @return Zero on success, and error code on failure. */ -jint Java_libgamma_CRTC_libgamma_1crtc_1restore(JNIEnv *, jclass, jlong); +jint Java_libgamma_CRTC_libgamma_1crtc_1restore(J, jlong address); /** @@ -54,7 +58,7 @@ jint Java_libgamma_CRTC_libgamma_1crtc_1restore(JNIEnv *, jclass, jlong); * @param fields OR:ed identifiers for the information about the CRTC that should be read. * @return Input parameters for the constructor of {@link CRTCInformation} */ -jobjectArray Java_libgamma_CRTC_libgamma_1get_1crtc_1information(JNIEnv *, jclass, jlong, jint); +jobjectArray Java_libgamma_CRTC_libgamma_1get_1crtc_1information(J, jlong crtc, jint fields); @@ -65,7 +69,7 @@ jobjectArray Java_libgamma_CRTC_libgamma_1get_1crtc_1information(JNIEnv *, jclas * @param ramps The gamma ramps to fill with the current values * @return Zero on success, an error code on failure. */ -jint Java_libgamma_CRTC_libgamma_1crtc_1get_1gamma_1ramps8(JNIEnv *, jclass, jlong, jlong); +jint Java_libgamma_CRTC_libgamma_1crtc_1get_1gamma_1ramps8(J, jlong address, jlong ramps); /** @@ -75,7 +79,7 @@ jint Java_libgamma_CRTC_libgamma_1crtc_1get_1gamma_1ramps8(JNIEnv *, jclass, jlo * @param ramps The gamma ramps to apply. * @return Zero on success, an error code on failure. */ -jint Java_libgamma_CRTC_libgamma_1crtc_1set_1gamma_1ramps8(JNIEnv *, jclass, jlong, jlong); +jint Java_libgamma_CRTC_libgamma_1crtc_1set_1gamma_1ramps8(J, jlong address, jlong ramps); @@ -86,7 +90,7 @@ jint Java_libgamma_CRTC_libgamma_1crtc_1set_1gamma_1ramps8(JNIEnv *, jclass, jlo * @param ramps The gamma ramps to fill with the current values * @return Zero on success, an error code on failure. */ -jint Java_libgamma_CRTC_libgamma_1crtc_1get_1gamma_1ramps16(JNIEnv *, jclass, jlong, jlong); +jint Java_libgamma_CRTC_libgamma_1crtc_1get_1gamma_1ramps16(J, jlong address, jlong ramps); /** @@ -96,7 +100,7 @@ jint Java_libgamma_CRTC_libgamma_1crtc_1get_1gamma_1ramps16(JNIEnv *, jclass, jl * @param ramps The gamma ramps to apply. * @return Zero on success, an error code on failure. */ -jint Java_libgamma_CRTC_libgamma_1crtc_1set_1gamma_1ramps16(JNIEnv *, jclass, jlong, jlong); +jint Java_libgamma_CRTC_libgamma_1crtc_1set_1gamma_1ramps16(J, jlong address, jlong ramps); @@ -107,7 +111,7 @@ jint Java_libgamma_CRTC_libgamma_1crtc_1set_1gamma_1ramps16(JNIEnv *, jclass, jl * @param ramps The gamma ramps to fill with the current values. * @return Zero on success, an error code on failure. */ -jint Java_libgamma_CRTC_libgamma_1crtc_1get_1gamma_1ramps32(JNIEnv *, jclass, jlong, jlong); +jint Java_libgamma_CRTC_libgamma_1crtc_1get_1gamma_1ramps32(J, jlong address, jlong ramps); /** @@ -117,7 +121,7 @@ jint Java_libgamma_CRTC_libgamma_1crtc_1get_1gamma_1ramps32(JNIEnv *, jclass, jl * @param ramps The gamma ramps to apply. * @return Zero on success, an error code on failure. */ -jint Java_libgamma_CRTC_libgamma_1crtc_1set_1gamma_1ramps32(JNIEnv *, jclass, jlong, jlong); +jint Java_libgamma_CRTC_libgamma_1crtc_1set_1gamma_1ramps32(J, jlong address, jlong ramps); @@ -128,7 +132,7 @@ jint Java_libgamma_CRTC_libgamma_1crtc_1set_1gamma_1ramps32(JNIEnv *, jclass, jl * @param ramps The gamma ramps to fill with the current values. * @return Zero on success, an error code on failure. */ -jint Java_libgamma_CRTC_libgamma_1crtc_1get_1gamma_1ramps64(JNIEnv *, jclass, jlong, jlong); +jint Java_libgamma_CRTC_libgamma_1crtc_1get_1gamma_1ramps64(J, jlong address, jlong ramps); /** @@ -138,7 +142,7 @@ jint Java_libgamma_CRTC_libgamma_1crtc_1get_1gamma_1ramps64(JNIEnv *, jclass, jl * @param ramps The gamma ramps to apply. * @return Zero on success, an error code on failure. */ -jint Java_libgamma_CRTC_libgamma_1crtc_1set_1gamma_1ramps64(JNIEnv *, jclass, jlong, jlong); +jint Java_libgamma_CRTC_libgamma_1crtc_1set_1gamma_1ramps64(J, jlong address, jlong ramps); @@ -149,7 +153,7 @@ jint Java_libgamma_CRTC_libgamma_1crtc_1set_1gamma_1ramps64(JNIEnv *, jclass, jl * @param ramps The gamma ramps to apply. * @return Zero on success, an error code on failure. */ -jint Java_libgamma_CRTC_libgamma_1crtc_1set_1gamma_1rampsf(JNIEnv *, jclass, jlong, jlong); +jint Java_libgamma_CRTC_libgamma_1crtc_1set_1gamma_1rampsf(J, jlong address, jlong ramps); /** @@ -159,7 +163,7 @@ jint Java_libgamma_CRTC_libgamma_1crtc_1set_1gamma_1rampsf(JNIEnv *, jclass, jlo * @param ramps The gamma ramps to fill with the current values. * @return Zero on success, an error code on failure. */ -jint Java_libgamma_CRTC_libgamma_1crtc_1get_1gamma_1rampsf(JNIEnv *, jclass, jlong, jlong); +jint Java_libgamma_CRTC_libgamma_1crtc_1get_1gamma_1rampsf(J, jlong address, jlong ramps); @@ -170,7 +174,7 @@ jint Java_libgamma_CRTC_libgamma_1crtc_1get_1gamma_1rampsf(JNIEnv *, jclass, jlo * @param ramps The gamma ramps to fill with the current values. * @return Zero on success, an error code on failure. */ -jint Java_libgamma_CRTC_libgamma_1crtc_1get_1gamma_1rampsd(JNIEnv *, jclass, jlong, jlong); +jint Java_libgamma_CRTC_libgamma_1crtc_1get_1gamma_1rampsd(J, jlong address, jlong ramps); /** @@ -180,5 +184,5 @@ jint Java_libgamma_CRTC_libgamma_1crtc_1get_1gamma_1rampsd(JNIEnv *, jclass, jlo * @param ramps The gamma ramps to apply. * @return Zero on success, an error code on failure. */ -jint Java_libgamma_CRTC_libgamma_1crtc_1set_1gamma_1rampsd(JNIEnv *, jclass, jlong, jlong); +jint Java_libgamma_CRTC_libgamma_1crtc_1set_1gamma_1rampsd(J, jlong address, jlong ramps); diff --git a/src/libgamma_GammaRamps.c b/src/libgamma_GammaRamps.c index 2a12e82..571006a 100644 --- a/src/libgamma_GammaRamps.c +++ b/src/libgamma_GammaRamps.c @@ -18,6 +18,10 @@ #include "libgamma_GammaRamps.h" +#define J JNIEnv* env, jclass class + + + /** * Create and initialise a gamma ramp in the proper way that allows all adjustment * methods to read from and write to it without causing segmentation violation. @@ -31,7 +35,7 @@ * Element 3: The address of the blue gamma ramp. * Element 4: Zero on success, an error code on error. */ -jlongArray Java_libgamma_GammaRamps_libgamma_1gamma_1ramps8_1create(JNIEnv *, jclass, jint, jint, jint); +jlongArray Java_libgamma_GammaRamps_libgamma_1gamma_1ramps8_1create(J, jint red_size, jint green_size, jint blue_size); /** @@ -47,7 +51,7 @@ jlongArray Java_libgamma_GammaRamps_libgamma_1gamma_1ramps8_1create(JNIEnv *, jc * Element 3: The address of the blue gamma ramp. * Element 4: Zero on success, an error code on error. */ -jlongArray Java_libgamma_GammaRamps_libgamma_1gamma_1ramps16_1create(JNIEnv *, jclass, jint, jint, jint); +jlongArray Java_libgamma_GammaRamps_libgamma_1gamma_1ramps16_1create(J, jint red_size, jint green_size, jint blue_size); /** @@ -63,7 +67,7 @@ jlongArray Java_libgamma_GammaRamps_libgamma_1gamma_1ramps16_1create(JNIEnv *, j * Element 3: The address of the blue gamma ramp. * Element 4: Zero on success, an error code on error. */ -jlongArray Java_libgamma_GammaRamps_libgamma_1gamma_1ramps32_1create(JNIEnv *, jclass, jint, jint, jint); +jlongArray Java_libgamma_GammaRamps_libgamma_1gamma_1ramps32_1create(J, jint red_size, jint green_size, jint blue_size); /** @@ -79,7 +83,7 @@ jlongArray Java_libgamma_GammaRamps_libgamma_1gamma_1ramps32_1create(JNIEnv *, j * Element 3: The address of the blue gamma ramp. * Element 4: Zero on success, an error code on error. */ -jlongArray Java_libgamma_GammaRamps_libgamma_1gamma_1ramps64_1create(JNIEnv *, jclass, jint, jint, jint); +jlongArray Java_libgamma_GammaRamps_libgamma_1gamma_1ramps64_1create(J, jint red_size, jint green_size, jint blue_size); /** @@ -95,7 +99,7 @@ jlongArray Java_libgamma_GammaRamps_libgamma_1gamma_1ramps64_1create(JNIEnv *, j * Element 3: The address of the blue gamma ramp. * Element 4: Zero on success, an error code on error. */ -jlongArray Java_libgamma_GammaRamps_libgamma_1gamma_1rampsf_1create(JNIEnv *, jclass, jint, jint, jint); +jlongArray Java_libgamma_GammaRamps_libgamma_1gamma_1rampsf_1create(J, jint red_size, jint green_size, jint blue_size); /** @@ -111,7 +115,7 @@ jlongArray Java_libgamma_GammaRamps_libgamma_1gamma_1rampsf_1create(JNIEnv *, jc * Element 3: The address of the blue gamma ramp. * Element 4: Zero on success, an error code on error. */ -jlongArray Java_libgamma_GammaRamps_libgamma_1gamma_1rampsd_1create(JNIEnv *, jclass, jint, jint, jint); +jlongArray Java_libgamma_GammaRamps_libgamma_1gamma_1rampsd_1create(J, jint red_size, jint green_size, jint blue_size); @@ -123,7 +127,7 @@ jlongArray Java_libgamma_GammaRamps_libgamma_1gamma_1rampsd_1create(JNIEnv *, jc * * @param address The gamma ramps. */ -void Java_libgamma_GammaRamps_libgamma_1gamma_1ramps8_1free(JNIEnv *, jclass, jlong); +void Java_libgamma_GammaRamps_libgamma_1gamma_1ramps8_1free(J, jlong address); /** @@ -134,7 +138,7 @@ void Java_libgamma_GammaRamps_libgamma_1gamma_1ramps8_1free(JNIEnv *, jclass, jl * * @param address The gamma ramps. */ -void Java_libgamma_GammaRamps_libgamma_1gamma_1ramps16_1free(JNIEnv *, jclass, jlong); +void Java_libgamma_GammaRamps_libgamma_1gamma_1ramps16_1free(J, jlong address); /** @@ -145,7 +149,7 @@ void Java_libgamma_GammaRamps_libgamma_1gamma_1ramps16_1free(JNIEnv *, jclass, j * * @param address The gamma ramps. */ -void Java_libgamma_GammaRamps_libgamma_1gamma_1ramps32_1free(JNIEnv *, jclass, jlong); +void Java_libgamma_GammaRamps_libgamma_1gamma_1ramps32_1free(J, jlong address); /** @@ -156,7 +160,7 @@ void Java_libgamma_GammaRamps_libgamma_1gamma_1ramps32_1free(JNIEnv *, jclass, j * * @param address The gamma ramps. */ -void Java_libgamma_GammaRamps_libgamma_1gamma_1ramps64_1free(JNIEnv *, jclass, jlong); +void Java_libgamma_GammaRamps_libgamma_1gamma_1ramps64_1free(J, jlong address); /** @@ -167,7 +171,7 @@ void Java_libgamma_GammaRamps_libgamma_1gamma_1ramps64_1free(JNIEnv *, jclass, j * * @param address The gamma ramps. */ -void Java_libgamma_GammaRamps_libgamma_1gamma_1rampsf_1free(JNIEnv *, jclass, jlong); +void Java_libgamma_GammaRamps_libgamma_1gamma_1rampsf_1free(J, jlong address); /** @@ -178,5 +182,5 @@ void Java_libgamma_GammaRamps_libgamma_1gamma_1rampsf_1free(JNIEnv *, jclass, jl * * @param address The gamma ramps. */ -void Java_libgamma_GammaRamps_libgamma_1gamma_1rampsd_1free(JNIEnv *, jclass, jlong); +void Java_libgamma_GammaRamps_libgamma_1gamma_1rampsd_1free(J, jlong address); diff --git a/src/libgamma_LibgammaException.c b/src/libgamma_LibgammaException.c index fac3e1c..56c502d 100644 --- a/src/libgamma_LibgammaException.c +++ b/src/libgamma_LibgammaException.c @@ -18,6 +18,10 @@ #include "libgamma_LibgammaException.h" +#define J JNIEnv* env, jclass class + + + /** * Returns the name of the definition associated with * a libgamma error code. @@ -26,7 +30,7 @@ * @return The name of the definition associated with the error code, * {@code null} if the error code does not exist. */ -jstring Java_libgamma_LibgammaException_name_1of_1error(JNIEnv *, jclass, jint); +jstring Java_libgamma_LibgammaException_name_1of_1error(J, jint value); /** @@ -37,7 +41,7 @@ jstring Java_libgamma_LibgammaException_name_1of_1error(JNIEnv *, jclass, jint); * @return The error code, zero if the name is {@code null} * or does not refer to a libgamma error. */ -jint Java_libgamma_LibgammaException_value_1of_1error(JNIEnv *, jclass, jstring); +jint Java_libgamma_LibgammaException_value_1of_1error(J, jstring name); /** @@ -45,7 +49,7 @@ jint Java_libgamma_LibgammaException_value_1of_1error(JNIEnv *, jclass, jstring) * * @return The value that should go to {@link #group_gid}. */ -jint Java_libgamma_LibgammaException_libgamma_1group_1gid(JNIEnv *, jclass); +jint Java_libgamma_LibgammaException_libgamma_1group_1gid(J); /** @@ -53,7 +57,7 @@ jint Java_libgamma_LibgammaException_libgamma_1group_1gid(JNIEnv *, jclass); * * @return The value that should go to {@link #group_name}. */ -jstring Java_libgamma_LibgammaException_libgamma_1group_1name(JNIEnv *, jclass); +jstring Java_libgamma_LibgammaException_libgamma_1group_1name(J); /** @@ -62,5 +66,5 @@ jstring Java_libgamma_LibgammaException_libgamma_1group_1name(JNIEnv *, jclass); * @param error_code The error code. * @return A textual description of the error code. */ -jstring Java_libgamma_LibgammaException_strerror(JNIEnv *, jclass, jint); +jstring Java_libgamma_LibgammaException_strerror(J, jint error_code); diff --git a/src/libgamma_Partition.c b/src/libgamma_Partition.c index b7baebd..8350ab7 100644 --- a/src/libgamma_Partition.c +++ b/src/libgamma_Partition.c @@ -18,6 +18,10 @@ #include "libgamma_Partition.h" +#define J JNIEnv* env, jclass class + + + /** * Create a partition state. * @@ -27,7 +31,7 @@ * Element 1: The value for {@link #crtcs_available} * Element 2: Error code, zero on success. */ -jlongArray Java_libgamma_Partition_libgamma_1partition_1create(JNIEnv *, jclass, jlong, jint); +jlongArray Java_libgamma_Partition_libgamma_1partition_1create(J, jlong site, jint partition); /** @@ -36,7 +40,7 @@ jlongArray Java_libgamma_Partition_libgamma_1partition_1create(JNIEnv *, jclass, * * @param address The partition state. */ -void Java_libgamma_Partition_libgamma_1partition_1free(JNIEnv *, jclass, jlong); +void Java_libgamma_Partition_libgamma_1partition_1free(J, jlong address); /** @@ -45,5 +49,5 @@ void Java_libgamma_Partition_libgamma_1partition_1free(JNIEnv *, jclass, jlong); * @param address The partition state. * @return Zero on success, and error code on failure. */ -jint Java_libgamma_Partition_libgamma_1partition_1restore(JNIEnv *, jclass, jlong); +jint Java_libgamma_Partition_libgamma_1partition_1restore(J, jlong address); diff --git a/src/libgamma_Ramp.c b/src/libgamma_Ramp.c index 98fa6d8..f30f06a 100644 --- a/src/libgamma_Ramp.c +++ b/src/libgamma_Ramp.c @@ -18,6 +18,10 @@ #include "libgamma_Ramp.h" +#define J JNIEnv* env, jclass class + + + /** * Read the value of a stop in an 8-bit ramp. * @@ -25,7 +29,7 @@ * @param stop The index of the stop. * @return The value of the stop. */ -jshort Java_libgamma_Ramp_libgamma_1gamma_1ramps8_1get(JNIEnv *, jclass, jlong, jint); +jshort Java_libgamma_Ramp_libgamma_1gamma_1ramps8_1get(J, jlong address, jint stop); /** @@ -35,7 +39,7 @@ jshort Java_libgamma_Ramp_libgamma_1gamma_1ramps8_1get(JNIEnv *, jclass, jlong, * @param stop The index of the stop. * @return The value of the stop. */ -jint Java_libgamma_Ramp_libgamma_1gamma_1ramps16_1get(JNIEnv *, jclass, jlong, jint); +jint Java_libgamma_Ramp_libgamma_1gamma_1ramps16_1get(J, jlong address, jint stop); /** @@ -45,7 +49,7 @@ jint Java_libgamma_Ramp_libgamma_1gamma_1ramps16_1get(JNIEnv *, jclass, jlong, j * @param stop The index of the stop. * @return The value of the stop. */ -jlong Java_libgamma_Ramp_libgamma_1gamma_1ramps32_1get(JNIEnv *, jclass, jlong, jint); +jlong Java_libgamma_Ramp_libgamma_1gamma_1ramps32_1get(J, jlong address, jint stop); /** @@ -55,7 +59,7 @@ jlong Java_libgamma_Ramp_libgamma_1gamma_1ramps32_1get(JNIEnv *, jclass, jlong, * @param stop The index of the stop. * @return The value of the stop. */ -jlong Java_libgamma_Ramp_libgamma_1gamma_1ramps64_1get(JNIEnv *, jclass, jlong, jint); +jlong Java_libgamma_Ramp_libgamma_1gamma_1ramps64_1get(J, jlong address, jint stop); /** @@ -65,7 +69,7 @@ jlong Java_libgamma_Ramp_libgamma_1gamma_1ramps64_1get(JNIEnv *, jclass, jlong, * @param stop The index of the stop. * @return The value of the stop. */ -jfloat Java_libgamma_Ramp_libgamma_1gamma_1rampsf_1get(JNIEnv *, jclass, jlong, jint); +jfloat Java_libgamma_Ramp_libgamma_1gamma_1rampsf_1get(J, jlong address, jint stop); /** @@ -75,7 +79,7 @@ jfloat Java_libgamma_Ramp_libgamma_1gamma_1rampsf_1get(JNIEnv *, jclass, jlong, * @param stop The index of the stop. * @return The value of the stop. */ -jdouble Java_libgamma_Ramp_libgamma_1gamma_1rampsd_1get(JNIEnv *, jclass, jlong, jint); +jdouble Java_libgamma_Ramp_libgamma_1gamma_1rampsd_1get(J, jlong address, jint stop); @@ -86,7 +90,7 @@ jdouble Java_libgamma_Ramp_libgamma_1gamma_1rampsd_1get(JNIEnv *, jclass, jlong, * @param stop The index of the stop. * @param value The value of the stop. */ -void Java_libgamma_Ramp_libgamma_1gamma_1ramps8_1set(JNIEnv *, jclass, jlong, jint, jshort); +void Java_libgamma_Ramp_libgamma_1gamma_1ramps8_1set(J, jlong address, jint stop, jshort value); /** @@ -96,7 +100,7 @@ void Java_libgamma_Ramp_libgamma_1gamma_1ramps8_1set(JNIEnv *, jclass, jlong, ji * @param stop The index of the stop. * @param value The value of the stop. */ -void Java_libgamma_Ramp_libgamma_1gamma_1ramps16_1set(JNIEnv *, jclass, jlong, jint, jint); +void Java_libgamma_Ramp_libgamma_1gamma_1ramps16_1set(J, jlong address, jint stop, jint value); /** @@ -106,7 +110,7 @@ void Java_libgamma_Ramp_libgamma_1gamma_1ramps16_1set(JNIEnv *, jclass, jlong, j * @param stop The index of the stop. * @param value The value of the stop. */ -void Java_libgamma_Ramp_libgamma_1gamma_1ramps32_1set(JNIEnv *, jclass, jlong, jint, jlong); +void Java_libgamma_Ramp_libgamma_1gamma_1ramps32_1set(J, jlong address, jint stop, jlong value); /** @@ -116,7 +120,7 @@ void Java_libgamma_Ramp_libgamma_1gamma_1ramps32_1set(JNIEnv *, jclass, jlong, j * @param stop The index of the stop. * @param value The value of the stop. */ -void Java_libgamma_Ramp_libgamma_1gamma_1ramps64_1set(JNIEnv *, jclass, jlong, jint, jlong); +void Java_libgamma_Ramp_libgamma_1gamma_1ramps64_1set(J, jlong address, jint stop, jlong value); /** @@ -126,7 +130,7 @@ void Java_libgamma_Ramp_libgamma_1gamma_1ramps64_1set(JNIEnv *, jclass, jlong, j * @param stop The index of the stop. * @param value The value of the stop. */ -void Java_libgamma_Ramp_libgamma_1gamma_1rampsf_1set(JNIEnv *, jclass, jlong, jint, jfloat); +void Java_libgamma_Ramp_libgamma_1gamma_1rampsf_1set(J, jlong address, jint stop, jfloat value); /** @@ -136,5 +140,5 @@ void Java_libgamma_Ramp_libgamma_1gamma_1rampsf_1set(JNIEnv *, jclass, jlong, ji * @param stop The index of the stop. * @param value The value of the stop. */ -void Java_libgamma_Ramp_libgamma_1gamma_1rampsd_1set(JNIEnv *, jclass, jlong, jint, jdouble); +void Java_libgamma_Ramp_libgamma_1gamma_1rampsd_1set(J, jlong address, jint stop, jdouble value); diff --git a/src/libgamma_Site.c b/src/libgamma_Site.c index ba66c35..5edadfb 100644 --- a/src/libgamma_Site.c +++ b/src/libgamma_Site.c @@ -18,6 +18,10 @@ #include "libgamma_Site.h" +#define J JNIEnv* env, jclass class + + + /** * Create a site state. * @@ -27,7 +31,7 @@ * Element 1: The value for {@link #partitions_available} * Element 2: Error code, zero on success. */ -jlongArray Java_libgamma_Site_libgamma_1site_1create(JNIEnv *, jclass, jint, jstring); +jlongArray Java_libgamma_Site_libgamma_1site_1create(J, jint method, jstring site); /** @@ -36,7 +40,7 @@ jlongArray Java_libgamma_Site_libgamma_1site_1create(JNIEnv *, jclass, jint, jst * * @param address The site state. */ -void Java_libgamma_Site_libgamma_1site_1free(JNIEnv *, jclass, jlong); +void Java_libgamma_Site_libgamma_1site_1free(J, jlong address); /** @@ -45,5 +49,5 @@ void Java_libgamma_Site_libgamma_1site_1free(JNIEnv *, jclass, jlong); * @param address The site state. * @return Zero on success, and error code on failure. */ -jint Java_libgamma_Site_libgamma_1site_1restore(JNIEnv *, jclass, jlong); +jint Java_libgamma_Site_libgamma_1site_1restore(J, jlong address); -- cgit v1.2.3-70-g09d2