gcc/libjava/gnu/gcj/convert/natIconv.cc
Bryce McKinlay 820112852a natIconv.cc (read): Remove unused local.
2000-09-05  Bryce McKinlay  <bryce@albatross.co.nz>

	* gnu/gcj/convert/natIconv.cc (read): Remove unused local.
	(write): Ditto.
	* gnu/gcj/runtime/FileDeleter.java (deleteOnExitNow): Check for null
	stack. Synchronize.
	* java/lang/fdlibm.h: #undef __P if previously defined.
	* java/lang/natSystem.cc (currentTimeMillis): Remove unused local.
	* java/net/natPlainDatagramSocketImpl.cc (send): Remove unreachable
	block.
	(mcastGrp): Ditto.

From-SVN: r36158
2000-09-05 12:05:59 +01:00

155 lines
3.6 KiB
C++

// Input_iconv.java -- Java side of iconv() reader.
/* Copyright (C) 2000 Free Software Foundation
This file is part of libgcj.
This software is copyrighted work licensed under the terms of the
Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
details. */
/* Author: Tom Tromey <tromey@redhat.com>. */
#include <config.h>
#include <gcj/cni.h>
#include <jvm.h>
#include <gnu/gcj/convert/Input_iconv.h>
#include <gnu/gcj/convert/Output_iconv.h>
#include <java/io/UnsupportedEncodingException.h>
#ifdef HAVE_ICONV
#include <iconv.h>
template<typename T>
static inline size_t
iconv_adapter (size_t (*iconv_f) (iconv_t, T, size_t *, char **, size_t *),
iconv_t handle, char **inbuf, size_t *inavail,
char **outbuf, size_t *outavail)
{
return (*iconv_f) (handle, (T) inbuf, inavail, outbuf, outavail);
}
#endif
void
gnu::gcj::convert::Input_iconv::init (jstring encoding)
{
#ifdef HAVE_ICONV
jsize len = _Jv_GetStringUTFLength (encoding);
char buffer[len];
_Jv_GetStringUTFRegion (encoding, 0, len, buffer);
iconv_t h = iconv_open ("UCS-2", buffer);
if (h == (iconv_t) -1)
JvThrow (new java::io::UnsupportedEncodingException);
JvAssert (h != NULL);
handle = reinterpret_cast<gnu::gcj::RawData *> (h);
#else /* HAVE_ICONV */
// If no iconv, just throw an exception.
JvThrow (new java::io::UnsupportedEncodingException);
#endif /* HAVE_ICONV */
}
void
gnu::gcj::convert::Input_iconv::finalize (void)
{
#ifdef HAVE_ICONV
if (handle != NULL)
{
iconv_close ((iconv_t) handle);
handle = NULL;
}
#endif /* HAVE_ICONV */
}
jint
gnu::gcj::convert::Input_iconv::read (jcharArray outbuffer,
jint outpos, jint count)
{
#ifdef HAVE_ICONV
jbyte *bytes = elements (inbuffer);
jchar *out = elements (outbuffer);
size_t inavail = inlength - inpos;
size_t old_in = inavail;
size_t outavail = count;
size_t old_out = outavail;
char *inbuf = (char *) &bytes[inpos];
char *outbuf = (char *) &out[outpos];
size_t r = iconv_adapter (iconv, (iconv_t) handle,
&inbuf, &inavail,
&outbuf, &outavail);
// FIXME: what if R==-1?
inpos += old_in - inavail;
return old_out - outavail;
#else /* HAVE_ICONV */
return -1;
#endif /* HAVE_ICONV */
}
void
gnu::gcj::convert::Output_iconv::init (jstring encoding)
{
#ifdef HAVE_ICONV
jsize len = _Jv_GetStringUTFLength (encoding);
char buffer[len];
_Jv_GetStringUTFRegion (encoding, 0, len, buffer);
iconv_t h = iconv_open (buffer, "UCS-2");
if (h == (iconv_t) -1)
JvThrow (new java::io::UnsupportedEncodingException);
JvAssert (h != NULL);
handle = reinterpret_cast<gnu::gcj::RawData *> (h);
#else /* HAVE_ICONV */
// If no iconv, just throw an exception.
JvThrow (new java::io::UnsupportedEncodingException);
#endif /* HAVE_ICONV */
}
void
gnu::gcj::convert::Output_iconv::finalize (void)
{
#ifdef HAVE_ICONV
if (handle != NULL)
{
iconv_close ((iconv_t) handle);
handle = NULL;
}
#endif /* HAVE_ICONV */
}
jint
gnu::gcj::convert::Output_iconv::write (jcharArray inbuffer,
jint inpos, jint count)
{
#ifdef HAVE_ICONV
jchar *chars = elements (inbuffer);
jbyte *out = elements (buf);
size_t inavail = count;
size_t old_in = count;
size_t outavail = buf->length - count;
size_t old_out = outavail;
char *inbuf = (char *) &chars[inpos];
char *outbuf = (char *) &out[count];
size_t r = iconv_adapter (iconv, (iconv_t) handle,
&inbuf, &inavail,
&outbuf, &outavail);
// FIXME: what if R==-1?
count += old_out - outavail;
return old_in - inavail;
#else /* HAVE_ICONV */
return -1;
#endif /* HAVE_ICONV */
}