Changeset 334 for trunk/openjdk/jdk/src/share/native

Timestamp:

Feb 24, 2012, 8:54:34 PM (14 years ago)

Author:

dmik

Message:

jdk: Fix another bunch of warnings.

That should be it now.

Location:

trunk/openjdk/jdk/src/share/native

Files:

• com/sun/java/util/jar/pack/coding.cpp (modified) (2 diffs)
• com/sun/tools/jdi/SharedMemoryConnection.c (modified) (1 diff)
• sun/awt/libpng/png.c (modified) (4 diffs)
• sun/awt/libpng/pngrtran.c (modified) (1 diff)
• sun/awt/libpng/pngrutil.c (modified) (2 diffs)
• sun/font/bidi/uchardir.c (modified) (1 diff)
• sun/java2d/cmm/lcms/LCMS.c (modified) (2 diffs)
• sun/java2d/cmm/lcms/cmsio1.c (modified) (1 diff)
• sun/java2d/cmm/lcms/cmslut.c (modified) (1 diff)

trunk/openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/coding.cpp

@@ -500 +500 @@
     assert(B == 1 && H == 256 && S == 0 && D == 0);
     return getPopValue(this, *rp++ & 0xFF);
+
+  default:
+    break;
   }
   assert(false);
@@ -729 +732 @@
         case cmk_BHS0:   cmk2 = cmk_pop_BHS0;   break;
         case cmk_BYTE1:  cmk2 = cmk_pop_BYTE1;  break;
+        default: break;
         }
         self->vs0.cmk = cmk2;

trunk/openjdk/jdk/src/share/native/com/sun/tools/jdi/SharedMemoryConnection.c

@@ -174 +174 @@
      * Get the packet header
      */
-    (*env)->GetByteArrayRegion(env, b, 0, sizeof(pktHeader), pktHeader);
+    (*env)->GetByteArrayRegion(env, b, 0, sizeof(pktHeader), (jbyte *)pktHeader);
 
     total_length = (int)pktHeader[3] | ((int)pktHeader[2] << 8) |

trunk/openjdk/jdk/src/share/native/sun/awt/libpng/png.c

@@ -734 +734 @@
 png_get_copyright(png_structp png_ptr)
 {
-   if (&png_ptr != NULL)  /* silence compiler warning about unused png_ptr */
+   png_ptr = png_ptr;  /* silence compiler warning about unused png_ptr */
    return ((png_charp) "\n libpng version 1.2.18 - May 15, 2007\n\
    Copyright (c) 1998-2007 Glenn Randers-Pehrson\n\
    Copyright (c) 1996-1997 Andreas Dilger\n\
    Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.\n");
-   return ((png_charp) "");
 }
 
@@ -754 +753 @@
 {
    /* Version of *.c files used when building libpng */
-   if (&png_ptr != NULL)  /* silence compiler warning about unused png_ptr */
-      return ((png_charp) PNG_LIBPNG_VER_STRING);
-   return ((png_charp) "");
+   png_ptr = png_ptr;  /* silence compiler warning about unused png_ptr */
+   return ((png_charp) PNG_LIBPNG_VER_STRING);
 }
 
@@ -763 +761 @@
 {
    /* Version of *.h files used when building libpng */
-   if (&png_ptr != NULL)  /* silence compiler warning about unused png_ptr */
-      return ((png_charp) PNG_LIBPNG_VER_STRING);
-   return ((png_charp) "");
+   png_ptr = png_ptr;  /* silence compiler warning about unused png_ptr */
+   return ((png_charp) PNG_LIBPNG_VER_STRING);
 }
 
@@ -772 +769 @@
 {
    /* Returns longer string containing both version and date */
-   if (&png_ptr != NULL)  /* silence compiler warning about unused png_ptr */
-      return ((png_charp) PNG_HEADER_VERSION_STRING);
-   return ((png_charp) "");
+   png_ptr = png_ptr;  /* silence compiler warning about unused png_ptr */
+   return ((png_charp) PNG_HEADER_VERSION_STRING);
 }
 

trunk/openjdk/jdk/src/share/native/sun/awt/libpng/pngrtran.c

@@ -3994 +3994 @@
 #ifdef PNG_FLOATING_POINT_SUPPORTED
 #if defined(PNG_READ_GAMMA_SUPPORTED)
-const static int png_gamma_shift[] =
+static const int png_gamma_shift[] =
    {0x10, 0x21, 0x42, 0x84, 0x110, 0x248, 0x550, 0xff0, 0x00};
 

trunk/openjdk/jdk/src/share/native/sun/awt/libpng/pngrutil.c

@@ -210 +210 @@
                               png_size_t prefix_size, png_size_t *newlength)
 {
-   const static char msg[] = "Error decoding compressed text";
+   static const char msg[] = "Error decoding compressed text";
    png_charp text;
    png_size_t text_size;
@@ -592 +592 @@
    png_crc_finish(png_ptr, length);
 
-   if (&info_ptr == NULL) /* quiet compiler warnings about unused info_ptr */
-      return;
+   info_ptr = info_ptr; /* quiet compiler warnings about unused info_ptr */
+   return;
 }
 

trunk/openjdk/jdk/src/share/native/sun/font/bidi/uchardir.c

@@ -615 +615 @@
   dc &= 0x0f;
   if (dc > 13) {
-    dc = x2i[cp - 0x202a];
+    if (cp >= 0x202a && cp < 0x202a + 5)
+      dc = x2i[cp - 0x202a];
   } else {
     dc = jx2i[dc];

trunk/openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c

@@ -181 +181 @@
     }
 
-    sTrans.xf = cmsCreateMultiprofileTransform(iccArray, j,
+    sTrans.xf = cmsCreateMultiprofileTransform((cmsHPROFILE *)iccArray, j,
         0, 0, renderType, 0);
 
@@ -573 +573 @@
     int i, idx, delta, count;
     LPBYTE padChars[3] = {0, 0, 0};
-    LPBYTE beforeBuf, afterBuf, ptr;
+    LPBYTE beforeBuf = 0, afterBuf = 0, ptr;
     size_t beforeSize, afterSize;
     icUInt32Number profileSize, temp;

trunk/openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c

@@ -53 +53 @@
 
 
+#ifdef __EMX__
+#include <unistd.h>
+#include <stdlib.h>
+#define swab _swab
+#endif
+
 #include "lcms.h"
 

trunk/openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c

@@ -791 +791 @@
     MAT3       Jacobian;
     WORD       FixedK;
-    WORD       LastResult[4];
+    WORD       LastResult[4] = {0};