Revert "JORTE: update license headers and clean-up includes"

[orte.git] / orte / libjorte / JORTESubscriptionPropertiesSet.c

diff --git a/orte/libjorte/JORTESubscriptionPropertiesSet.c b/orte/libjorte/JORTESubscriptionPropertiesSet.c
index 5aee3b6bd58529b0fc633d7644498b572d2289bc..2ba47e5579c3f22668ca5efae75d4cb944f78329 100644 (file)
--- a/orte/libjorte/JORTESubscriptionPropertiesSet.c
+++ b/orte/libjorte/JORTESubscriptionPropertiesSet.c
@@ -27,6 +27,7 @@
 
 #include <string.h>
 #include <stdlib.h>
+#include <inttypes.h>
 // library header file's path
 #include "orte.h"
 // getNtpTime function
@@ -39,7 +40,7 @@
 
 JNIEXPORT jboolean JNICALL
 Java_org_ocera_orte_Subscription_jORTESubscriptionPropertiesSet
-(JNIEnv *env, jobject obj, jint j_appDomain_handle, jobject obj_sp)
+(JNIEnv *env, jobject obj, jlong j_appDomain_handle, jobject obj_sp)
 {
   // jni types
   jclass         cls_sp = NULL;
@@ -94,7 +95,7 @@ Java_org_ocera_orte_Subscription_jORTESubscriptionPropertiesSet
     }
     str = (*env)->GetStringUTFChars(env,obj_str,0);
     // Set the structure field.
-    strncpy((char *) subs_prop->topic, str, strlen(str) + 1);
+    strncpy((char *)subs_prop->topic, (const char*)str, strlen(str) + 1);
     #ifdef TEST_STAGE
       printf(":c: topic = %s, subs_prop->topic = %s \n",
              str, subs_prop->topic);
@@ -124,7 +125,7 @@ Java_org_ocera_orte_Subscription_jORTESubscriptionPropertiesSet
     }
     str = (*env)->GetStringUTFChars(env,obj_str,0);
     // Set the structure field.
-    strncpy((char *) subs_prop->typeName, str, strlen(str) + 1);
+    strncpy((char *)subs_prop->typeName, (const char*)str, strlen(str) + 1);
     #ifdef TEST_STAGE
       printf(":c: typeName = %s, subs_prop->typeName = %s \n",
              str, subs_prop->typeName);
@@ -143,7 +144,7 @@ Java_org_ocera_orte_Subscription_jORTESubscriptionPropertiesSet
     }
     subs_prop->typeChecksum = (TypeChecksum) (*env)->GetIntField(env, obj_sp, fid);
     #ifdef TEST_STAGE
-      printf(":c: check: subs_prop->typeChecksum = %d\n",
+      printf(":c: check: subs_prop->typeChecksum = %"PRId32"\n",
              subs_prop->typeChecksum);
     #endif
     /////////////////////////////////////////////////
@@ -162,7 +163,7 @@ Java_org_ocera_orte_Subscription_jORTESubscriptionPropertiesSet
     j_minSeparation = (*env)->GetObjectField(env, obj_sp, fid);
     subs_prop->minimumSeparation = getNtpTime(env, j_minSeparation);
     #ifdef TEST_STAGE
-      printf(":c: check: subs_prop->minimumSeparation: sec = %d, fract = %d \n",
+      printf(":c: check: subs_prop->minimumSeparation: sec = %"PRId32", fract = %"PRIu32" \n",
              subs_prop->minimumSeparation.seconds,
              subs_prop->minimumSeparation.fraction);
     #endif
@@ -178,7 +179,7 @@ Java_org_ocera_orte_Subscription_jORTESubscriptionPropertiesSet
     }
     subs_prop->recvQueueSize = (uint32_t) (*env)->GetLongField(env, obj_sp, fid);
     #ifdef TEST_STAGE
-      printf(":c: check: subs_prop->recvQueueSize = %d \n",
+      printf(":c: check: subs_prop->recvQueueSize = %"PRIu32" \n",
              subs_prop->recvQueueSize);
     #endif
     /////////////////////////////////////////////////
@@ -193,7 +194,7 @@ Java_org_ocera_orte_Subscription_jORTESubscriptionPropertiesSet
     }
     subs_prop->reliabilityRequested = (uint32_t) (*env)->GetLongField(env, obj_sp, fid);
     #ifdef TEST_STAGE
-      printf(":c: check: subs_prop->reliabilityRequested = %d \n",
+      printf(":c: check: subs_prop->reliabilityRequested = %"PRIu32" \n",
              subs_prop->reliabilityRequested);
     #endif
     /////////////////////////////////////////////////
@@ -212,7 +213,7 @@ Java_org_ocera_orte_Subscription_jORTESubscriptionPropertiesSet
     j_deadline = (*env)->GetObjectField(env, obj_sp, fid);
     subs_prop->deadline = getNtpTime(env, j_deadline);
     #ifdef TEST_STAGE
-      printf(":c: check: subs_prop->deadline: sec = %d, fract = %d  \n",
+      printf(":c: check: subs_prop->deadline: sec = %"PRId32", fract = %"PRIu32"  \n",
              subs_prop->deadline.seconds, subs_prop->deadline.fraction);
     #endif
     /////////////////////////////////////////////////
@@ -227,7 +228,7 @@ Java_org_ocera_orte_Subscription_jORTESubscriptionPropertiesSet
     }
     subs_prop->mode = (uint32_t) (*env)->GetIntField(env, obj_sp, fid);
     #ifdef TEST_STAGE
-      printf(":c: check: subs_prop->mode = %d \n",
+      printf(":c: check: subs_prop->mode = %"PRIu32" \n",
              subs_prop->mode);
     #endif
 /*