Downgrade warnings, stop changing errors from something meaningless to

  something unrelated, and solve a bug in arg passing.

PR:
Obtained from:
Submitted by:
Reviewed by:

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86368 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/server/mpm/winnt/registry.c b/server/mpm/winnt/registry.c
index be0bfaa1dbe38d1b80d02508e91afb97b77fa1a1..80d2d9bdb3e35d870b9795f7568a6fe51bd0bd6a 100644 (file)
--- a/server/mpm/winnt/registry.c
+++ b/server/mpm/winnt/registry.c
@@ -160,9 +160,6 @@ apr_status_t ap_registry_delete_key(const char *key)
                          KEY_WRITE,
                          &hKey);
 
-        if (rv == ERROR_FILE_NOT_FOUND)
-            return APR_ENODIR;
-    
         if (rv != ERROR_SUCCESS)
             return_error(rv);
     }
@@ -181,7 +178,7 @@ apr_status_t ap_registry_delete_key(const char *key)
 
 /* 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 @@ apr_status_t ap_registry_get_value(apr_pool_t *p, const char *key, const char *n
                      KEY_READ,
                      &hKey);
 
-    if (rv == ERROR_FILE_NOT_FOUND)
-        return APR_ENODIR;
-    
     if (rv != ERROR_SUCCESS)
         return_error(rv);
 
@@ -224,9 +218,6 @@ apr_status_t ap_registry_get_value(apr_pool_t *p, const char *key, const char *n
                         *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 @@ apr_status_t ap_registry_get_array(apr_pool_t *p, const char *key, const char *n
                      KEY_READ,
                      &hKey);
 
-    if (rv == ERROR_FILE_NOT_FOUND)
-        return APR_ENODIR;
-    
     if (rv != ERROR_SUCCESS)
         return_error(rv);
 
@@ -264,10 +252,7 @@ apr_status_t ap_registry_get_array(apr_pool_t *p, const char *key, const char *n
                         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 @@ apr_status_t ap_registry_store_value(const char *key, const char *name, const ch
                          0,
                          KEY_WRITE,
                          &hKey);
-
-       if (rv == ERROR_FILE_NOT_FOUND)
-            return APR_ENODIR;
     }
 
     if (rv != ERROR_SUCCESS)
@@ -400,9 +382,6 @@ apr_status_t ap_registry_store_array(apr_pool_t *p, const char *key, const char
                          0,
                          KEY_WRITE,
                          &hKey);
-
-       if (rv == ERROR_FILE_NOT_FOUND)
-            return APR_ENODIR;
     }
 
     if (rv != ERROR_SUCCESS)

diff --git a/server/mpm/winnt/service.c b/server/mpm/winnt/service.c
index be3f5a245c9c1258e1e4a642e61d1816a508ae9f..b491b6e3c171ca10b8c922ad6f0311c29cf6cc22 100644 (file)
--- a/server/mpm/winnt/service.c
+++ b/server/mpm/winnt/service.c
@@ -673,8 +673,15 @@ apr_status_t mpm_merge_service_args(apr_pool_t *p,
     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) {