You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rb...@locus.apache.org on 2000/07/12 16:48:12 UTC
cvs commit: apache-2.0/src/lib/apr/buckets ap_buf.c ap_rmem_buf.c
rbb 00/07/12 07:48:12
Modified: src/lib/apr/buckets ap_buf.c ap_rmem_buf.c
Log:
Remove some warnings.
Revision Changes Path
1.4 +3 -8 apache-2.0/src/lib/apr/buckets/ap_buf.c
Index: ap_buf.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/buckets/ap_buf.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ap_buf.c 2000/07/11 21:33:35 1.3
+++ ap_buf.c 2000/07/12 14:48:08 1.4
@@ -255,12 +255,11 @@
return 0;
}
-APR_EXPORT(int) ap_brigade_vputs(ap_bucket_brigade *b, ...)
+APR_EXPORT(int) ap_brigade_vputstrs(ap_bucket_brigade *b, va_list va)
{
ap_bucket *r;
- va_list va;
const char *x;
- int n, j, k, rv;
+ int j, k, rv;
ap_ssize_t i;
if (b->tail->bucket->color == AP_BUCKET_rwmem) {
@@ -272,12 +271,9 @@
* bucket. This is incredibly easy to take out if it is a bad
* idea. RBB
*/
- va_start(va, b);
ap_rwmem_vputstrs(rw, va);
- va_end(va);
}
- va_start(va, b);
for (k = 0;;) {
r = ap_bucket_new(AP_BUCKET_rmem);
x = va_arg(va, const char *);
@@ -300,7 +296,6 @@
b->tail = b->tail->next;
b->tail->bucket = r;
}
- va_end(v);
- return n;
+ return k;
}
1.2 +0 -3 apache-2.0/src/lib/apr/buckets/ap_rmem_buf.c
Index: ap_rmem_buf.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/buckets/ap_rmem_buf.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ap_rmem_buf.c 2000/07/11 21:33:35 1.1
+++ ap_rmem_buf.c 2000/07/12 14:48:09 1.2
@@ -90,9 +90,6 @@
APR_EXPORT(int) ap_rmem_write(ap_bucket_rmem *b, const void *buf,
ap_size_t nbyte, ap_ssize_t *bytes_written)
{
- int amt;
- int total;
-
if (nbyte == 0) {
*bytes_written = 0;
return APR_SUCCESS;