You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@locus.apache.org on 2000/10/03 00:34:09 UTC
cvs commit: apache-2.0/src/modules/mpm/winnt registry.c service.c
wrowe 00/10/02 15:34:09
Modified: src/modules/mpm/winnt registry.c service.c
Log:
Downgrade warnings, stop changing errors from something meaningless to
something unrelated, and solve a bug in arg passing.
Revision Changes Path
1.27 +2 -23 apache-2.0/src/modules/mpm/winnt/registry.c
Index: registry.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/mpm/winnt/registry.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- registry.c 2000/08/02 05:27:10 1.26
+++ registry.c 2000/10/02 22:34:07 1.27
@@ -160,9 +160,6 @@
KEY_WRITE,
&hKey);
- if (rv == ERROR_FILE_NOT_FOUND)
- return APR_ENODIR;
-
if (rv != ERROR_SUCCESS)
return_error(rv);
}
@@ -181,7 +178,7 @@
/* Clean up a way over complicated process.
*
- * The return value is APR_SUCCESS, APR_ENOPATH, APR_NOTFOUND, or the OS error
+ * The return value is APR_SUCCESS, APR_ENOENT, APR_NOTFOUND, or the OS error
*/
apr_status_t ap_registry_get_value(apr_pool_t *p, const char *key, const char *name, char **ppValue)
@@ -196,9 +193,6 @@
KEY_READ,
&hKey);
- if (rv == ERROR_FILE_NOT_FOUND)
- return APR_ENODIR;
-
if (rv != ERROR_SUCCESS)
return_error(rv);
@@ -224,9 +218,6 @@
*ppValue, /* for value */
&nSize); /* for size of "value" */
- if (rv == ERROR_FILE_NOT_FOUND)
- rv = APR_ENOFILE;
-
RegCloseKey(hKey);
return_error(rv);
@@ -247,9 +238,6 @@
KEY_READ,
&hKey);
- if (rv == ERROR_FILE_NOT_FOUND)
- return APR_ENODIR;
-
if (rv != ERROR_SUCCESS)
return_error(rv);
@@ -264,10 +252,7 @@
NULL, /* for value */
&nSize); /* for size of "value" */
- if (rv == ERROR_FILE_NOT_FOUND) {
- rv = APR_ENOFILE;
- }
- else if (rv != ERROR_SUCCESS) {
+ if (rv != ERROR_SUCCESS) {
return_error(rv);
}
else
@@ -346,9 +331,6 @@
0,
KEY_WRITE,
&hKey);
-
- if (rv == ERROR_FILE_NOT_FOUND)
- return APR_ENODIR;
}
if (rv != ERROR_SUCCESS)
@@ -400,9 +382,6 @@
0,
KEY_WRITE,
&hKey);
-
- if (rv == ERROR_FILE_NOT_FOUND)
- return APR_ENODIR;
}
if (rv != ERROR_SUCCESS)
1.23 +9 -2 apache-2.0/src/modules/mpm/winnt/service.c
Index: service.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/mpm/winnt/service.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- service.c 2000/08/09 14:59:46 1.22
+++ service.c 2000/10/02 22:34:07 1.23
@@ -673,8 +673,15 @@
apr_snprintf(conf_key, sizeof(conf_key), SERVICEPARAMS, service_name);
rv = ap_registry_get_array(p, conf_key, "ConfigArgs", &svc_args);
if (rv != APR_SUCCESS) {
- // TODO: More message?
- return (rv);
+ if (rv == ERROR_FILE_NOT_FOUND) {
+ ap_log_error(APLOG_MARK, APLOG_INFO|APLOG_NOERRNO, 0, NULL,
+ "No ConfigArgs registered for %s, perhaps "
+ "this service is not installed?",
+ service_name);
+ return APR_SUCCESS;
+ }
+ else
+ return (rv);
}
if (!svc_args || svc_args->nelts == 0) {