SF.net SVN: gar:[26794] csw/mgar/pkg/apr-util/trunk/files/iconv.diff

[dmichelsen at users.sourceforge.net]

Revision: 26794
          http://sourceforge.net/p/gar/code/26794
Author:   dmichelsen
Date:     2021-09-17 07:44:29 +0000 (Fri, 17 Sep 2021)
Log Message:
-----------
apr-util/trunk: Remove old patchfile

Removed Paths:
-------------
    csw/mgar/pkg/apr-util/trunk/files/iconv.diff

Deleted: csw/mgar/pkg/apr-util/trunk/files/iconv.diff
===================================================================
--- csw/mgar/pkg/apr-util/trunk/files/iconv.diff	2021-09-15 14:20:17 UTC (rev 26793)
+++ csw/mgar/pkg/apr-util/trunk/files/iconv.diff	2021-09-17 07:44:29 UTC (rev 26794)
@@ -1,101 +0,0 @@
-diff --speed-large-files --minimal -Nru apr-util-1.2.2.orig/build/apu-iconv.m4 apr-util-1.2.2/build/apu-iconv.m4
---- apr-util-1.2.2.orig/build/apu-iconv.m4	2005-12-12 00:44:56.159459000 -0500
-+++ apr-util-1.2.2/build/apu-iconv.m4	2005-12-12 00:42:15.630786000 -0500
-@@ -23,8 +23,8 @@
- #include <iconv.h>
- ],
- [
--  iconv_t cd = iconv_open("", "");
--  iconv(cd, NULL, NULL, NULL, NULL);
-+  libiconv_t cd = libiconv_open("", "");
-+  libiconv(cd, NULL, NULL, NULL, NULL);
- ], [$1], [$2])
- ])
- 
-diff --speed-large-files --minimal -Nru apr-util-1.2.2.orig/xlate/xlate.c apr-util-1.2.2/xlate/xlate.c
---- apr-util-1.2.2.orig/xlate/xlate.c	2005-12-12 00:44:57.208323000 -0500
-+++ apr-util-1.2.2/xlate/xlate.c	2005-12-12 00:44:17.270321000 -0500
-@@ -59,7 +59,7 @@
-     char *topage;
-     char *sbcs_table;
- #if APU_HAVE_ICONV
--    iconv_t ich;
-+    libiconv_t ich;
- #elif APU_HAVE_APR_ICONV
-     apr_iconv_t ich;
- #endif
-@@ -89,8 +89,8 @@
-     }
- 
- #elif APU_HAVE_ICONV
--    if (old->ich != (iconv_t)-1) {
--        if (iconv_close(old->ich)) {
-+    if (old->ich != (libiconv_t)-1) {
-+        if (libiconv_close(old->ich)) {
-             int rv = errno;
- 
-             /* Sometimes, iconv is not good about setting errno. */
-@@ -117,7 +117,7 @@
-     }
- 
-     inbytes_left = outbytes_left = sizeof(inbuf);
--    translated = iconv(convset->ich, (ICONV_INBUF_TYPE)&inbufptr,
-+    translated = libiconv(convset->ich, (ICONV_INBUF_TYPE)&inbufptr,
-                        &inbytes_left, &outbufptr, &outbytes_left);
- 
-     if (translated != (apr_size_t)-1
-@@ -129,16 +129,16 @@
- 
-         convset->sbcs_table = apr_palloc(convset->pool, sizeof(outbuf));
-         memcpy(convset->sbcs_table, outbuf, sizeof(outbuf));
--        iconv_close(convset->ich);
--        convset->ich = (iconv_t)-1;
-+        libiconv_close(convset->ich);
-+        convset->ich = (libiconv_t)-1;
- 
-         /* TODO: add the table to the cache */
-     }
-     else {
-         /* reset the iconv descriptor, since it's now in an undefined
-          * state. */
--        iconv_close(convset->ich);
--        convset->ich = iconv_open(convset->topage, convset->frompage);
-+        libiconv_close(convset->ich);
-+        convset->ich = libiconv_open(convset->topage, convset->frompage);
-     }
- }
- #elif APU_HAVE_APR_ICONV
-@@ -248,8 +248,8 @@
- 
- #elif APU_HAVE_ICONV
-     if (!found) {
--        new->ich = iconv_open(topage, frompage);
--        if (new->ich == (iconv_t)-1) {
-+        new->ich = libiconv_open(topage, frompage);
-+        if (new->ich == (libiconv_t)-1) {
-             int rv = errno;
-             /* Sometimes, iconv is not good about setting errno. */
-             return rv ? rv : APR_EINVAL;
-@@ -257,7 +257,7 @@
-         found = 1;
-         check_sbcs(new);
-     } else
--        new->ich = (iconv_t)-1;
-+        new->ich = (libiconv_t)-1;
- #endif /* APU_HAVE_ICONV */
- 
-     if (found) {
-@@ -336,11 +336,11 @@
-     else
- 
- #elif APU_HAVE_ICONV
--    if (convset->ich != (iconv_t)-1) {
-+    if (convset->ich != (libiconv_t)-1) {
-         const char *inbufptr = inbuf;
-         char *outbufptr = outbuf;
-         apr_size_t translated;
--        translated = iconv(convset->ich, (ICONV_INBUF_TYPE)&inbufptr,
-+        translated = libiconv(convset->ich, (ICONV_INBUF_TYPE)&inbufptr,
-                            inbytes_left, &outbufptr, outbytes_left);
- 
-         /* If everything went fine but we ran out of buffer, don't

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.