wrowe 01/07/26 09:37:56
Modified: modules/filters mod_include.c
Log:
That's it. There are no further emits for signedness or size conversion
in MSVC 5.x. Enough for 2.0.22, I'll revisit under -w4 (msvc's -wall)
and attack the other modules in 2.0.23-dev.
Revision Changes Path
1.116 +7 -6 httpd-2.0/modules/filters/mod_include.c
Index: mod_include.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/filters/mod_include.c,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- mod_include.c 2001/07/25 21:34:15 1.115
+++ mod_include.c 2001/07/26 16:37:56 1.116
@@ -165,7 +165,7 @@
break;
}
c = buf;
- while (c - buf != len) {
+ while (c < buf + len) {
if (ctx->bytes_parsed >= BYTE_COUNT_THRESHOLD) {
apr_bucket *start_bucket;
@@ -268,7 +268,7 @@
else {
c = buf;
}
- while (c - buf != len) {
+ while (c < buf + len) {
if (ctx->bytes_parsed >= BYTE_COUNT_THRESHOLD) {
return dptr;
}
@@ -366,10 +366,11 @@
static apr_status_t get_combined_directive (include_ctx_t *ctx,
request_rec *r,
apr_bucket_brigade *bb,
- char *tmp_buf, int tmp_buf_size)
+ char *tmp_buf,
+ apr_size_t tmp_buf_size)
{
- int done = 0;
- apr_bucket *dptr;
+ int done = 0;
+ apr_bucket *dptr;
const char *tmp_from;
apr_size_t tmp_from_len;
@@ -414,7 +415,7 @@
}
}
} while ((!done) &&
- ((ctx->curr_tag_pos - ctx->combined_tag) < ctx->tag_length));
+ (ctx->curr_tag_pos < ctx->combined_tag + ctx->tag_length));
ctx->combined_tag[ctx->tag_length] = '\0';
ctx->curr_tag_pos = ctx->combined_tag;
|