You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by be...@hyperreal.org on 1998/07/04 18:07:29 UTC
cvs commit: apache-1.3/src/main buff.c http_protocol.c
ben 98/07/04 09:07:28
Modified: src CHANGES
src/include buff.h compat.h
src/main buff.c http_protocol.c
Log:
Another missed API rename: bgetflag.
Revision Changes Path
1.945 +2 -2 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.944
retrieving revision 1.945
diff -u -r1.944 -r1.945
--- CHANGES 1998/07/03 20:05:58 1.944
+++ CHANGES 1998/07/04 16:07:24 1.945
@@ -10,8 +10,8 @@
*) add support for #perl arg interpolation in mod_include
[Doug MacEachern]
- *) API: Name changes of table_elts to ap_table_elts and is_table_empty
- to ap_is_table_empty. [Ben Laurie]
+ *) API: Name changes of table_elts to ap_table_elts, is_table_empty
+ to ap_is_table_empty and bgetflag to ap_bgetflag. [Ben Laurie]
*) PORT: Add UnixWare 7 support
[Vadim Kostoglodoff <va...@olly.ru>] PR#2463
1.45 +1 -1 apache-1.3/src/include/buff.h
Index: buff.h
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/include/buff.h,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- buff.h 1998/05/28 22:09:46 1.44
+++ buff.h 1998/07/04 16:07:25 1.45
@@ -153,7 +153,7 @@
API_EXPORT(int) ap_bsetflag(BUFF *fb, int flag, int value);
API_EXPORT(int) ap_bclose(BUFF *fb);
-#define bgetflag(fb, flag) ((fb)->flags & (flag))
+#define ap_bgetflag(fb, flag) ((fb)->flags & (flag))
/* Error handling */
API_EXPORT(void) ap_bonerror(BUFF *fb, void (*error) (BUFF *, int, void *),
1.12 +1 -0 apache-1.3/src/include/compat.h
Index: compat.h
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/include/compat.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- compat.h 1998/06/29 19:06:18 1.11
+++ compat.h 1998/07/04 16:07:26 1.12
@@ -44,6 +44,7 @@
#define bflsbuf ap_bflsbuf
#define bflush ap_bflush
#define bgetc ap_bgetc
+#define bgetflag ap_bgetflag
#define bgetopt ap_bgetopt
#define bgets ap_bgets
#define bhalfduplex ap_bhalfduplex
1.80 +3 -3 apache-1.3/src/main/buff.c
Index: buff.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/main/buff.c,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- buff.c 1998/07/01 18:22:33 1.79
+++ buff.c 1998/07/04 16:07:27 1.80
@@ -689,7 +689,7 @@
}
i = read_with_errors(fb, buf, nbyte);
#ifdef CHARSET_EBCDIC
- if (i > 0 && bgetflag(fb, B_ASCII2EBCDIC))
+ if (i > 0 && ap_bgetflag(fb, B_ASCII2EBCDIC))
ascii2ebcdic(buf, buf, i);
#endif /*CHARSET_EBCDIC*/
return i;
@@ -728,7 +728,7 @@
/* read directly into caller's buffer */
i = read_with_errors(fb, buf, nbyte);
#ifdef CHARSET_EBCDIC
- if (i > 0 && bgetflag(fb, B_ASCII2EBCDIC))
+ if (i > 0 && ap_bgetflag(fb, B_ASCII2EBCDIC))
ascii2ebcdic(buf, buf, i);
#endif /*CHARSET_EBCDIC*/
if (i == -1) {
@@ -1194,7 +1194,7 @@
static int csize = 0;
/* XXX: martin don't you want to do this after the error tests below? */
- if (bgetflag(fb, B_EBCDIC2ASCII)) {
+ if (ap_bgetflag(fb, B_EBCDIC2ASCII)) {
if (nbyte > csize) {
if (cbuf != NULL)
free(cbuf);
1.223 +3 -3 apache-1.3/src/main/http_protocol.c
Index: http_protocol.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/main/http_protocol.c,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -r1.222 -r1.223
--- http_protocol.c 1998/07/01 21:19:53 1.222
+++ http_protocol.c 1998/07/04 16:07:27 1.223
@@ -647,7 +647,7 @@
*/
ap_bsetflag(conn->client, B_SAFEREAD, 1);
while ((len = getline(l, HUGE_STRING_LEN, conn->client, 0)) <= 0) {
- if ((len < 0) || bgetflag(conn->client, B_EOF)) {
+ if ((len < 0) || ap_bgetflag(conn->client, B_EOF)) {
ap_bsetflag(conn->client, B_SAFEREAD, 0);
return 0;
}
@@ -1050,7 +1050,7 @@
{
char *protocol;
#ifdef CHARSET_EBCDIC
- int convert = bgetflag(r->connection->client, B_EBCDIC2ASCII);
+ int convert = ap_bgetflag(r->connection->client, B_EBCDIC2ASCII);
#endif /*CHARSET_EBCDIC*/
if (r->assbackwards)
@@ -1209,7 +1209,7 @@
int i;
const long int zero = 0L;
#ifdef CHARSET_EBCDIC
- int convert = bgetflag(r->connection->client, B_EBCDIC2ASCII);
+ int convert = ap_bgetflag(r->connection->client, B_EBCDIC2ASCII);
#endif /*CHARSET_EBCDIC*/
if (r->assbackwards) {