Permit appending native strings to StringBuf

C strings need to be converted anyhow, but this avoids double conversion for native strings.
rpm-software-management · May 17, 2024 · 556d514 · 556d514
1 parent 749f1ce
commit 556d514
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/build/misc.c b/build/misc.c
@@ -40,7 +40,7 @@ const char * getStringBuf(StringBuf sb)
  return (sb != NULL) ? sb->buf.c_str() : NULL;
 }
 
-void appendStringBufAux(StringBuf sb, const char *s, int nl)
+void appendStringBufAux(StringBuf sb, const std::string & s, int nl)
 {
  sb->buf += s;
  if (nl)

diff --git a/build/rpmbuild_misc.h b/build/rpmbuild_misc.h
@@ -1,6 +1,8 @@
 #ifndef _RPMBUILD_MISC_H
 #define _RPMBUILD_MISC_H
 
+#include <string>
+
 #include <sys/types.h>
 #include <rpm/rpmtypes.h>
 #include <rpm/rpmds.h>
@@ -51,7 +53,7 @@ void stripTrailingBlanksStringBuf(StringBuf sb);
 /** \ingroup rpmstring
  */
 RPM_GNUC_INTERNAL
-void appendStringBufAux(StringBuf sb, const char * s, int nl);
+void appendStringBufAux(StringBuf sb, const std::string & s, int nl);
 
 /** \ingroup rpmbuild
  * Parse an unsigned number.