summaryrefslogtreecommitdiff
path: root/buckets
diff options
context:
space:
mode:
authorrbb <rbb@13f79535-47bb-0310-9956-ffa450edef68>2000-07-12 14:48:09 +0000
committerrbb <rbb@13f79535-47bb-0310-9956-ffa450edef68>2000-07-12 14:48:09 +0000
commit14c4eeac3dd26f08a2091738856c811382d37818 (patch)
tree34a154e2a6fd427a81fd5edb048c99c4096a9d33 /buckets
parent81fc9da84d31f2553089a61a124de585fe2d7e88 (diff)
downloadlibapr-14c4eeac3dd26f08a2091738856c811382d37818.tar.gz
Remove some warnings.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@60335 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'buckets')
-rw-r--r--buckets/ap_buf.c11
-rw-r--r--buckets/ap_rmem_buf.c3
2 files changed, 3 insertions, 11 deletions
diff --git a/buckets/ap_buf.c b/buckets/ap_buf.c
index 5356227cc..771bc48f6 100644
--- a/buckets/ap_buf.c
+++ b/buckets/ap_buf.c
@@ -255,12 +255,11 @@ APR_EXPORT(int) ap_get_bucket_len(ap_bucket *b)
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 @@ APR_EXPORT(int) ap_brigade_vputs(ap_bucket_brigade *b, ...)
* 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 @@ APR_EXPORT(int) ap_brigade_vputs(ap_bucket_brigade *b, ...)
b->tail = b->tail->next;
b->tail->bucket = r;
}
- va_end(v);
- return n;
+ return k;
}
diff --git a/buckets/ap_rmem_buf.c b/buckets/ap_rmem_buf.c
index a74324b9f..4410b452c 100644
--- a/buckets/ap_rmem_buf.c
+++ b/buckets/ap_rmem_buf.c
@@ -90,9 +90,6 @@ APR_EXPORT(int) ap_rmem_get_len(ap_bucket_rmem *b)
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;