bughz/sigar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rid compile warnings from modern gcc

Browse Source
This commit is contained in:
Doug MacEachern 2007-04-15 15:58:09 +00:00
parent 9a04924df3
commit 886f04adea
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
bindings/java/src/jni/vmware/javavmware.c
View File

@ -195,8 +195,8 @@ JNIEXPORT jboolean VMWARE_JNI(VMwareServer_isRegistered)
dSERVER(obj); dSERVER(obj);
const char *config = const char *config =
JENV->GetStringUTFChars(env, jconfig, NULL); JENV->GetStringUTFChars(env, jconfig, NULL);
jboolean value; Bool value;
jboolean retval = Bool retval =
VMControl_ServerIsRegistered(server, config, &value); VMControl_ServerIsRegistered(server, config, &value);
JENV->ReleaseStringUTFChars(env, jconfig, config); JENV->ReleaseStringUTFChars(env, jconfig, config);
@ -206,7 +206,7 @@ JNIEXPORT jboolean VMWARE_JNI(VMwareServer_isRegistered)
return JNI_FALSE; return JNI_FALSE;
} }
return value; return value ? JNI_TRUE : JNI_FALSE;
} }
JNIEXPORT jobject VMWARE_JNI(VMwareServer_getRegisteredVmNames) JNIEXPORT jobject VMWARE_JNI(VMwareServer_getRegisteredVmNames)
@ -337,7 +337,7 @@ JNIEXPORT jint VMWARE_JNI(VM_getExecutionState)
(JNIEnv *env, jclass obj) (JNIEnv *env, jclass obj)
{ {
dVM(obj); dVM(obj);
unsigned int state; int state;
if (!VMControl_VMGetExecutionState(vm, &state)) { if (!VMControl_VMGetExecutionState(vm, &state)) {
vmware_throw_last_vm_error(); vmware_throw_last_vm_error();
@ -393,7 +393,7 @@ JNIEXPORT jint VMWARE_JNI(VM_getToolsLastActive)
(JNIEnv *env, jclass obj) (JNIEnv *env, jclass obj)
{ {
dVM(obj); dVM(obj);
unsigned int seconds; int seconds;
if (!VMControl_VMToolsLastActive(vm, &seconds)) { if (!VMControl_VMToolsLastActive(vm, &seconds)) {
vmware_throw_last_vm_error(); vmware_throw_last_vm_error();
@ -544,7 +544,7 @@ JNIEXPORT jint VMWARE_JNI(VM_getProductInfo)
(JNIEnv *env, jclass obj, jint type) (JNIEnv *env, jclass obj, jint type)
{ {
dVM(obj); dVM(obj);
unsigned int value; int value;
if (!VMControl_VMGetProductInfo(vm, type, &value)) { if (!VMControl_VMGetProductInfo(vm, type, &value)) {
vmware_throw_last_vm_error(); vmware_throw_last_vm_error();
@ -637,14 +637,14 @@ JNIEXPORT jboolean VMWARE_JNI(VM_hasSnapshot)
(JNIEnv *env, jclass obj) (JNIEnv *env, jclass obj)
{ {
dVM(obj); dVM(obj);
jboolean value; Bool value;
if (!VMControl_VMHasSnapshot(vm, &value)) { if (!VMControl_VMHasSnapshot(vm, &value)) {
vmware_throw_last_vm_error(); vmware_throw_last_vm_error();
return JNI_FALSE; return JNI_FALSE;
} }
return value; return value ? JNI_TRUE : JNI_FALSE;
} }
JNIEXPORT jlong VMWARE_JNI(VM_getPid) JNIEXPORT jlong VMWARE_JNI(VM_getPid)
@ -730,8 +730,8 @@ JNIEXPORT jboolean VMWARE_JNI(VM_deviceIsConnected)
dVM(obj); dVM(obj);
const char *device = const char *device =
JENV->GetStringUTFChars(env, jdevice, NULL); JENV->GetStringUTFChars(env, jdevice, NULL);
jboolean isConnected; Bool isConnected;
jboolean retval = Bool retval =
VMControl_VMDeviceIsConnected(vm, device, VMControl_VMDeviceIsConnected(vm, device,
&isConnected); &isConnected);
@ -742,7 +742,7 @@ JNIEXPORT jboolean VMWARE_JNI(VM_deviceIsConnected)
return JNI_FALSE; return JNI_FALSE;
} }
return isConnected; return isConnected ? JNI_TRUE : JNI_FALSE;
} }
#endif /* VMCONTROL_WRAPPER_SUPPORTED */ #endif /* VMCONTROL_WRAPPER_SUPPORTED */

3
src/os/linux/sigar_os.h
View File

@ -71,7 +71,10 @@ struct sigar_t {
}; };
#define HAVE_STRERROR_R #define HAVE_STRERROR_R
#ifndef __USE_XOPEN2K
/* use gnu version of strerror_r */
#define HAVE_STRERROR_R_GLIBC #define HAVE_STRERROR_R_GLIBC
#endif
#define HAVE_READDIR_R #define HAVE_READDIR_R
#define HAVE_GETPWNAM_R #define HAVE_GETPWNAM_R
#define HAVE_GETPWUID_R #define HAVE_GETPWUID_R