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/11/13 04:50:16 UTC
cvs commit: apache-2.0/src/modules/standard mod_cgi.c mod_rewrite.c mod_cgid.c
trawick 00/11/12 19:50:16
Modified: src/modules/experimental mod_charset_lite.c mod_ext_filter.c
src/modules/standard mod_cgi.c mod_rewrite.c mod_cgid.c
Log:
Clean up some of the warnings from a Tru64 build, mostly due to
the recent apr_ssize_t->apr_size_t changes. The problem in mod_cgid
was an int function which didn't have a return statement.
Revision Changes Path
1.32 +12 -12 apache-2.0/src/modules/experimental/mod_charset_lite.c
Index: mod_charset_lite.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/experimental/mod_charset_lite.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- mod_charset_lite.c 2000/11/07 00:33:48 1.31
+++ mod_charset_lite.c 2000/11/13 03:50:15 1.32
@@ -134,7 +134,7 @@
apr_xlate_t *xlate;
charset_dir_t *dc;
ees_t ees; /* extended error status */
- apr_ssize_t saved;
+ apr_size_t saved;
char buf[FATTEST_CHAR]; /* we want to be able to build a complete char here */
int ran; /* has filter instance run before? */
int noop; /* should we pass brigades through unchanged? */
@@ -452,7 +452,7 @@
/* send_downstream() is passed the translated data; it puts it in a single-
* bucket brigade and passes the brigade to the next filter
*/
-static apr_status_t send_downstream(ap_filter_t *f, const char *tmp, apr_ssize_t len)
+static apr_status_t send_downstream(ap_filter_t *f, const char *tmp, apr_size_t len)
{
ap_bucket_brigade *bb;
ap_bucket *b;
@@ -476,7 +476,7 @@
static apr_status_t set_aside_partial_char(charset_filter_ctx_t *ctx,
const char *partial,
- apr_ssize_t partial_len)
+ apr_size_t partial_len)
{
apr_status_t rv;
@@ -497,10 +497,10 @@
static apr_status_t finish_partial_char(charset_filter_ctx_t *ctx,
/* input buffer: */
const char **cur_str,
- apr_ssize_t *cur_len,
+ apr_size_t *cur_len,
/* output buffer: */
char **out_str,
- apr_ssize_t *out_len)
+ apr_size_t *out_len)
{
apr_status_t rv;
apr_size_t tmp_input_len;
@@ -710,8 +710,8 @@
{
ap_bucket *b, *consumed_bucket;
const char *bucket;
- apr_ssize_t bytes_in_bucket; /* total bytes read from current bucket */
- apr_ssize_t bucket_avail; /* bytes left in current bucket */
+ apr_size_t bytes_in_bucket; /* total bytes read from current bucket */
+ apr_size_t bucket_avail; /* bytes left in current bucket */
apr_status_t rv = APR_SUCCESS;
*hit_eos = 0;
@@ -746,15 +746,15 @@
* Strangely, finish_partial_char() increments the input buffer
* pointer but does not increment the output buffer pointer.
*/
- apr_ssize_t old_buffer_avail = *buffer_avail;
+ apr_size_t old_buffer_avail = *buffer_avail;
rv = finish_partial_char(ctx,
&bucket, &bucket_avail,
&buffer, buffer_avail);
buffer += old_buffer_avail - *buffer_avail;
}
else {
- apr_ssize_t old_buffer_avail = *buffer_avail;
- apr_ssize_t old_bucket_avail = bucket_avail;
+ apr_size_t old_buffer_avail = *buffer_avail;
+ apr_size_t old_bucket_avail = bucket_avail;
rv = apr_xlate_conv_buffer(ctx->xlate,
bucket, &bucket_avail,
buffer,
@@ -821,9 +821,9 @@
charset_filter_ctx_t *ctx = f->ctx;
ap_bucket *dptr, *consumed_bucket;
const char *cur_str;
- apr_ssize_t cur_len, cur_avail;
+ apr_size_t cur_len, cur_avail;
char tmp[OUTPUT_XLATE_BUF_SIZE];
- apr_ssize_t space_avail;
+ apr_size_t space_avail;
int done;
apr_status_t rv = APR_SUCCESS;
1.2 +4 -4 apache-2.0/src/modules/experimental/mod_ext_filter.c
Index: mod_ext_filter.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/experimental/mod_ext_filter.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mod_ext_filter.c 2000/10/28 15:17:41 1.1
+++ mod_ext_filter.c 2000/11/13 03:50:15 1.2
@@ -530,7 +530,7 @@
{
ef_ctx_t *ctx = f->ctx;
ef_dir_t *dc = ctx->dc;
- apr_ssize_t len;
+ apr_size_t len;
char buf[4096];
apr_status_t rv;
ap_bucket_brigade *bb;
@@ -571,8 +571,8 @@
ef_ctx_t *ctx = f->ctx;
ef_dir_t *dc = ctx->dc;
apr_status_t rv;
- apr_ssize_t bytes_written = 0;
- apr_ssize_t tmplen;
+ apr_size_t bytes_written = 0;
+ apr_size_t tmplen;
do {
tmplen = len - bytes_written;
@@ -631,7 +631,7 @@
ef_ctx_t *ctx = f->ctx;
ap_bucket *b;
ef_dir_t *dc;
- apr_ssize_t len;
+ apr_size_t len;
const char *data;
apr_status_t rv;
char buf[4096];
1.69 +1 -1 apache-2.0/src/modules/standard/mod_cgi.c
Index: mod_cgi.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_cgi.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- mod_cgi.c 2000/10/23 19:02:41 1.68
+++ mod_cgi.c 2000/11/13 03:50:16 1.69
@@ -593,7 +593,7 @@
*/
if (ap_should_client_block(r)) {
int dbsize, len_read;
- apr_ssize_t bytes_written, bytes_to_write;
+ apr_size_t bytes_written, bytes_to_write;
apr_status_t rv;
if (conf->logname) {
1.49 +2 -2 apache-2.0/src/modules/standard/mod_rewrite.c
Index: mod_rewrite.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_rewrite.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- mod_rewrite.c 2000/11/10 18:42:40 1.48
+++ mod_rewrite.c 2000/11/13 03:50:16 1.49
@@ -2927,7 +2927,7 @@
char buf[LONG_STRING_LEN];
char c;
int i;
- apr_ssize_t nbytes;
+ apr_size_t nbytes;
#ifndef NO_WRITEV
struct iovec iova[2];
@@ -3164,7 +3164,7 @@
char redir[20];
va_list ap;
int i;
- apr_ssize_t nbytes;
+ apr_size_t nbytes;
request_rec *req;
char *ruser;
const char *rhost;
1.50 +1 -1 apache-2.0/src/modules/standard/mod_cgid.c
Index: mod_cgid.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_cgid.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- mod_cgid.c 2000/11/10 19:01:32 1.49
+++ mod_cgid.c 2000/11/13 03:50:16 1.50
@@ -398,7 +398,7 @@
#endif
}
-static int cgid_server_child(int sd)
+static void cgid_server_child(int sd)
{
char *argv0;
char *filename;