aboutsummaryrefslogtreecommitdiff
path: root/wcsmbs
diff options
context:
space:
mode:
Diffstat (limited to 'wcsmbs')
-rw-r--r--wcsmbs/btowc.c7
-rw-r--r--wcsmbs/mbrtowc.c7
-rw-r--r--wcsmbs/mbsnrtowcs.c14
-rw-r--r--wcsmbs/mbsrtowcs.c12
-rw-r--r--wcsmbs/wcrtomb.c15
-rw-r--r--wcsmbs/wcsnrtombs.c16
-rw-r--r--wcsmbs/wcsrtombs.c16
-rw-r--r--wcsmbs/wctob.c11
8 files changed, 56 insertions, 42 deletions
diff --git a/wcsmbs/btowc.c b/wcsmbs/btowc.c
index 0978f097f1..1271a01ed6 100644
--- a/wcsmbs/btowc.c
+++ b/wcsmbs/btowc.c
@@ -17,6 +17,7 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
+#include <dlfcn.h>
#include <gconv.h>
#include <stdio.h>
#include <string.h>
@@ -58,9 +59,9 @@ __btowc (c)
/* Create the input string. */
inbuf[0] = c;
- status = (*__wcsmbs_gconv_fcts.towc->__fct) (__wcsmbs_gconv_fcts.towc, &data,
- &inptr, inptr + 1, &dummy,
- 0, 1);
+ status = DL_CALL_FCT (__wcsmbs_gconv_fcts.towc->__fct,
+ (__wcsmbs_gconv_fcts.towc, &data, &inptr, inptr + 1,
+ data.__outbuf, &dummy, 0, 1));
/* The conversion failed. */
if (status != __GCONV_OK && status != __GCONV_FULL_OUTPUT
&& status != __GCONV_EMPTY_INPUT)
diff --git a/wcsmbs/mbrtowc.c b/wcsmbs/mbrtowc.c
index 6ecbdc5b5c..9809ed51a2 100644
--- a/wcsmbs/mbrtowc.c
+++ b/wcsmbs/mbrtowc.c
@@ -17,6 +17,7 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
+#include <dlfcn.h>
#include <errno.h>
#include <gconv.h>
#include <wchar.h>
@@ -69,9 +70,9 @@ __mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
/* Do a normal conversion. */
inbuf = (const unsigned char *) s;
- status = (*__wcsmbs_gconv_fcts.towc->__fct) (__wcsmbs_gconv_fcts.towc,
- &data, &inbuf, inbuf + n,
- &dummy, 0, 1);
+ status = DL_CALL_FCT (__wcsmbs_gconv_fcts.towc->__fct,
+ (__wcsmbs_gconv_fcts.towc, &data, &inbuf, inbuf + n,
+ data.__outbuf, &dummy, 0, 1));
/* There must not be any problems with the conversion but illegal input
characters. The output buffer must be large enough, otherwise the
diff --git a/wcsmbs/mbsnrtowcs.c b/wcsmbs/mbsnrtowcs.c
index 540afd0800..238458d25d 100644
--- a/wcsmbs/mbsnrtowcs.c
+++ b/wcsmbs/mbsnrtowcs.c
@@ -17,6 +17,7 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
+#include <dlfcn.h>
#include <errno.h>
#include <gconv.h>
#include <string.h>
@@ -49,7 +50,7 @@ __mbsnrtowcs (dst, src, nmc, len, ps)
size_t result;
int status;
struct __gconv_step *towc;
- size_t non_reversible;
+ size_t dummy;
/* Tell where we want the result. */
data.__invocation_counter = 0;
@@ -79,8 +80,9 @@ __mbsnrtowcs (dst, src, nmc, len, ps)
{
data.__outbuf = (unsigned char *) buf;
- status = (*towc->__fct) (__wcsmbs_gconv_fcts.towc, &data, &inbuf,
- srcend, &non_reversible, 0, 1);
+ status = DL_CALL_FCT (towc->__fct,
+ (towc, &data, &inbuf, srcend, data.__outbuf,
+ &dummy, 0, 1));
result += (wchar_t *) data.__outbuf - buf;
}
@@ -99,9 +101,9 @@ __mbsnrtowcs (dst, src, nmc, len, ps)
data.__outbuf = (unsigned char *) dst;
data.__outbufend = data.__outbuf + len * sizeof (wchar_t);
- status = (*towc->__fct) (__wcsmbs_gconv_fcts.towc, &data,
- (const unsigned char **) src, srcend,
- &non_reversible, 0, 1);
+ status = DL_CALL_FCT (towc->__fct,
+ (towc, &data, (const unsigned char **) src, srcend,
+ data.__outbuf, &dummy, 0, 1));
result = (wchar_t *) data.__outbuf - dst;
diff --git a/wcsmbs/mbsrtowcs.c b/wcsmbs/mbsrtowcs.c
index aaafe3bf1e..3c1f86a196 100644
--- a/wcsmbs/mbsrtowcs.c
+++ b/wcsmbs/mbsrtowcs.c
@@ -17,6 +17,7 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
+#include <dlfcn.h>
#include <errno.h>
#include <gconv.h>
#include <stdlib.h>
@@ -76,8 +77,9 @@ __mbsrtowcs (dst, src, len, ps)
{
data.__outbuf = (char *) buf;
- status = (*towc->__fct) (__wcsmbs_gconv_fcts.towc, &data, &inbuf,
- srcend, &non_reversible, 0, 1);
+ status = DL_CALL_FCT (towc->__fct,
+ (towc, &data, &inbuf, srcend, data.__outbuf,
+ &non_reversible, 0, 1));
result += (wchar_t *) data.__outbuf - buf;
}
@@ -105,9 +107,9 @@ __mbsrtowcs (dst, src, len, ps)
data.__outbuf = (unsigned char *) dst;
data.__outbufend = data.__outbuf + len * sizeof (wchar_t);
- status = (*towc->__fct) (__wcsmbs_gconv_fcts.towc, &data,
- (const unsigned char **) src, srcend,
- &non_reversible, 0, 1);
+ status = DL_CALL_FCT (towc->__fct,
+ (towc, &data, (const unsigned char **) src, srcend,
+ data.__outbuf, &non_reversible, 0, 1));
result = (wchar_t *) data.__outbuf - dst;
diff --git a/wcsmbs/wcrtomb.c b/wcsmbs/wcrtomb.c
index 5af383178c..f0bc824584 100644
--- a/wcsmbs/wcrtomb.c
+++ b/wcsmbs/wcrtomb.c
@@ -17,6 +17,7 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
+#include <dlfcn.h>
#include <errno.h>
#include <gconv.h>
#include <stdlib.h>
@@ -71,9 +72,9 @@ __wcrtomb (char *s, wchar_t wc, mbstate_t *ps)
by a NUL byte. */
if (wc == L'\0')
{
- status = (*__wcsmbs_gconv_fcts.tomb->__fct) (__wcsmbs_gconv_fcts.tomb,
- &data, NULL, NULL,
- &dummy, 1, 1);
+ status = DL_CALL_FCT (__wcsmbs_gconv_fcts.tomb->__fct,
+ (__wcsmbs_gconv_fcts.tomb, &data, NULL, NULL,
+ data.__outbuf, &dummy, 1, 1));
if (status == __GCONV_OK || status == __GCONV_EMPTY_INPUT)
*data.__outbuf++ = '\0';
@@ -83,10 +84,10 @@ __wcrtomb (char *s, wchar_t wc, mbstate_t *ps)
/* Do a normal conversion. */
const unsigned char *inbuf = (const unsigned char *) &wc;
- status = (*__wcsmbs_gconv_fcts.tomb->__fct) (__wcsmbs_gconv_fcts.tomb,
- &data, &inbuf,
- inbuf + sizeof (wchar_t),
- &dummy, 0, 1);
+ status = DL_CALL_FCT (__wcsmbs_gconv_fcts.tomb->__fct,
+ (__wcsmbs_gconv_fcts.tomb, &data, &inbuf,
+ inbuf + sizeof (wchar_t), data.__outbuf, &dummy,
+ 0, 1));
}
/* There must not be any problems with the conversion but illegal input
diff --git a/wcsmbs/wcsnrtombs.c b/wcsmbs/wcsnrtombs.c
index 7005bdcf12..dae2216ae5 100644
--- a/wcsmbs/wcsnrtombs.c
+++ b/wcsmbs/wcsnrtombs.c
@@ -17,6 +17,7 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
+#include <dlfcn.h>
#include <errno.h>
#include <gconv.h>
#include <wchar.h>
@@ -79,10 +80,10 @@ __wcsnrtombs (dst, src, nwc, len, ps)
{
data.__outbuf = buf;
- status = (*tomb->__fct) (__wcsmbs_gconv_fcts.tomb, &data,
- (const unsigned char **) &inbuf,
- (const unsigned char *) srcend, &dummy,
- 0, 1);
+ status = DL_CALL_FCT (tomb->__fct,
+ (tomb, &data, (const unsigned char **) &inbuf,
+ (const unsigned char *) srcend, data.__outbuf,
+ &dummy, 0, 1));
/* Count the number of bytes. */
result += data.__outbuf - buf;
@@ -104,9 +105,10 @@ __wcsnrtombs (dst, src, nwc, len, ps)
data.__outbuf = dst;
data.__outbufend = dst + len;
- status = (*tomb->__fct) (__wcsmbs_gconv_fcts.tomb, &data,
- (const unsigned char **) src,
- (const unsigned char *) srcend, &dummy, 0, 1);
+ status = DL_CALL_FCT (tomb->__fct,
+ (tomb, &data, (const unsigned char **) src,
+ (const unsigned char *) srcend, data.__outbuf,
+ &dummy, 0, 1));
/* Count the number of bytes. */
result = data.__outbuf - (unsigned char *) dst;
diff --git a/wcsmbs/wcsrtombs.c b/wcsmbs/wcsrtombs.c
index 875ef16f75..03ef013c7c 100644
--- a/wcsmbs/wcsrtombs.c
+++ b/wcsmbs/wcsrtombs.c
@@ -17,6 +17,7 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
+#include <dlfcn.h>
#include <errno.h>
#include <stdlib.h>
#include <gconv.h>
@@ -76,10 +77,10 @@ __wcsrtombs (dst, src, len, ps)
{
data.__outbuf = buf;
- status = (*tomb->__fct) (__wcsmbs_gconv_fcts.tomb, &data,
- (const unsigned char **) &inbuf,
- (const unsigned char *) srcend, &dummy,
- 0, 1);
+ status = DL_CALL_FCT (tomb->__fct,
+ (tomb, &data, (const unsigned char **) &inbuf,
+ (const unsigned char *) srcend, data.__outbuf,
+ &dummy, 0, 1));
/* Count the number of bytes. */
result += data.__outbuf - buf;
@@ -105,9 +106,10 @@ __wcsrtombs (dst, src, len, ps)
data.__outbuf = dst;
data.__outbufend = dst + len;
- status = (*tomb->__fct) (__wcsmbs_gconv_fcts.tomb, &data,
- (const unsigned char **) src,
- (const unsigned char *) srcend, &dummy, 0, 1);
+ status = DL_CALL_FCT (tomb->__fct,
+ (tomb, &data, (const unsigned char **) src,
+ (const unsigned char *) srcend, data.__outbuf,
+ &dummy, 0, 1));
/* Count the number of bytes. */
result = data.__outbuf - (unsigned char *) dst;
diff --git a/wcsmbs/wctob.c b/wcsmbs/wctob.c
index 8c6372558e..fc4c38331d 100644
--- a/wcsmbs/wctob.c
+++ b/wcsmbs/wctob.c
@@ -17,6 +17,7 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
+#include <dlfcn.h>
#include <gconv.h>
#include <stdio.h>
#include <string.h>
@@ -52,10 +53,12 @@ wctob (c)
/* Create the input string. */
inbuf[0] = c;
- status = (*__wcsmbs_gconv_fcts.tomb->__fct) (__wcsmbs_gconv_fcts.tomb, &data,
- (const unsigned char **) &inptr,
- (const unsigned char *) &inbuf[1],
- &dummy, 0, 1);
+ status = DL_CALL_FCT (__wcsmbs_gconv_fcts.tomb->__fct,
+ (__wcsmbs_gconv_fcts.tomb, &data,
+ (const unsigned char **) &inptr,
+ (const unsigned char *) &inbuf[1],
+ data.__outbuf, &dummy, 0, 1));
+
/* The conversion failed or the output is too long. */
if ((status != __GCONV_OK && status != __GCONV_FULL_OUTPUT
&& status != __GCONV_EMPTY_INPUT)
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 03:33:15 +0000