dif for japhar cvs

[Chris Toshok]

I fixed the types of the UTFChars JNI functions.

Chris

? japhar.dif
? java.util/Makefile.in
? java.util/Makefile
Index: java.lang/Double.c
===================================================================
RCS file: /gd/gnu/anoncvsroot/classpath/native/java.lang/Double.c,v
retrieving revision 1.3
diff -c -r1.3 Double.c
*** Double.c    1999/06/01 05:27:58     1.3
--- Double.c    1999/11/04 07:03:32
***************
*** 113,123 ****
                    myptr++;
                    break;
                default:
- #if defined(WITH_JAPHAR)
-                   (*env)->ReleaseStringUTFChars(env, s, (const jbyte*)nptr);
- #else
                    (*env)->ReleaseStringUTFChars(env, s, nptr);
- #endif
                    _javalang_ThrowException(env, "java/lang/NumberFormatException", 
"bad number format for floating point literal");
                    return 0.0;
                    break;
--- 113,119 ----
***************
*** 126,146 ****
  
      if ((val.d == 0) && (nptr == endptr))
        {
- #if defined(WITH_JAPHAR)
-                   (*env)->ReleaseStringUTFChars(env, s, (const jbyte*)nptr);
- #else
            (*env)->ReleaseStringUTFChars(env, s, nptr);
- #endif
            _javalang_ThrowException(env, "java/lang/NumberFormatException", "no 
conversion performed, possible underflow");
            return 0.0;
        }
      if ((val.d == -HUGE_VAL) || (val.d == HUGE_VAL))
        {
- #if defined(WITH_JAPHAR)
-                   (*env)->ReleaseStringUTFChars(env, s, (const jbyte*)nptr);
- #else
            (*env)->ReleaseStringUTFChars(env, s, nptr);
- #endif
            _javalang_ThrowException(env, "java/lang/NumberFormatException", 
"conversion would cause overflow");
            return 0.0;
        }
--- 122,134 ----
***************
*** 148,158 ****
      val.d = atof(nptr);
  #endif
  
- #if defined(WITH_JAPHAR)
-                   (*env)->ReleaseStringUTFChars(env, s, (const jbyte*)nptr);
- #else
      (*env)->ReleaseStringUTFChars(env, s, nptr);
- #endif
      return val.d;
  }
  
--- 136,142 ----
Index: java.lang/Float.c
===================================================================
RCS file: /gd/gnu/anoncvsroot/classpath/native/java.lang/Float.c,v
retrieving revision 1.6
diff -c -r1.6 Float.c
*** Float.c     1999/06/01 05:27:15     1.6
--- Float.c     1999/11/04 07:03:32
***************
*** 111,121 ****
                    myptr++;
                    break;
                default:
- #if defined(WITH_JAPHAR)
-                   (*env)->ReleaseStringUTFChars(env, s, (const jbyte*)nptr);
- #else
                    (*env)->ReleaseStringUTFChars(env, s, nptr);
- #endif
                    _javalang_ThrowException(env, "java/lang/NumberFormatException", 
"bad number format for float");
                    return 0.0;
                    break;
--- 111,117 ----
***************
*** 124,144 ****
  
      if ((val.d == 0) && (nptr == endptr))
        {
- #if defined(WITH_JAPHAR)
-                   (*env)->ReleaseStringUTFChars(env, s, (const jbyte*)nptr);
- #else
            (*env)->ReleaseStringUTFChars(env, s, nptr);
- #endif
            _javalang_ThrowException(env, "java/lang/NumberFormatException", "no 
conversion performed, possible underflow");
            return 0.0;
        }
      if ((val.d == -HUGE_VAL) || (val.d == HUGE_VAL))
        {
- #if defined(WITH_JAPHAR)
-                   (*env)->ReleaseStringUTFChars(env, s, (const jbyte*)nptr);
- #else
            (*env)->ReleaseStringUTFChars(env, s, nptr);
- #endif
            _javalang_ThrowException(env, "java/lang/NumberFormatException", 
"conversion would cause overflow");
            return 0.0;
        }
--- 120,132 ----
***************
*** 146,156 ****
      val.d = atof(nptr);
  #endif
  
- #if defined(WITH_JAPHAR)
-                   (*env)->ReleaseStringUTFChars(env, s, (const jbyte*)nptr);
- #else
      (*env)->ReleaseStringUTFChars(env, s, nptr);
- #endif
      return val.f;
  }
  
--- 134,140 ----