Merge lp:~mordred/drizzle/bug667006 into lp:drizzle/7.0

[Monty Taylor]

Makes the plugin-add option a little less brittle.

=== modified file 'drizzled/module/loader.cc'
--- drizzled/module/loader.cc	2010-10-28 16:52:12 +0000
+++ drizzled/module/loader.cc	2010-11-08 19:52:48 +0000
@@ -355,6 +355,26 @@
   return false;
 }
 
+
+inline static void dashes_to_underscores(std::string &name_in,
+                                         char from= '-', char to= '_')
+{
+  for (string::iterator p= name_in.begin();
+       p != name_in.end();
+       ++p)
+  {
+    if (*p == from)
+    {
+      *p= to;
+    }
+  }
+}
+
+inline static void underscores_to_dashes(std::string &name_in)
+{
+  return dashes_to_underscores(name_in, '_', '-');
+}
+
 static void compose_plugin_options(vector<string> &target,
                                    vector<string> options)
 {
@@ -364,6 +384,12 @@
   {
     tokenize(*it, target, ",", true);
   }
+  for (vector<string>::iterator it= target.begin();
+       it != target.end();
+       ++it)
+  {
+    dashes_to_underscores(*it);
+  }
 }
 
 void compose_plugin_add(vector<string> options)
@@ -825,13 +851,7 @@
   varname.push_back('_');
   varname.append(name);
 
-  for (string::iterator p= varname.begin() + 1; p != varname.end(); ++p)
-  {
-    if (*p == '-')
-    {
-      *p= '_';
-    }
-  }
+  dashes_to_underscores(varname);
   return varname;
 }
 
@@ -1422,11 +1442,7 @@
   string name(plugin_name);
   transform(name.begin(), name.end(), name.begin(), ::tolower);
 
-  for (string::iterator iter= name.begin(); iter != name.end(); ++iter)
-  {
-    if (*iter == '_')
-      *iter= '-';
-  }
+  underscores_to_dashes(name);
 
   /*
     Two passes as the 2nd pass will take pointer addresses for use
@@ -1691,13 +1707,7 @@
         vname.push_back('-');
         vname.append(o->name);
         transform(vname.begin(), vname.end(), vname.begin(), ::tolower);
-        string::iterator p= vname.begin();      
-        while  (p != vname.end())
-        {
-          if (*p == '-')
-            *p= '_';
-          ++p;
-        }
+        dashes_to_underscores(vname);
 
         v= new sys_var_pluginvar(vname, o);
       }

=== modified file 'plugin/utility_dictionary/tests/t/master.opt'
--- plugin/utility_dictionary/tests/t/master.opt	2010-09-30 03:36:05 +0000
+++ plugin/utility_dictionary/tests/t/master.opt	2010-11-08 19:52:48 +0000
@@ -1,1 +1,1 @@
---plugin-add=utility_dictionary
+--plugin-add=utility-dictionary