Remove function iconv_open_into

	修改：     include/cppp/reiconv.hpp.in
	修改：     lib/iconv.cpp

Author: ChenPi11

include/cppp/reiconv.hpp.in

@@ -33,21 +33,24 @@ extern "C++"
    {
       extern @DLL_VARIABLE@ int reiconv_version; /* Likewise */
 
-      /* Define iconv_t ourselves. */
       #undef iconv_t
+      /* Define iconv_t ourselves. */
       typedef void* iconv_t;
 
+      #undef iconv_open
       /* Allocates descriptor for code conversion from encoding ‘fromcode’ to
          encoding ‘tocode’. */
       extern @DLL_VARIABLE@ iconv_t iconv_open (const char* tocode, const char* fromcode);
 
+      #undef iconv
       /* Converts, using conversion descriptor ‘cd’, at most ‘*inbytesleft’ bytes
          starting at ‘*inbuf’, writing at most ‘*outbytesleft’ bytes starting at
          ‘*outbuf’.
          Decrements ‘*inbytesleft’ and increments ‘*inbuf’ by the same amount.
          Decrements ‘*outbytesleft’ and increments ‘*outbuf’ by the same amount. */
       extern @DLL_VARIABLE@ size_t iconv (iconv_t cd, char* * inbuf, size_t *inbytesleft, char* * outbuf, size_t *outbytesleft);
 
+      #undef iconv_close
       /* Frees resources allocated for conversion descriptor ‘cd’. */
       extern @DLL_VARIABLE@ int iconv_close (iconv_t cd);
 
@@ -59,12 +62,6 @@ extern "C++"
          mbstate_t dummy2;
       } iconv_allocation_t;
 
-      /* Allocates descriptor for code conversion from encoding ‘fromcode’ to
-         encoding ‘tocode’ into preallocated memory. Returns an error indicator
-         (0 or -1 with errno set). */
-      extern @DLL_VARIABLE@ int iconv_open_into (const char* tocode, const char* fromcode,
-                                 iconv_allocation_t* resultp);
-
       /* Control of attributes. */
       extern @DLL_VARIABLE@ int iconvctl (iconv_t cd, int request, void* argument);
 
@@ -159,10 +156,6 @@ extern "C++"
                                           void* data),
                            void* data);
 
-      /* Canonicalize an encoding name.
-         The result is either a canonical encoding name, or name itself. */
-      extern @DLL_VARIABLE@ const char * iconv_canonicalize (const char * name);
-
       /*
       * This C function converts an entire string from one encoding to another,
       * using iconv. Easier to use than iconv() itself, and supports autodetect

lib/iconv.cpp

@@ -281,30 +281,6 @@ namespace cppp{namespace base{namespace reiconv
   typedef int verify_size_1[2 * (sizeof (struct conv_struct) <= sizeof (iconv_allocation_t)) - 1];
   typedef int verify_size_2[2 * (sizeof (struct wchar_conv_struct) <= sizeof (iconv_allocation_t)) - 1];
 
-  int iconv_open_into (const char* tocode, const char* fromcode,
-                      iconv_allocation_t* resultp)
-  {
-    struct conv_struct * cd;
-    unsigned int from_index;
-    int from_wchar;
-    unsigned int from_surface;
-    unsigned int to_index;
-    int to_wchar;
-    unsigned int to_surface;
-    int discard_ilseq;
-
-  #include "iconv_open1.h"
-
-    cd = (struct conv_struct *) resultp;
-
-  #include "iconv_open2.h"
-
-    return 0;
-  invalid:
-    errno = EINVAL;
-    return -1;
-  }
-
   /* Bit mask of all valid surfaces. */
   #define ALL_SURFACES (ICONV_SURFACE_EBCDIC_ZOS_UNIX)
 
@@ -510,61 +486,7 @@ namespace cppp{namespace base{namespace reiconv
   # include "canonical_local.h"
   #endif
   };
-
-  const char * iconv_canonicalize (const char * name)
-  {
-    const char* code;
-    char buf[MAX_WORD_LENGTH+10+1];
-    const char* cp;
-    char* bp;
-    const struct alias * ap;
-    unsigned int count;
-    unsigned int index;
-    const char* pool;
-
-    /* Before calling aliases_lookup, convert the input string to upper case,
-    * and check whether it's entirely ASCII (we call gperf with option "-7"
-    * to achieve a smaller table) and non-empty. If it's not entirely ASCII,
-    * or if it's too long, it is not a valid encoding name.
-    */
-    for (code = name;;) {
-      /* Search code in the table. */
-      for (cp = code, bp = buf, count = MAX_WORD_LENGTH+10+1; ; cp++, bp++) {
-        unsigned char c = (unsigned char) *cp;
-        if (c >= 0x80)
-          goto invalid;
-        if (c >= 'a' && c <= 'z')
-          c -= 'a'-'A';
-        *bp = c;
-        if (c == '\0')
-          break;
-        if (--count == 0)
-          goto invalid;
-      }
-      for (;;) {
-        if (bp-buf >= 8 && memcmp(bp-8,"//IGNORE",8)==0) {
-          bp -= 8;
-          *bp = '\0';
-          continue;
-        }
-        break;
-      }
-      pool = stringpool;
-      ap = aliases_lookup(buf,bp-buf);
-      if (ap == NULL) {
-        pool = stringpool2;
-        ap = aliases2_lookup(buf);
-        if (ap == NULL)
-          goto invalid;
-      }
-      index = ap->encoding_index;
-      break;
-    }
-    return all_canonical[index] + pool;
-  invalid:
-    return name;
-  }
-
+  
   /* version number: (major<<8) + minor */
   int reiconv_version = (3 << 8) + 0;