ben 99/10/24 12:24:16
Modified: src/include util_script.h
src/lib/apr/file_io/unix readwrite.c
src/main buff.c http_protocol.c rfc1413.c util_script.c
src/modules/standard mod_autoindex.c mod_log_config.c
Log:
Size rigour.
Revision Changes Path
1.3 +1 -1 apache-2.0/src/include/util_script.h
Index: util_script.h
===================================================================
RCS file: /export/home/cvs/apache-2.0/src/include/util_script.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- util_script.h 1999/08/31 05:32:19 1.2
+++ util_script.h 1999/10/24 19:23:43 1.3
@@ -80,7 +80,7 @@
API_EXPORT(int) ap_scan_script_header_err_core(request_rec *r, char *buffer,
int (*getsfunc) (char *, int, void *),
void *getsfunc_data);
-API_EXPORT(void) ap_send_size(size_t size, request_rec *r);
+API_EXPORT(void) ap_send_size(ap_ssize_t size, request_rec *r);
API_EXPORT(int) ap_call_exec(request_rec *r, ap_child_info_t *pinfo, char
*argv0, char **env,
int shellcmd);
1.14 +1 -1 apache-2.0/src/lib/apr/file_io/unix/readwrite.c
Index: readwrite.c
===================================================================
RCS file: /export/home/cvs/apache-2.0/src/lib/apr/file_io/unix/readwrite.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- readwrite.c 1999/10/19 11:19:28 1.13
+++ readwrite.c 1999/10/24 19:23:55 1.14
@@ -358,7 +358,7 @@
va_list ap;
ap_vformatter_buff_t vbuff;
char *buf;
- int len;
+ ap_ssize_t len;
buf = malloc(HUGE_STRING_LEN);
if (buf == NULL) {
1.11 +6 -3 apache-2.0/src/main/buff.c
Index: buff.c
===================================================================
RCS file: /export/home/cvs/apache-2.0/src/main/buff.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- buff.c 1999/10/22 22:08:15 1.10
+++ buff.c 1999/10/24 19:23:57 1.11
@@ -318,7 +318,8 @@
/* a wrapper around iol_read which checks for errors and EOFs */
static int read_with_errors(BUFF *fb, void *buf, int nbyte)
{
- int rv, bytes_read;
+ int rv;
+ ap_ssize_t bytes_read;
rv = iol_read(fb->iol, buf, nbyte, &bytes_read);
if (rv == APR_SUCCESS && bytes_read == 0) {
@@ -541,7 +542,8 @@
*/
static int writev_with_errors(BUFF *fb, const struct iovec *vec, int nvec)
{
- int rv, bytes_written;
+ int rv;
+ ap_ssize_t bytes_written;
rv = iol_writev(fb->iol, vec, nvec, &bytes_written);
if (rv != APR_SUCCESS) {
@@ -687,7 +689,8 @@
*/
static int write_with_errors(BUFF *fb, const void *buf, int nbyte)
{
- int rv, bytes_written;
+ int rv;
+ ap_ssize_t bytes_written;
rv = iol_write(fb->iol, buf, nbyte, &bytes_written);
if (rv != APR_SUCCESS) {
1.24 +1 -1 apache-2.0/src/main/http_protocol.c
Index: http_protocol.c
===================================================================
RCS file: /export/home/cvs/apache-2.0/src/main/http_protocol.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- http_protocol.c 1999/10/20 12:49:55 1.23
+++ http_protocol.c 1999/10/24 19:23:58 1.24
@@ -2012,7 +2012,7 @@
char buf[IOBUFSIZE];
long total_bytes_sent = 0;
register int w, o;
- int n;
+ ap_ssize_t n;
ap_status_t status;
if (length == 0)
1.8 +2 -2 apache-2.0/src/main/rfc1413.c
Index: rfc1413.c
===================================================================
RCS file: /export/home/cvs/apache-2.0/src/main/rfc1413.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- rfc1413.c 1999/10/24 05:59:18 1.7
+++ rfc1413.c 1999/10/24 19:24:00 1.8
@@ -155,7 +155,7 @@
#endif
i = 0;
while(i < strlen(buffer)) {
- int j = strlen(buffer + i);
+ ap_ssize_t j = strlen(buffer + i);
ap_status_t status;
status = ap_send(sock, buffer+i, &j);
if (status != APR_SUCCESS && status != APR_EINTR) {
@@ -181,7 +181,7 @@
* this allows it to work on both ASCII and EBCDIC machines.
*/
while((cp = strchr(buffer, '\012')) == NULL && i < sizeof(buffer) - 1) {
- int j = sizeof(buffer) - 1 - i;
+ ap_ssize_t j = sizeof(buffer) - 1 - i;
ap_status_t status;
status = ap_recv(sock, buffer+i, &j);
if (status != APR_SUCCESS && status != APR_EINTR) {
1.14 +4 -4 apache-2.0/src/main/util_script.c
Index: util_script.c
===================================================================
RCS file: /export/home/cvs/apache-2.0/src/main/util_script.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- util_script.c 1999/10/20 12:49:56 1.13
+++ util_script.c 1999/10/24 19:24:02 1.14
@@ -626,10 +626,10 @@
}
-API_EXPORT(void) ap_send_size(size_t size, request_rec *r)
+API_EXPORT(void) ap_send_size(ap_ssize_t size, request_rec *r)
{
/* XXX: this -1 thing is a gross hack */
- if (size == (size_t)-1) {
+ if (size == (ap_ssize_t)-1) {
ap_rputs(" -", r);
}
else if (!size) {
@@ -639,13 +639,13 @@
ap_rputs(" 1k", r);
}
else if (size < 1048576) {
- ap_rprintf(r, "%4dk", (size + 512) / 1024);
+ ap_rprintf(r, "%4ldk", (size + 512) / 1024);
}
else if (size < 103809024) {
ap_rprintf(r, "%4.1fM", size / 1048576.0);
}
else {
- ap_rprintf(r, "%4dM", (size + 524288) / 1048576);
+ ap_rprintf(r, "%4ldM", (size + 524288) / 1048576);
}
}
1.12 +4 -2 apache-2.0/src/modules/standard/mod_autoindex.c
Index: mod_autoindex.c
===================================================================
RCS file: /export/home/cvs/apache-2.0/src/modules/standard/mod_autoindex.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- mod_autoindex.c 1999/10/20 12:50:07 1.11
+++ mod_autoindex.c 1999/10/24 19:24:06 1.12
@@ -887,7 +887,8 @@
static void do_emit_plain(request_rec *r, ap_file_t *f)
{
char buf[IOBUFSIZE + 1];
- int i, n, c, ch;
+ int i, c, ch;
+ ap_ssize_t n;
ap_status_t stat;
ap_rputs("<PRE>\n", r);
@@ -1080,7 +1081,8 @@
{
char titlebuf[MAX_STRING_LEN], *find = "<TITLE>";
ap_file_t *thefile = NULL;
- int x, y, n, p;
+ int x, y, p;
+ ap_ssize_t n;
if (r->status != HTTP_OK) {
return NULL;
1.9 +1 -1 apache-2.0/src/modules/standard/mod_log_config.c
Index: mod_log_config.c
===================================================================
RCS file: /export/home/cvs/apache-2.0/src/modules/standard/mod_log_config.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mod_log_config.c 1999/10/20 12:50:07 1.8
+++ mod_log_config.c 1999/10/24 19:24:13 1.9
@@ -739,7 +739,7 @@
int *strl;
request_rec *orig;
int i;
- int len = 0;
+ ap_ssize_t len = 0;
ap_array_header_t *format;
char *envar;
