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/28 19:57:32 UTC
cvs commit: apache-2.0/src/modules/standard mod_include.c
trawick 00/11/28 10:57:32
Modified: src/main http_core.c
src/modules/standard mod_include.c
Log:
Fix some lvalue casts so that we can compile with xlc on AIX.
Submitted by: "Victor J. Orlikowski" <v....@gte.net>
Reviewed by: Jeff Trawick
Revision Changes Path
1.227 +8 -2 apache-2.0/src/main/http_core.c
Index: http_core.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/http_core.c,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -r1.226 -r1.227
--- http_core.c 2000/11/28 00:17:38 1.226
+++ http_core.c 2000/11/28 18:57:30 1.227
@@ -2617,8 +2617,11 @@
++hdtr->headers;
}
else {
+ char *iov_base = (char *)hdtr->headers[0].iov_base;
+
hdtr->headers[0].iov_len -= tmplen;
- (char *) hdtr->headers[0].iov_base += tmplen;
+ iov_base += tmplen;
+ hdtr->headers[0].iov_base = iov_base;
tmplen = 0;
}
}
@@ -2643,8 +2646,11 @@
++hdtr->trailers;
}
else {
+ char *iov_base = (char *)hdtr->trailers[0].iov_base;
+
hdtr->trailers[0].iov_len -= tmplen;
- (char *)hdtr->trailers[0].iov_base += tmplen;
+ iov_base += tmplen;
+ hdtr->trailers[0].iov_base = iov_base;
tmplen = 0;
}
}
1.80 +5 -4 apache-2.0/src/modules/standard/mod_include.c
Index: mod_include.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_include.c,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- mod_include.c 2000/11/28 03:19:20 1.79
+++ mod_include.c 2000/11/28 18:57:31 1.80
@@ -655,8 +655,7 @@
/* pjr hack char var[MAX_STRING_LEN]; */
const char *start_of_var_name;
char *end_of_var_name; /* end of var name + 1 */
- const char *expansion;
- const char *val;
+ const char *expansion, *temp_end, *val;
char tmp_store;
size_t l;
@@ -673,7 +672,8 @@
*next = '\0';
return;
}
- (const char *)end_of_var_name = in;
+ temp_end = in;
+ end_of_var_name = (char *)temp_end;
++in;
}
else {
@@ -681,7 +681,8 @@
while (apr_isalnum(*in) || *in == '_') {
++in;
}
- (const char *)end_of_var_name = in;
+ temp_end = in;
+ end_of_var_name = (char *)temp_end;
}
/* what a pain, too bad there's no table_getn where you can
* pass a non-nul terminated string */