You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@locus.apache.org on 2000/08/07 22:11:37 UTC
cvs commit: apache-2.0/src/modules/standard mod_include.c
trawick 00/08/07 13:11:37
Modified: src/support htdigest.c ab.c
src/main util.c
src/modules/standard mod_include.c
Log:
A few more (last?) ap_xlate->apr_xlate changes covering stuff not completely
handled in the big apr rename last week.
Revision Changes Path
1.13 +2 -2 apache-2.0/src/support/htdigest.c
Index: htdigest.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/support/htdigest.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- htdigest.c 2000/08/07 19:26:02 1.12
+++ htdigest.c 2000/08/07 20:11:34 1.13
@@ -235,9 +235,9 @@
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);
}
1.24 +6 -6 apache-2.0/src/support/ab.c
Index: ab.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/support/ab.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ab.c 2000/08/07 19:26:02 1.23
+++ ab.c 2000/08/07 20:11:34 1.24
@@ -594,8 +594,8 @@
#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 @@
#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 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><%s></i> apache-2.0<br>\n", AB_VERSION, "$Revision: 1.23 $");
+ printf(" This is ApacheBench, Version %s <i><%s></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");
1.67 +2 -2 apache-2.0/src/main/util.c
Index: util.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/util.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- util.c 2000/08/06 06:07:35 1.66
+++ util.c 2000/08/07 20:11:36 1.67
@@ -1480,7 +1480,7 @@
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 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];
1.51 +1 -1 apache-2.0/src/modules/standard/mod_include.c
Index: mod_include.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_include.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- mod_include.c 2000/08/06 06:07:47 1.50
+++ mod_include.c 2000/08/07 20:11:37 1.51
@@ -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*/