cvs commit: apr-iconv/lib iconv.c

[wrowe]

wrowe       2003/01/10 07:14:50

  Modified:    lib      iconv.c
  Log:
    I thought I had finished s/iconv_t/apr_iconv_t/.
  
    Apparently not.
  
  Revision  Changes    Path
  1.7       +7 -7      apr-iconv/lib/iconv.c
  
  Index: iconv.c
  ===================================================================
  RCS file: /home/cvs/apr-iconv/lib/iconv.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- iconv.c   26 Jul 2001 23:12:59 -0000      1.6
  +++ iconv.c   10 Jan 2003 15:14:50 -0000      1.7
  @@ -52,7 +52,7 @@
    */
   
   API_DECLARE(apr_status_t)
  -apr_iconv(iconv_t cd, const char **inbuf, apr_size_t *inbytesleft,
  +apr_iconv(apr_iconv_t cd, const char **inbuf, apr_size_t *inbytesleft,
        char **outbuf, apr_size_t *outbytesleft, apr_size_t *result)
   {
        struct iconv_converter *icp = (struct iconv_converter *)cd;
  @@ -72,14 +72,14 @@
   }
   
   API_DECLARE(apr_status_t)
  -apr_iconv_open(const char *to, const char *from, apr_pool_t *ctx, iconv_t 
*res)
  +apr_iconv_open(const char *to, const char *from, apr_pool_t *ctx, 
apr_iconv_t *res)
   {
        struct iconv_converter_desc **idesc;
        struct iconv_converter *icp;
        void *data;
        apr_status_t error;
   
  -     *res = (iconv_t)-1;
  +     *res = (apr_iconv_t)-1;
        icp = malloc(sizeof(*icp));
        if (icp == NULL)
                return (APR_ENOMEM);
  @@ -100,7 +100,7 @@
   }
   
   API_DECLARE(apr_status_t)
  -apr_iconv_close(iconv_t cd, apr_pool_t *ctx)
  +apr_iconv_close(apr_iconv_t *cd, apr_pool_t *ctx)
   {
        struct iconv_converter *icp = (struct iconv_converter *)cd;
        int error = 0;
  @@ -120,7 +120,7 @@
   #include <iconv.h>
   
   apr_status_t apr_iconv_open(const char *to_charset,
  -            const char *from_charset, apr_pool_t *ctx, iconv_t **res)
  +            const char *from_charset, apr_pool_t *ctx, apr_iconv_t **res)
   {
        *res = iconv_open(to_charset, from_charset);
        if (*res == (apr_size_t) -1)
  @@ -128,7 +128,7 @@
        return APR_SUCCESS;
   }
   
  -apr_status_t apr_iconv(iconv_t cd, const char **inbuf,
  +apr_status_t apr_iconv(apr_iconv_t cd, const char **inbuf,
               apr_size_t *inbytesleft, char **outbuf,
               apr_size_t *outbytesleft, apr_size_t *result)
   {
  @@ -137,7 +137,7 @@
                return apr_get_os_error();
        return APR_SUCCESS;
   }
  -apr_status_t apr_iconv_close(iconv_t cd)
  +apr_status_t apr_iconv_close(apr_iconv_t cd, apr_pool_t *ctx)
   {
        int status;
        if (iconv_close(cd))