start to name parameters in header files

diff --git a/src/bindings/java/jmsg_file.h b/src/bindings/java/jmsg_file.h
index bc8a063..dcd96e9 100644 (file)
--- a/src/bindings/java/jmsg_file.h
+++ b/src/bindings/java/jmsg_file.h
@@ -18,12 +18,12 @@ jfieldID jfile_field_bind;
 void jfile_bind(JNIEnv *env, jobject jfile, msg_file_t fd);
 msg_file_t jfile_get_native(JNIEnv *env, jobject jfile);
 
 void jfile_bind(JNIEnv *env, jobject jfile, msg_file_t fd);
 msg_file_t jfile_get_native(JNIEnv *env, jobject jfile);
 

-JNIEXPORT void JNICALL Java_org_simgrid_msg_File_nativeInit(JNIEnv*, jclass);
-JNIEXPORT void JNICALL Java_org_simgrid_msg_File_open(JNIEnv*, jobject, jobject);
-JNIEXPORT jlong JNICALL Java_org_simgrid_msg_File_read(JNIEnv*, jobject, jlong);
-JNIEXPORT jlong JNICALL Java_org_simgrid_msg_File_write(JNIEnv*, jobject, jlong);
-JNIEXPORT void JNICALL Java_org_simgrid_msg_File_seek(JNIEnv*, jobject, jlong, jlong);
-JNIEXPORT void JNICALL Java_org_simgrid_msg_File_close(JNIEnv*, jobject);
+JNIEXPORT void JNICALL Java_org_simgrid_msg_File_nativeInit(JNIEnv *env, jclass cls);
+JNIEXPORT void JNICALL Java_org_simgrid_msg_File_open(JNIEnv *env, jobject jfile, jobject jpath);
+JNIEXPORT jlong JNICALL Java_org_simgrid_msg_File_read(JNIEnv *env, jobject jfile, jlong jsize);
+JNIEXPORT jlong JNICALL Java_org_simgrid_msg_File_write(JNIEnv *env, jobject jfile, jlong jsize);
+JNIEXPORT void JNICALL Java_org_simgrid_msg_File_seek(JNIEnv *env, jobject jfile, jlong joffset, jlong jorigin);
+JNIEXPORT void JNICALL Java_org_simgrid_msg_File_close(JNIEnv *env, jobject jfile);

 
 SG_END_DECL()
 #endif
 
 SG_END_DECL()
 #endif

diff --git a/src/bindings/java/jmsg_host.h b/src/bindings/java/jmsg_host.h
index 1e76b67..f5a2d0c 100644 (file)
--- a/src/bindings/java/jmsg_host.h
+++ b/src/bindings/java/jmsg_host.h
@@ -102,7 +102,7 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Host_nativeInit(JNIEnv *env, jclass
  * Method    getByName
  * Signature  (Ljava/lang/String;)Lsimgrid/msg/Host;
  */
  * Method    getByName
  * Signature  (Ljava/lang/String;)Lsimgrid/msg/Host;
  */

-JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Host_getByName (JNIEnv *, jclass, jstring);
+JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Host_getByName (JNIEnv *env, jclass cls, jstring jname);

 
 /**
  * This function start the host if it is off
 
 /**
  * This function start the host if it is off


@@ -125,28 +125,28 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Host_off(JNIEnv *env, jobject jhost)
  * Method    currentHost
  * Signature  ()Lsimgrid/msg/Host;
  */
  * Method    currentHost
  * Signature  ()Lsimgrid/msg/Host;
  */

-JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Host_currentHost (JNIEnv *, jclass);
+JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Host_currentHost (JNIEnv *env, jclass cls);

 
 /*
  * Class    org_simgrid_msg_Host
  * Method    getCount
  * Signature  ()I
  */
 
 /*
  * Class    org_simgrid_msg_Host
  * Method    getCount
  * Signature  ()I
  */

-JNIEXPORT jint JNICALL Java_org_simgrid_msg_Host_getCount (JNIEnv *, jclass);
+JNIEXPORT jint JNICALL Java_org_simgrid_msg_Host_getCount (JNIEnv *env, jclass cls);

 
 /*
  * Class    org_simgrid_msg_Host
  * Method    getSpeed
  * Signature  ()D
  */
 
 /*
  * Class    org_simgrid_msg_Host
  * Method    getSpeed
  * Signature  ()D
  */

-JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Host_getSpeed (JNIEnv *, jobject);
+JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Host_getSpeed (JNIEnv *env, jobject jhost);

 
 /*
  * Class    org_simgrid_msg_Host
  * Method    getCoreNumber
  * Signature  ()D
  */
 
 /*
  * Class    org_simgrid_msg_Host
  * Method    getCoreNumber
  * Signature  ()D
  */

-JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Host_getCoreNumber (JNIEnv *, jobject);
+JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Host_getCoreNumber (JNIEnv *env, jobject jhost);

 
 /*
  * Class        org_simgrid_msg_Host
 
 /*
  * Class        org_simgrid_msg_Host


@@ -167,7 +167,7 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Host_setProperty(JNIEnv *env, jobjec
  * Method    isOn
  * Signature  ()Z
  */
  * Method    isOn
  * Signature  ()Z
  */

-JNIEXPORT jboolean JNICALL Java_org_simgrid_msg_Host_isOn (JNIEnv *, jobject);
+JNIEXPORT jboolean JNICALL Java_org_simgrid_msg_Host_isOn (JNIEnv *env, jobject jhost);

 
 /*
  * Class    org_simgrid_msg_Host
 
 /*
  * Class    org_simgrid_msg_Host


@@ -192,11 +192,11 @@ JNIEXPORT jobjectArray JNICALL Java_org_simgrid_msg_Host_getStorageContent(JNIEn
  * Class org_simgrid_msg_Host
  * Method all
  */
  * Class org_simgrid_msg_Host
  * Method all
  */

-JNIEXPORT jobjectArray JNICALL Java_org_simgrid_msg_Host_all(JNIEnv *, jclass);
+JNIEXPORT jobjectArray JNICALL Java_org_simgrid_msg_Host_all(JNIEnv *env, jclass cls);

 
 JNIEXPORT void JNICALL Java_org_simgrid_msg_Host_setAsyncMailbox(JNIEnv * env, jclass cls_arg, jobject jname);
 
 
 JNIEXPORT void JNICALL Java_org_simgrid_msg_Host_setAsyncMailbox(JNIEnv * env, jclass cls_arg, jobject jname);
 

-JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Host_getConsumedEnergy (JNIEnv *, jobject);
+JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Host_getConsumedEnergy (JNIEnv *env, jobject jhost);

 
 SG_END_DECL()
 #endif                          /*!MSG_JHOST_H */
 
 SG_END_DECL()
 #endif                          /*!MSG_JHOST_H */

diff --git a/src/bindings/java/jmsg_storage.h b/src/bindings/java/jmsg_storage.h
index 21a855d..14f7fbc 100644 (file)
--- a/src/bindings/java/jmsg_storage.h
+++ b/src/bindings/java/jmsg_storage.h
@@ -55,7 +55,7 @@ msg_storage_t jstorage_get_native(JNIEnv * env, jobject jstorage);
  * Method      nativeInit
  * Signature  ()V
  */
  * Method      nativeInit
  * Signature  ()V
  */

-JNIEXPORT void JNICALL Java_org_simgrid_msg_Storage_nativeInit(JNIEnv*, jclass);
+JNIEXPORT void JNICALL Java_org_simgrid_msg_Storage_nativeInit(JNIEnv *env, jclass cls);

 
 /**
  * This function returns a global reference to the  java storage instance specified by the parameter jstorage.
 
 /**
  * This function returns a global reference to the  java storage instance specified by the parameter jstorage.


@@ -90,28 +90,28 @@ const char *jstorage_get_name(jobject jstorage, JNIEnv * env);
  * Method    getByName
  * Signature  (Ljava/lang/String;)Lsimgrid/msg/Storage;
  */
  * Method    getByName
  * Signature  (Ljava/lang/String;)Lsimgrid/msg/Storage;
  */

-JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Storage_getByName(JNIEnv *, jclass, jstring);
+JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Storage_getByName(JNIEnv *env, jclass cls, jstring jname);

 
 /*
  * Class    org_simgrid_msg_Storage
  * Method    getSize
  * Signature  ()D
  */
 
 /*
  * Class    org_simgrid_msg_Storage
  * Method    getSize
  * Signature  ()D
  */

-JNIEXPORT jlong JNICALL Java_org_simgrid_msg_Storage_getSize(JNIEnv *, jobject);
+JNIEXPORT jlong JNICALL Java_org_simgrid_msg_Storage_getSize(JNIEnv *env, jobject jstorage);

 
 /*
  * Class    org_simgrid_msg_Storage
  * Method    getFreeSize
  * Signature  ()D
  */
 
 /*
  * Class    org_simgrid_msg_Storage
  * Method    getFreeSize
  * Signature  ()D
  */

-JNIEXPORT jlong JNICALL Java_org_simgrid_msg_Storage_getFreeSize(JNIEnv *, jobject);
+JNIEXPORT jlong JNICALL Java_org_simgrid_msg_Storage_getFreeSize(JNIEnv *env, jobject jstorage);

 
 /*
  * Class    org_simgrid_msg_Storage
  * Method    getUsedSize
  * Signature  ()D
  */
 
 /*
  * Class    org_simgrid_msg_Storage
  * Method    getUsedSize
  * Signature  ()D
  */

-JNIEXPORT jlong JNICALL Java_org_simgrid_msg_Storage_getUsedSize(JNIEnv *, jobject);
+JNIEXPORT jlong JNICALL Java_org_simgrid_msg_Storage_getUsedSize(JNIEnv *env, jobject jstorage);

 
 /*
  * Class        org_simgrid_msg_Storage
 
 /*
  * Class        org_simgrid_msg_Storage


@@ -139,7 +139,7 @@ JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Storage_getHost(JNIEnv * env,jobj
  * Class org_simgrid_msg_Storage
  * Method all
  */
  * Class org_simgrid_msg_Storage
  * Method all
  */

-JNIEXPORT jobjectArray JNICALL Java_org_simgrid_msg_Storage_all(JNIEnv *, jclass);
+JNIEXPORT jobjectArray JNICALL Java_org_simgrid_msg_Storage_all(JNIEnv *env, jclass cls);

 
 SG_END_DECL()
 #endif                          /*!MSG_JSTORAGE_H */
 
 SG_END_DECL()
 #endif                          /*!MSG_JSTORAGE_H */