Fix namespace (pm -> mf)

1 files changed, 17 insertions, 17 deletions

diff --git a/src/main.c b/src/main.c
index 32d91a56..ba36fd92 100644
--- a/src/main.c
+++ b/src/main.c
@@ -43,7 +43,7 @@
 #include "inttostr.h"
 #include "srvcfg.h"
 #include "filenames.h"
-#include "mu_dbm.h"
+#include "mf-dbm.h"
 #include "builtin.h"
 #include "prog.h"
 
@@ -304,9 +304,9 @@ option_relay(char *opt, void **pval, char *newval)
         return 0;
 }
 
-struct pm_option_cache option_cache[] = {
-        { "stack-trace", NULL, pm_option_boolean, set_stack_trace },
-        { "milter-timeout", NULL, pm_option_time, set_milter_timeout },
+struct mf_option_cache option_cache[] = {
+        { "stack-trace", NULL, mf_option_boolean, set_stack_trace },
+        { "milter-timeout", NULL, mf_option_time, set_milter_timeout },
         { "relay", NULL, option_relay, set_relay },
         { NULL }
 };
@@ -548,7 +548,7 @@ parse_opt(int key, char *arg, struct argp_state *state)
                 break;
                 
         case 'p':
-                pm_optcache_set_option("port", arg);
+                mf_optcache_set_option("port", arg);
                 break;
                 
         case OPTION_RUN:
@@ -604,7 +604,7 @@ parse_opt(int key, char *arg, struct argp_state *state)
                 break;
                 
         case OPTION_DOMAIN_FILE:
-                pm_optcache_set_option("relay", arg);
+                mf_optcache_set_option("relay", arg);
                 break;
 
         case OPTION_DUMP_CODE:
@@ -649,7 +649,7 @@ parse_opt(int key, char *arg, struct argp_state *state)
         }
                 
         case OPTION_MILTER_TIMEOUT:
-                pm_optcache_set_option("milter-timeout", arg);
+                mf_optcache_set_option("milter-timeout", arg);
                 break;
 
         case OPTION_MTASIM:
@@ -663,11 +663,11 @@ parse_opt(int key, char *arg, struct argp_state *state)
                 break;
 
         case OPTION_STACK_TRACE:
-                pm_optcache_set_option("stack-trace", "yes");
+                mf_optcache_set_option("stack-trace", "yes");
                 break;
 
         case OPTION_TIMEOUT:
-                pm_optcache_set_option("timeout", arg);
+                mf_optcache_set_option("timeout", arg);
                 break;
 
         case OPTION_TRACE:
@@ -1144,7 +1144,7 @@ provide_default_milter_server()
                 mu_diag_output(MU_DIAG_WARNING,
                                _("no servers defined; will listen on %s"),
                                DEFAULT_SOCKET);
-                pm_srvcfg_add("milter", DEFAULT_SOCKET);
+                mf_srvcfg_add("milter", DEFAULT_SOCKET);
         }
 }       
 
@@ -1163,7 +1163,7 @@ provide_default_callout_server()
                 val.v.literal = string_alloc(DEFAULT_CALLOUT_SOCKET,
                                              sizeof(DEFAULT_CALLOUT_SOCKET)-1);
                 ensure_initialized_variable("callout_server_url", &val); 
-                pm_srvcfg_add("callout", val.v.literal->text);
+                mf_srvcfg_add("callout", val.v.literal->text);
         }
 }
 
@@ -1177,7 +1177,7 @@ static char *modnames[] = {
 
 
 int
-pm_server_function(const char *key, mfd_server_func_t *pret)
+mf_server_function(const char *key, mfd_server_func_t *pret)
 {
         if (!key || strcmp(key, "default") == 0 || strcmp(key, "milter") == 0)
                 *pret = milter_session_server;
@@ -1222,13 +1222,13 @@ main(int argc, char **argv)
         db_format_setup();
         include_path_setup();
         pragma_setup();
-        pm_optcache_add(option_cache, 0, PM_OCF_NULL|PM_OCF_STATIC);
+        mf_optcache_add(option_cache, 0, MF_OCF_NULL|MF_OCF_STATIC);
         mf_server_save_cmdline(argc, argv);
 
         mu_acl_cfg_init();
         database_cfg_init();
         srvman_init();
-        pm_srvcfg_init(N_("(milter | server)"));
+        mf_srvcfg_init(N_("(milter | server)"));
         
         mu_argp_init(program_version, "<" PACKAGE_BUGREPORT ">");
         mu_app_rcfile = DEFAULT_CONFIG_FILE;
@@ -1282,7 +1282,7 @@ main(int argc, char **argv)
                 if (parse_program(script_file, script_ydebug))
                         exit(EX_CONFIG);
         }
-        pm_srvcfg_flush();
+        mf_srvcfg_flush();
 
         fixup_create_script();
         
@@ -1342,8 +1342,8 @@ main(int argc, char **argv)
         free_string_space();
         free_parser_data();
 
-        pm_namefixup_run(mailfromd_state_dir);
-        pm_namefixup_free();
+        mf_namefixup_run(mailfromd_state_dir);
+        mf_namefixup_free();
         
         switch (mode) {
         case MAILFROMD_DAEMON: