Skip to contentSkip to conversation

tools lib: Adopt strreplace() from the kernel

tip:perf/core tip-bot for Arnaldo Carvalho de Melo 1 participant 1 message Jul 3, 2019

lore
Share & tools
lore
#0 lore raw
Commit-ID:  2a60689a33a61f000bd90596b1289babcb861cd9
Gitweb:     https://git.kernel.org/tip/2a60689a33a61f000bd90596b1289babcb861cd9
Author:     Arnaldo Carvalho de Melo <[email protected]>
AuthorDate: Wed, 26 Jun 2019 12:24:03 -0300
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Mon, 1 Jul 2019 22:50:40 -0300

tools lib: Adopt strreplace() from the kernel

We'll use it to further reduce the size of tools/perf/util/string.c, replacing the strxfrchar() equivalent function we have there.

---
 tools/include/linux/string.h |  2 ++
 tools/lib/string.c           | 16 ++++++++++++++++
 2 files changed, 18 insertions(+)
tools/include/linux/string.h +2 -0
index e436f8037c87..a76d4df10435 100644
@@ -19,6 +19,8 @@ extern size_t strlcpy(char *dest, const char *src, size_t size);
 
 char *str_error_r(int errnum, char *buf, size_t buflen);
 
+char *strreplace(char *s, char old, char new);
+
 /**
  * strstarts - does @str start with @prefix?
  * @str: string to examine
tools/lib/string.c +16 -0
index 80472e6b3829..f2ae1b87c719 100644
@@ -145,3 +145,19 @@ char *strim(char *s)
 
 	return skip_spaces(s);
 }
+
+/**
+ * strreplace - Replace all occurrences of character in string.
+ * @s: The string to operate on.
+ * @old: The character being replaced.
+ * @new: The character @old is replaced with.
+ *
+ * Returns pointer to the nul byte at the end of @s.
+ */
+char *strreplace(char *s, char old, char new)
+{
+	for (; *s; ++s)
+		if (*s == old)
+			*s = new;
+	return s;
+}