You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by bj...@locus.apache.org on 2000/02/27 07:07:11 UTC
cvs commit: apache-1.3/src/os/os2 util_os2.c
bjh 00/02/26 22:07:11
Modified: src/main util_script.c
src/os/os2 util_os2.c
Log:
Squash a few "subscript has type `char'" warnings and a "defined but not used"
warning.
Revision Changes Path
1.150 +5 -5 apache-1.3/src/main/util_script.c
Index: util_script.c
===================================================================
RCS file: /home/cvs/apache-1.3/src/main/util_script.c,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- util_script.c 1999/12/09 17:19:45 1.149
+++ util_script.c 2000/02/27 06:07:10 1.150
@@ -267,16 +267,16 @@
#endif
#ifdef OS2
- if (env_temp = getenv("COMSPEC")) {
+ if ((env_temp = getenv("COMSPEC")) != NULL) {
ap_table_addn(e, "COMSPEC", env_temp);
}
- if (env_temp = getenv("ETC")) {
+ if ((env_temp = getenv("ETC")) != NULL) {
ap_table_addn(e, "ETC", env_temp);
}
- if (env_temp = getenv("DPATH")) {
+ if ((env_temp = getenv("DPATH")) != NULL) {
ap_table_addn(e, "DPATH", env_temp);
}
- if (env_temp = getenv("PERLLIB_PREFIX")) {
+ if ((env_temp = getenv("PERLLIB_PREFIX")) != NULL) {
ap_table_addn(e, "PERLLIB_PREFIX", env_temp);
}
#endif
@@ -673,7 +673,7 @@
}
}
-#if defined(OS2) || defined(WIN32)
+#if defined(WIN32)
static char **create_argv_cmd(pool *p, char *av0, const char *args, char *path)
{
register int x, n;
1.6 +2 -2 apache-1.3/src/os/os2/util_os2.c
Index: util_os2.c
===================================================================
RCS file: /home/cvs/apache-1.3/src/os/os2/util_os2.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- util_os2.c 1999/07/08 16:46:20 1.5
+++ util_os2.c 2000/02/27 06:07:10 1.6
@@ -82,9 +82,9 @@
len = sizeof(result-1);
for (c=0; c<len; c++) {
- while (isspace(message[c]) && isspace(message[c+1])) /* skip multiple whitespace */
+ while (ap_isspace(message[c]) && ap_isspace(message[c+1])) /* skip multiple whitespace */
c++;
- *(pos++) = isspace(message[c]) ? ' ' : message[c];
+ *(pos++) = ap_isspace(message[c]) ? ' ' : message[c];
}
*pos = 0;