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
@@ -45,3 +45,3 @@
 #include "filenames.h"
-#include "mu_dbm.h"
+#include "mf-dbm.h"
 #include "builtin.h"
@@ -306,5 +306,5 @@ option_relay(char *opt, void **pval, char *newval)
 
-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 },
@@ -550,3 +550,3 @@ parse_opt(int key, char *arg, struct argp_state *state)
 	case 'p':
-		pm_optcache_set_option("port", arg);
+		mf_optcache_set_option("port", arg);
 		break;
@@ -606,3 +606,3 @@ parse_opt(int key, char *arg, struct argp_state *state)
 	case OPTION_DOMAIN_FILE:
-		pm_optcache_set_option("relay", arg);
+		mf_optcache_set_option("relay", arg);
 		break;
@@ -651,3 +651,3 @@ 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;
@@ -665,3 +665,3 @@ parse_opt(int key, char *arg, struct argp_state *state)
 	case OPTION_STACK_TRACE:
-		pm_optcache_set_option("stack-trace", "yes");
+		mf_optcache_set_option("stack-trace", "yes");
 		break;
@@ -669,3 +669,3 @@ parse_opt(int key, char *arg, struct argp_state *state)
 	case OPTION_TIMEOUT:
-		pm_optcache_set_option("timeout", arg);
+		mf_optcache_set_option("timeout", arg);
 		break;
@@ -1146,3 +1146,3 @@ provide_default_milter_server()
 			       DEFAULT_SOCKET);
-		pm_srvcfg_add("milter", DEFAULT_SOCKET);
+		mf_srvcfg_add("milter", DEFAULT_SOCKET);
 	}
@@ -1165,3 +1165,3 @@ provide_default_callout_server()
 		ensure_initialized_variable("callout_server_url", &val); 
-		pm_srvcfg_add("callout", val.v.literal->text);
+		mf_srvcfg_add("callout", val.v.literal->text);
 	}
@@ -1179,3 +1179,3 @@ 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)
 {
@@ -1224,3 +1224,3 @@ main(int argc, char **argv)
 	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);
@@ -1230,3 +1230,3 @@ main(int argc, char **argv)
 	srvman_init();
-	pm_srvcfg_init(N_("(milter | server)"));
+	mf_srvcfg_init(N_("(milter | server)"));
 	
@@ -1284,3 +1284,3 @@ main(int argc, char **argv)
 	}
-	pm_srvcfg_flush();
+	mf_srvcfg_flush();
 
@@ -1344,4 +1344,4 @@ main(int argc, char **argv)
 
-	pm_namefixup_run(mailfromd_state_dir);
-	pm_namefixup_free();
+	mf_namefixup_run(mailfromd_state_dir);
+	mf_namefixup_free();