Changeset 1266 for trunk/pdns/pdns/backends/bind/zone2sql.cc

Timestamp:

11/15/08 20:24:30 (22 months ago)

Author:

ahu

Message:

arg() -> ::arg(), plus improve error message somewhat

Files:

• trunk/pdns/pdns/backends/bind/zone2sql.cc (modified) (10 diffs)

trunk/pdns/pdns/backends/bind/zone2sql.cc

@@ -86 +86 @@
       cerr<<"Second SOA in zone, raised domain_id"<<endl;
       if(mode==POSTGRES || mode==ORACLE) {
-        if(g_intransaction && arg().mustDo("transactions")) {
+        if(g_intransaction && ::arg().mustDo("transactions")) {
           cout<<"COMMIT WORK;"<<endl;
         }
-        if(arg().mustDo("transactions")) {
+        if(::arg().mustDo("transactions")) {
           if(mode==POSTGRES)
             cout<<"BEGIN TRANSACTION;"<<endl;
@@ -173 +173 @@
 #endif
     lastsoa_qname=" ";
-    arg().setSwitch("mysql","Output in format suitable for mysqlbackend")="yes";
-    arg().setCmd("gpgsql","Output in format suitable for default gpgsqlbackend");
-    arg().setCmd("gmysql","Output in format suitable for default gmysqlbackend");
-    arg().setCmd("oracle","Output in format suitable for the oraclebackend");
-    arg().setCmd("bare","Output in a bare format, suitable for further parsing");
-    arg().setSwitch("verbose","Verbose comments on operation")="no";
-    arg().setSwitch("slave","Keep BIND slaves as slaves")="no";
-    arg().setSwitch("transactions","If target SQL supports it, use transactions")="no";
-    arg().setSwitch("on-error-resume-next","Continue after errors")="no";
-    arg().set("start-id","Value of first domain-id")="0";
-    arg().set("zone","Zonefile with $ORIGIN to parse")="";
-    arg().set("zone-name","Specify an $ORIGIN in case it is not present")="";
-    arg().set("named-conf","Bind 8/9 named.conf to parse")="";
-    arg().set("soa-minimum-ttl","Do not change")="0";
-    arg().set("soa-refresh-default","Do not change")="0";
-    arg().set("soa-retry-default","Do not change")="0";
-    arg().set("soa-expire-default","Do not change")="0";
-
-    arg().setCmd("help","Provide a helpful message");
+    ::arg().setSwitch("mysql","Output in format suitable for mysqlbackend")="yes";
+    ::arg().setCmd("gpgsql","Output in format suitable for default gpgsqlbackend");
+    ::arg().setCmd("gmysql","Output in format suitable for default gmysqlbackend");
+    ::arg().setCmd("oracle","Output in format suitable for the oraclebackend");
+    ::arg().setCmd("bare","Output in a bare format, suitable for further parsing");
+    ::arg().setSwitch("verbose","Verbose comments on operation")="no";
+    ::arg().setSwitch("slave","Keep BIND slaves as slaves")="no";
+    ::arg().setSwitch("transactions","If target SQL supports it, use transactions")="no";
+    ::arg().setSwitch("on-error-resume-next","Continue after errors")="no";
+    ::arg().set("start-id","Value of first domain-id")="0";
+    ::arg().set("zone","Zonefile with $ORIGIN to parse")="";
+    ::arg().set("zone-name","Specify an $ORIGIN in case it is not present")="";
+    ::arg().set("named-conf","Bind 8/9 named.conf to parse")="";
+    ::arg().set("soa-minimum-ttl","Do not change")="0";
+    ::arg().set("soa-refresh-default","Do not change")="0";
+    ::arg().set("soa-retry-default","Do not change")="0";
+    ::arg().set("soa-expire-default","Do not change")="0";
+
+    ::arg().setCmd("help","Provide a helpful message");
 
     S.declare("logmessages");
@@ -198 +198 @@
     string zonefile="";
 
-    arg().parse(argc, argv);
+    ::arg().parse(argc, argv);
   
-    if(argc<2 || arg().mustDo("help")) {
+    if(argc<2 || ::arg().mustDo("help")) {
       cerr<<"syntax:"<<endl<<endl;
-      cerr<<arg().helpstring()<<endl;
+      cerr<<::arg().helpstring()<<endl;
       exit(1);
     }
   
-    if(arg().mustDo("mysql")) 
+    if(::arg().mustDo("mysql")) 
       mode=MYSQL;
-    if(arg().mustDo("gpgsql") || arg().mustDo("gmysql"))
+    if(::arg().mustDo("gpgsql") || ::arg().mustDo("gmysql"))
       mode=POSTGRES;
-    if(arg().mustDo("bare"))
+    if(::arg().mustDo("bare"))
       mode=BARE;
-    if(arg().mustDo("oracle")) {
+    if(::arg().mustDo("oracle")) {
       mode=ORACLE;
-      if(!arg().mustDo("transactions"))
+      if(!::arg().mustDo("transactions"))
         cout<<"set autocommit on;"<<endl;
     }
 
 
-    dirty_hack_num=arg().asNum("start-id");
-    namedfile=arg()["named-conf"];
-    zonefile=arg()["zone"];
+    dirty_hack_num=::arg().asNum("start-id");
+    namedfile=::arg()["named-conf"];
+    zonefile=::arg()["zone"];
 
     int count=0, num_domainsdone=0;
@@ -227 +227 @@
     if(zonefile.empty()) {
       BindParser BP;
-      BP.setVerbose(arg().mustDo("verbose"));
+      BP.setVerbose(::arg().mustDo("verbose"));
       BP.parse(namedfile.empty() ? "./named.conf" : namedfile);
     
@@ -251 +251 @@
           try {
             if(mode==POSTGRES || mode==ORACLE) {
-              if(g_intransaction && arg().mustDo("transactions")) {
+              if(g_intransaction && ::arg().mustDo("transactions")) {
                 cout<<"COMMIT WORK;"<<endl;
               }
-              if(arg().mustDo("transactions")) {
+              if(::arg().mustDo("transactions")) {
                 if(mode==POSTGRES)
                   cout<<"BEGIN TRANSACTION;"<<endl;
@@ -261 +261 @@
 
               if(mode==POSTGRES) {
-                if(arg().mustDo("slave")) {
+                if(::arg().mustDo("slave")) {
                   if(i->masters.empty())
                     cout<<"insert into domains (name,type) values ("<<sqlstr(i->name)<<",'NATIVE');"<<endl;
@@ -289 +289 @@
           }
           catch(exception &ae) {
-            if(!arg().mustDo("on-error-resume-next"))
+            if(!::arg().mustDo("on-error-resume-next"))
               throw;
             else
@@ -296 +296 @@
 
           catch(AhuException &ae) {
-            if(!arg().mustDo("on-error-resume-next"))
+            if(!::arg().mustDo("on-error-resume-next"))
               throw;
             else
@@ -309 +309 @@
     }
     else {
-      ZoneParserTNG zpt(zonefile, arg()["zone-name"]);
+      ZoneParserTNG zpt(zonefile, ::arg()["zone-name"]);
       DNSResourceRecord rr;
       dirty_hack_num=-1; // trigger first SOA output
@@ -332 +332 @@
   }
   
-  if((mode==POSTGRES || mode==ORACLE) && arg().mustDo("transactions") && g_intransaction)
+  if((mode==POSTGRES || mode==ORACLE) && ::arg().mustDo("transactions") && g_intransaction)
     cout<<"COMMIT WORK;"<<endl;
   return 1;