svn commit: r484811 - /incubator/mod_ftp/trunk/modules/ftp/mod_ftp.c

[wr...@apache.org]

Author: wrowe
Date: Fri Dec  8 13:52:24 2006
New Revision: 484811

URL: http://svn.apache.org/viewvc?view=rev&rev=484811
Log:
Fix error reporting (arg strings not values) and static some non-exported fn's.

LEAVING the *base assignment warning; that's a flaw.

Modified:
    incubator/mod_ftp/trunk/modules/ftp/mod_ftp.c

Modified: incubator/mod_ftp/trunk/modules/ftp/mod_ftp.c
URL: http://svn.apache.org/viewvc/incubator/mod_ftp/trunk/modules/ftp/mod_ftp.c?view=diff&rev=484811&r1=484810&r2=484811
==============================================================================
--- incubator/mod_ftp/trunk/modules/ftp/mod_ftp.c (original)
+++ incubator/mod_ftp/trunk/modules/ftp/mod_ftp.c Fri Dec  8 13:52:24 2006
@@ -178,7 +178,7 @@
     return fsc;
 }
 
-void *merge_ftp_server_config(apr_pool_t *p, void *basev, void *addv)
+static void *merge_ftp_server_config(apr_pool_t *p, void *basev, void *addv)
 {
     ftp_server_config *base = (ftp_server_config *)basev;
     ftp_server_config *add  = (ftp_server_config *)addv;
@@ -247,7 +247,7 @@
     return conf;
 }
 
-void *merge_ftp_dir_config(apr_pool_t *p, void *basev, void *addv)
+static void *merge_ftp_dir_config(apr_pool_t *p, void *basev, void *addv)
 {
     ftp_dir_config *base = (ftp_dir_config *)basev;
     ftp_dir_config *add  = (ftp_dir_config *)addv;
@@ -780,7 +780,7 @@
 
     if (fsc->limit_peruser < 0) {
         error_str = apr_psprintf(cmd->pool,
-                                 "%s value must be 0 or greater (%d)",
+                                 "%s value must be 0 or greater (%s)",
                                  cmd->directive->directive, limit);
     }
 
@@ -805,7 +805,7 @@
     
     if (fsc->limit_perip < 0) {
         error_str = apr_psprintf(cmd->pool,
-                                 "%s value must be 0 or greater (%d)",
+                                 "%s value must be 0 or greater (%s)",
                                  cmd->directive->directive, limit);
     }
     
@@ -830,7 +830,7 @@
 
     if (fsc->limit_perserver < 0) {
         error_str = apr_psprintf(cmd->pool,
-                                 "%s value must be 0 or greater (%d)",
+                                 "%s value must be 0 or greater (%s)",
                                  cmd->directive->directive, limit);
     }