A few more (last?) ap_xlate->apr_xlate changes covering stuff not completely

handled in the big apr rename last week.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86020 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/filters/mod_include.c b/modules/filters/mod_include.c
index c6bfce4d8dd3f685b6d0ecc99332dd45a38f5c3e..cc81e785cdc2963e81ae2b34e6175f11672dd66e 100644 (file)
--- a/modules/filters/mod_include.c
+++ b/modules/filters/mod_include.c
@@ -117,7 +117,7 @@
 #define SIZEFMT_BYTES 0
 #define SIZEFMT_KMG 1
 #ifdef CHARSET_EBCDIC
-#define RAW_ASCII_CHAR(ch)  ap_xlate_conv_byte(ap_hdrs_from_ascii, (unsigned char)ch)
+#define RAW_ASCII_CHAR(ch)  apr_xlate_conv_byte(ap_hdrs_from_ascii, (unsigned char)ch)
 #else /*CHARSET_EBCDIC*/
 #define RAW_ASCII_CHAR(ch)  (ch)
 #endif /*CHARSET_EBCDIC*/

diff --git a/server/util.c b/server/util.c
index 9797d3f799c70ab82c6ff13e1dc58e217265e603..57bcd6a0f6387d41ef72ef032bee506745ae7a3d 100644 (file)
--- a/server/util.c
+++ b/server/util.c
@@ -1480,7 +1480,7 @@ static char x2c(const char *what)
     xstr[2]=what[0];
     xstr[3]=what[1];
     xstr[4]='\0';
-    digit = ap_xlate_conv_byte(ap_hdrs_from_ascii, 0xFF & strtol(xstr, NULL, 16));
+    digit = apr_xlate_conv_byte(ap_hdrs_from_ascii, 0xFF & strtol(xstr, NULL, 16));
 #endif /*CHARSET_EBCDIC*/
     return (digit);
 }
@@ -1558,7 +1558,7 @@ static const char c2x_table[] = "0123456789abcdef";
 static apr_inline unsigned char *c2x(unsigned what, unsigned char *where)
 {
 #ifdef CHARSET_EBCDIC
-    what = ap_xlate_conv_byte(ap_hdrs_to_ascii, (unsigned char)what);
+    what = apr_xlate_conv_byte(ap_hdrs_to_ascii, (unsigned char)what);
 #endif /*CHARSET_EBCDIC*/
     *where++ = '%';
     *where++ = c2x_table[what >> 4];

diff --git a/support/ab.c b/support/ab.c
index 5b3b56a4b09bf26ff495942a5fb9f374653e7c9a..19a3e5098bf0b2a0e7b06e2018115de6221137aa 100644 (file)
--- a/support/ab.c
+++ b/support/ab.c
@@ -594,8 +594,8 @@ static void read_connection(struct connection *c)
 #ifdef NOT_ASCII
         apr_size_t inbytes_left = space, outbytes_left = space;
 
-        status = ap_xlate_conv_buffer(from_ascii, buffer, &inbytes_left,
-                                      c->cbuff + c->cbx, &outbytes_left);
+        status = apr_xlate_conv_buffer(from_ascii, buffer, &inbytes_left,
+                                       c->cbuff + c->cbx, &outbytes_left);
         if (status || inbytes_left || outbytes_left) {
             fprintf(stderr, "only simple translation is supported (%d/%u/%u)\n",
                     status, inbytes_left, outbytes_left);
@@ -791,8 +791,8 @@ static void test(void)
 
 #ifdef NOT_ASCII
     inbytes_left = outbytes_left = reqlen;
-    status = ap_xlate_conv_buffer(to_ascii, request, &inbytes_left,
-                                  request, &outbytes_left);
+    status = apr_xlate_conv_buffer(to_ascii, request, &inbytes_left,
+                                   request, &outbytes_left);
     if (status || inbytes_left || outbytes_left) {
         fprintf(stderr, "only simple translation is supported (%d/%u/%u)\n",
                 status, inbytes_left, outbytes_left);
@@ -862,14 +862,14 @@ static void test(void)
 static void copyright(void)
 {
     if (!use_html) {
-        printf("This is ApacheBench, Version %s\n", AB_VERSION " <$Revision: 1.23 $> apache-2.0");
+        printf("This is ApacheBench, Version %s\n", AB_VERSION " <$Revision: 1.24 $> apache-2.0");
         printf("Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/\n");
         printf("Copyright (c) 1998-2000 The Apache Software Foundation, http://www.apache.org/\n");
         printf("\n");
     }
     else {
         printf("<p>\n");
-        printf(" This is ApacheBench, Version %s <i>&lt;%s&gt;</i> apache-2.0<br>\n", AB_VERSION, "$Revision: 1.23 $");
+        printf(" This is ApacheBench, Version %s <i>&lt;%s&gt;</i> apache-2.0<br>\n", AB_VERSION, "$Revision: 1.24 $");
         printf(" Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/<br>\n");
         printf(" Copyright (c) 1998-2000 The Apache Software Foundation, http://www.apache.org/<br>\n");
         printf("</p>\n<p>\n");

diff --git a/support/htdigest.c b/support/htdigest.c
index 0699b97a7389f3fd863e5a092109b017f6171b26..003bc86d7a614255a85d66c6d2b7c55c2a25cb32 100644 (file)
--- a/support/htdigest.c
+++ b/support/htdigest.c
@@ -235,9 +235,9 @@ int main(int argc, char *argv[])
     apr_create_pool(&cntxt, NULL);
 
 #ifdef CHARSET_EBCDIC
-    rv = ap_xlate_open(&to_ascii, "ISO8859-1", APR_DEFAULT_CHARSET, cntxt);
+    rv = apr_xlate_open(&to_ascii, "ISO8859-1", APR_DEFAULT_CHARSET, cntxt);
     if (rv) {
-        fprintf(stderr, "ap_xlate_open(): %s (%d)\n",
+        fprintf(stderr, "apr_xlate_open(): %s (%d)\n",
                 apr_strerror(rv, line, sizeof(line)), rv);
         exit(1);
     }