Changeset 32

Timestamp:

Jun 19, 2010, 6:27:41 PM (15 years ago)

Author:

dmik

Message:

jdk/hpi/windows: Compiler warnings.

Location:

trunk/openjdk/jdk/src/windows/hpi/src

Files:

• linker_md.c (modified) (3 diffs)
• path_md.c (modified) (1 diff)
• socket_md.c (modified) (1 diff)

trunk/openjdk/jdk/src/windows/hpi/src/linker_md.c

@@ -84 +84 @@
 sysBuildLibName(char *holder, int holderlen, char *pname, char *fname)
 {
-    const int pnamelen = pname ? strlen(pname) : 0;
+    const size_t pnamelen = pname ? strlen(pname) : 0;
     const char c = (pnamelen > 0) ? pname[pnamelen-1] : 0;
 
     /* Quietly truncates on buffer overflow. Should be an error. */
-    if (pnamelen + strlen(fname) + 10 > holderlen) {
+    if (pnamelen + strlen(fname) + 10 > (size_t)holderlen) {
         *holder = '\0';
         return;
@@ -105 +105 @@
 sysLoadLibrary(const char * name, char *err_buf, int err_buflen)
 {
-    void *result = LoadLibrary(name);
+    void *result = (void *)LoadLibrary(name);
     if (result == NULL) {
         /* Error message is pretty lame, try to make a better guess. */
@@ -121 +121 @@
 void sysUnloadLibrary(void *handle)
 {
-    FreeLibrary(handle);
+    FreeLibrary((HMODULE)handle);
 }
 
 void * sysFindLibraryEntry(void *handle, const char *name)
 {
-    return GetProcAddress(handle, name);
+    return GetProcAddress((HMODULE)handle, name);
 }

trunk/openjdk/jdk/src/windows/hpi/src/path_md.c

@@ -146 +146 @@
 #ifdef DEBUG_PATH
     jio_fprintf(stderr, "sysNativePath: %s\n", path);
-#endif DEBUG_PATH
+#endif /* DEBUG_PATH */
     return path;
 }

trunk/openjdk/jdk/src/windows/hpi/src/socket_md.c

@@ -375 +375 @@
 int
 sysSocket(int domain, int type, int protocol) {
-    int sock;
+    SOCKET sock;
     PSOCKFN socketfn;
     if ((socketfn = sockfnptrs[FN_SOCKET]) == NULL) {