Make macros::define() take the argument as a C++ string

rpmio/macro.cc

@@ -595,7 +595,7 @@ validName(rpmMacroBuf mb, const char *name, size_t namelen, const char *action)
  * @return		number of consumed characters
  */
 static void
-doDefine(rpmMacroBuf mb, const char * se, int level, int expandbody, size_t *parsed)
+doDefine(rpmMacroBuf mb, const char *se, int level, int expandbody, size_t *parsed)
 {
     const char *start = se;
     const char *s = se;
@@ -1799,15 +1799,15 @@ static void popMacro(rpmMacroContext mc, const std::string & n)
 	mc->tab.erase(entry);
 }
 
-static int defineMacro(rpmMacroContext mc, const char * macro, int level)
+static int defineMacro(rpmMacroContext mc, const std::string macro, int level)
 {
     rpmMacroBuf mb = new rpmMacroBuf_s {};
     int rc;
     size_t parsed = 0;
 
     /* XXX just enough to get by */
     mb->mc = mc;
-    doDefine(mb, macro, level, 0, &parsed);
+    doDefine(mb, macro.c_str(), level, 0, &parsed);
     rc = mb->error;
     delete mb;
     return rc;
@@ -2023,7 +2023,7 @@ void macros::copy(rpm::macros & dest, int level)
     copyMacros(mc, dest.mc, level);
 }
 
-int macros::define(const char *macro, int level)
+int macros::define(const std::string & macro, int level)
 {
     return defineMacro(mc, macro, level);
 }

rpmio/rpmmacro_internal.hh

@@ -57,7 +57,7 @@ public:
     void clear();
     /* Copy all macros from this context to another one */
     void copy(rpm::macros & dest, int level);
-    int define(const char *macro, int level);
+    int define(const std::string & macro, int level);
     void dump(FILE *fp = stderr);
     /* Expand macros to a C++ string, with a return code (rc, string) */
     std::pair<int,std::string> expand(const std::string & src, int flags = 0);