Update.

* mflib/dns.mf4, mflib/safedb.mf4: Remove uses of %var.

2 files changed, 16 insertions, 16 deletions

diff --git a/mflib/dns.mf4 b/mflib/dns.mf4
index 452788c6..7928780e 100644
--- a/mflib/dns.mf4
+++ b/mflib/dns.mf4
@@ -21,9 +21,9 @@ func hostname (string ipstr)
 do
   catch *
   do
-    return %ipstr
+    return ipstr
   done
-  return primitive_hostname(%ipstr)
+  return primitive_hostname(ipstr)
 done
 
 func resolve (string str; string domain)
@@ -34,9 +34,9 @@ do
     return "0"
   done
   if defined(domain)
-    return primitive_resolve (%str, %domain)
+    return primitive_resolve (str, domain)
   else
-    return primitive_resolve (%str)
+    return primitive_resolve (str)
   fi
 done
 
@@ -47,7 +47,7 @@ do
   do
     return 0
   done
-  return primitive_hasmx(%str)
+  return primitive_hasmx(str)
 done
 
 func ismx (string domain, string ipstr)
@@ -57,5 +57,5 @@ do
   do
     return 0
   done
-  return primitive_ismx (%domain, %ipstr)
+  return primitive_ismx (domain, ipstr)
 done
diff --git a/mflib/safedb.mf4 b/mflib/safedb.mf4
index 6d93589b..6603ede1 100644
--- a/mflib/safedb.mf4
+++ b/mflib/safedb.mf4
@@ -24,10 +24,10 @@ func safedbget(string name, string key ; string defval, number null)
 do
   catch e_dbfailure
   do
-    if %safedb_verbose
+    if safedb_verbose
       echo "safedbget: exception $1: $2"
     fi
-    return %defval
+    return defval
   done
   if not defined(null)
     set null 0
@@ -35,14 +35,14 @@ do
       set defval ""
     fi
   fi
-  return dbget(%name, %key, %defval, %null)
+  return dbget(name, key, defval, null)
 done
 
 func safedbput(string name, string key, string value ; number null)
 do
   catch e_dbfailure
   do
-    if %safedb_verbose
+    if safedb_verbose
       echo "safedbput: exception $1: $2"
     fi
     return
@@ -50,7 +50,7 @@ do
   if not defined(null)
     set null 0
   fi
-  dbput(%name, %key, %value, %null)
+  dbput(name, key, value, null)
 done
 
 
@@ -59,10 +59,10 @@ func safedbmap(string name, string key; number defval, number null)
 do
   catch e_dbfailure
   do
-    if %safedb_verbose
+    if safedb_verbose
       echo "safedbmap: exception $1: $2"
     fi
-    return %defval
+    return defval
   done
   if not defined(defval)
     set defval 0
@@ -70,14 +70,14 @@ do
   if not defined(null)
     set null 0
   fi
-  return dbmap(%name, %key, %null)
+  return dbmap(name, key, null)
 done
 
 func safedbdel(string name, string key; number null)
 do
   catch e_dbfailure
   do
-    if %safedb_verbose
+    if safedb_verbose
       echo "safedbdel: exception $1: $2"
     fi
     return
@@ -85,7 +85,7 @@ do
   if not defined(null)
     set null 0
   fi
-  return dbdel(%name, %key, %null)
+  return dbdel(name, key, null)
 done