dreid 99/12/19 02:05:17
Modified: src Configure
src/main buff.c http_protocol.c util_md5.c
src/modules/standard mod_echo.c
Log:
Remove some nuisance warnings by changing int to ap_ssize_t.
Also add a default MPM_METHOD for BeOS.
Revision Changes Path
1.17 +1 -0 apache-2.0/src/Configure
Index: Configure
===================================================================
RCS file: /home/cvs/apache-2.0/src/Configure,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Configure 1999/11/02 05:08:51 1.16
+++ Configure 1999/12/19 10:05:04 1.17
@@ -763,6 +763,7 @@
CFLAGS="$CFLAGS -DBEOS"
DEF_WANTHSREGEX=yes
OSDIR='os/beos'
+ DEF_MPM_METHOD=mpmt_beos
;;
4850-*.*)
OS='NCR MP/RAS'
1.26 +8 -4 apache-2.0/src/main/buff.c
Index: buff.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/buff.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- buff.c 1999/11/07 05:58:24 1.25
+++ buff.c 1999/12/19 10:05:08 1.26
@@ -337,7 +337,8 @@
API_EXPORT(ap_status_t) ap_bread(BUFF *fb, void *buf, ap_size_t nbyte,
ap_ssize_t *bytes_read)
{
- int i, nrd;
+ int nrd;
+ ap_ssize_t i;
ap_status_t rv;
if (fb->flags & B_RDERR) {
@@ -441,7 +442,8 @@
*/
API_EXPORT(int) ap_bgets(char *buff, int n, BUFF *fb)
{
- int i, ch, ct;
+ int ch, ct;
+ ap_ssize_t i;
ap_status_t rv;
/* Can't do bgets on an unbuffered stream */
@@ -876,7 +878,8 @@
API_EXPORT(int) ap_bputs(const char *x, BUFF *fb)
{
ap_status_t rv;
- int i, j = strlen(x);
+ int j = strlen(x);
+ ap_ssize_t i;
rv = ap_bwrite(fb, x, j, &i);
if (i != j) {
fb->berrno = rv;
@@ -891,7 +894,8 @@
*/
API_EXPORT_NONSTD(int) ap_bvputs(BUFF *fb,...)
{
- int i, j, k;
+ int j, k;
+ ap_ssize_t i;
va_list v;
const char *x;
1.41 +2 -1 apache-2.0/src/main/http_protocol.c
Index: http_protocol.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/http_protocol.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- http_protocol.c 1999/12/09 21:47:45 1.40
+++ http_protocol.c 1999/12/19 10:05:09 1.41
@@ -2337,7 +2337,8 @@
API_EXPORT_NONSTD(int) ap_rvputs(request_rec *r,...)
{
va_list args;
- int i, j, k;
+ ap_ssize_t i;
+ int j, k;
const char *x;
BUFF *fb = r->connection->client;
ap_status_t rv;
1.7 +1 -1 apache-2.0/src/main/util_md5.c
Index: util_md5.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/util_md5.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- util_md5.c 1999/12/11 00:13:19 1.6
+++ util_md5.c 1999/12/19 10:05:10 1.7
@@ -217,7 +217,7 @@
AP_MD5_CTX context;
unsigned char buf[1000];
long length = 0;
- int nbytes;
+ ap_ssize_t nbytes;
ap_MD5Init(&context);
nbytes = sizeof(buf);
1.14 +1 -2 apache-2.0/src/modules/standard/mod_echo.c
Index: mod_echo.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_echo.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- mod_echo.c 1999/10/30 05:25:32 1.13
+++ mod_echo.c 1999/12/19 10:05:15 1.14
@@ -38,8 +38,7 @@
for( ; ; )
{
- int w;
- int r;
+ ap_ssize_t r, w;
(void) ap_bread(c->client,buf,sizeof buf,&r);
if(r <= 0)
break;
