apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: apr/threadproc/win32 proc.c
Date Tue, 29 Jan 2002 05:49:22 GMT
wrowe       02/01/28 21:49:21

  Modified:    file_io/win32 open.c
               i18n/unix utf8_ucs2.c
               include/arch/unix i18n.h
               test     testucs.c
               threadproc/win32 proc.c
  Log:
    In respect to Jeff's earlier comments, these fns will never be publicly
    exported.  However, with some patches I'm working up, they will be bound
    inside the core executable, so clashes could become possible [inevitable]
    since they aren't (and should not become) static functions.
  
  Revision  Changes    Path
  1.92      +3 -3      apr/file_io/win32/open.c
  
  Index: open.c
  ===================================================================
  RCS file: /home/cvs/apr/file_io/win32/open.c,v
  retrieving revision 1.91
  retrieving revision 1.92
  diff -u -r1.91 -r1.92
  --- open.c	28 Jan 2002 15:56:08 -0000	1.91
  +++ open.c	29 Jan 2002 05:49:21 -0000	1.92
  @@ -114,7 +114,7 @@
           }
       }
   
  -    if (rv = conv_utf8_to_ucs2(srcstr, &srcremains, t, &retlen)) {
  +    if (rv = apr_conv_utf8_to_ucs2(srcstr, &srcremains, t, &retlen)) {
           return (rv == APR_INCOMPLETE) ? APR_EINVAL : rv;
       }
       if (srcremains) {
  @@ -155,7 +155,7 @@
           }
       }
           
  -    if (rv = conv_ucs2_to_utf8(srcstr, &srcremains, t, &retlen)) {
  +    if (rv = apr_conv_ucs2_to_utf8(srcstr, &srcremains, t, &retlen)) {
           return rv;
       }
       if (srcremains) {
  @@ -197,7 +197,7 @@
           wfile = apr_palloc(pool, (r + n) * sizeof(apr_wchar_t));
           wcscpy(wfile, wpre);
           d = n;
  -        if (rv = conv_utf8_to_ucs2(file, &n, wfile + r, &d)) {
  +        if (rv = apr_conv_utf8_to_ucs2(file, &n, wfile + r, &d)) {
               return NULL;
           }
           for (ch = wfile + r; *ch; ++ch) {
  
  
  
  1.6       +6 -6      apr/i18n/unix/utf8_ucs2.c
  
  Index: utf8_ucs2.c
  ===================================================================
  RCS file: /home/cvs/apr/i18n/unix/utf8_ucs2.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- utf8_ucs2.c	16 May 2001 05:30:51 -0000	1.5
  +++ utf8_ucs2.c	29 Jan 2002 05:49:21 -0000	1.6
  @@ -93,13 +93,13 @@
    *                  W1 = 110110yyyyyyyyyy
    *                  W2 = 110111xxxxxxxxxx
    *
  - * conv_utf8_to_ucs2 out bytes:  sizeof(in) * 1 <= Req <= sizeof(in) * 2
  + * apr_conv_utf8_to_ucs2 out bytes:sizeof(in) * 1 <= Req <= sizeof(in) * 2
    *
  - * conv_ucs2_to_utf8 out words:  sizeof(in) / 2 <= Req <= sizeof(in) * 3 / 2
  + * apr_conv_ucs2_to_utf8 out words:sizeof(in) / 2 <= Req <= sizeof(in) * 3 / 2
    */
   
  -apr_status_t conv_utf8_to_ucs2(const char *in, apr_size_t *inbytes,
  -                               apr_wchar_t *out, apr_size_t *outwords)
  +apr_status_t apr_conv_utf8_to_ucs2(const char *in, apr_size_t *inbytes,
  +                                   apr_wchar_t *out, apr_size_t *outwords)
   {
       apr_int64_t newch, mask;
       apr_size_t expect, eating;
  @@ -207,8 +207,8 @@
       return APR_SUCCESS;
   }
   
  -apr_status_t conv_ucs2_to_utf8(const apr_wchar_t *in, apr_size_t *inwords,
  -                               char *out, apr_size_t *outbytes)
  +apr_status_t apr_conv_ucs2_to_utf8(const apr_wchar_t *in, apr_size_t *inwords,
  +                                   char *out, apr_size_t *outbytes)
   {
       apr_int64_t newch, require;
       apr_size_t need;
  
  
  
  1.4       +4 -4      apr/include/arch/unix/i18n.h
  
  Index: i18n.h
  ===================================================================
  RCS file: /home/cvs/apr/include/arch/unix/i18n.h,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- i18n.h	12 Apr 2001 13:45:36 -0000	1.3
  +++ i18n.h	29 Jan 2002 05:49:21 -0000	1.4
  @@ -71,8 +71,8 @@
    * when the character code is invalid (in or out of context) and the later
    * when more characters were expected, but insufficient characters remain.
    */
  -apr_status_t conv_utf8_to_ucs2(const char *in, apr_size_t *inbytes,
  -                               apr_wchar_t *out, apr_size_t *outwords);
  +apr_status_t apr_conv_utf8_to_ucs2(const char *in, apr_size_t *inbytes,
  +                                   apr_wchar_t *out, apr_size_t *outwords);
   
   /**
    * An APR internal function for fast ucs-2 wide Unicode format conversion to 
  @@ -83,7 +83,7 @@
    * when the character code is invalid (in or out of context) and the later
    * when more words were expected, but insufficient words remain.
    */
  -apr_status_t conv_ucs2_to_utf8(const apr_wchar_t *in, apr_size_t *inwords,
  -                               char *out, apr_size_t *outbytes);
  +apr_status_t apr_conv_ucs2_to_utf8(const apr_wchar_t *in, apr_size_t *inwords,
  +                                   char *out, apr_size_t *outbytes);
   
   #endif /* def I18N_H */
  
  
  
  1.4       +3 -3      apr/test/testucs.c
  
  Index: testucs.c
  ===================================================================
  RCS file: /home/cvs/apr/test/testucs.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- testucs.c	13 Dec 2001 17:26:15 -0000	1.3
  +++ testucs.c	29 Jan 2002 05:49:21 -0000	1.4
  @@ -46,7 +46,7 @@
       
       do {
           apr_size_t nl = s.nl, wl = sizeof(s.w) / 2;
  -        rc = conv_utf8_to_ucs2(s.n, &nl, s.w, &wl);
  +        rc = apr_conv_utf8_to_ucs2(s.n, &nl, s.w, &wl);
           s.wl = (sizeof(s.w) / 2) - wl;
           if (!nl && rc == APR_SUCCESS) {
               if (!success) {
  @@ -98,7 +98,7 @@
       
       do {
           apr_size_t nl = sizeof(s.n), wl = s.wl;        
  -        rc = conv_ucs2_to_utf8(s.w, &wl, s.n, &nl);
  +        rc = apr_conv_ucs2_to_utf8(s.w, &wl, s.n, &nl);
           s.nl = sizeof(s.n) - nl;
           if (!wl && rc == APR_SUCCESS) {
               if (!success) {
  @@ -130,7 +130,7 @@
   
       do {
           int wl = s.wl, nl = sizeof(s.n);
  -        rc = conv_ucs2_to_utf8(s.w, &wl, s.n, &nl);
  +        rc = apr_conv_ucs2_to_utf8(s.w, &wl, s.n, &nl);
           s.nl = sizeof(s.n) - s.nl;
           if (rc == APR_INCOMPLETE) {
               test_wrange(&s);
  
  
  
  1.63      +6 -5      apr/threadproc/win32/proc.c
  
  Index: proc.c
  ===================================================================
  RCS file: /home/cvs/apr/threadproc/win32/proc.c,v
  retrieving revision 1.62
  retrieving revision 1.63
  diff -u -r1.62 -r1.63
  --- proc.c	28 Jan 2002 21:58:16 -0000	1.62
  +++ proc.c	29 Jan 2002 05:49:21 -0000	1.63
  @@ -398,8 +398,8 @@
               pNext = (apr_wchar_t*)pEnvBlock;
               while (env[i]) {
                   apr_size_t in = strlen(env[i]) + 1;
  -                if ((rv = conv_utf8_to_ucs2(env[i], &in, 
  -                                            pNext, &iEnvBlockLen)) 
  +                if ((rv = apr_conv_utf8_to_ucs2(env[i], &in, 
  +                                                pNext, &iEnvBlockLen)) 
                           != APR_SUCCESS) {
                       return rv;
                   }
  @@ -443,9 +443,9 @@
           apr_size_t ncwd = 0, nwcwd = 0;
           apr_wchar_t *wcwd = NULL;
   
  -        if (((rv = conv_utf8_to_ucs2(progname, &nprg, wprg, &nwprg))
  +        if (((rv = apr_conv_utf8_to_ucs2(progname, &nprg, wprg, &nwprg))
                    != APR_SUCCESS)
  -         || ((rv = conv_utf8_to_ucs2(cmdline, &ncmd, wcmd, &nwcmd))
  +         || ((rv = apr_conv_utf8_to_ucs2(cmdline, &ncmd, wcmd, &nwcmd))
                    != APR_SUCCESS)) {
               return rv;
           }
  @@ -454,7 +454,8 @@
           {
               ncwd = nwcwd = strlen(attr->currdir) + 1;
               wcwd = apr_palloc(cont, ncwd * sizeof(wcwd[0]));
  -            if ((rv = conv_utf8_to_ucs2(attr->currdir, &ncwd, wcwd, &nwcwd))
  +            if ((rv = apr_conv_utf8_to_ucs2(attr->currdir, &ncwd, 
  +                                            wcwd, &nwcwd))
                       != APR_SUCCESS) {
                   return rv;
               }
  
  
  

Mime
View raw message