078b914c2d
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/pulseaudio?expand=0&rev=a41c182c62abf2480b0be2b95493c211
79 lines
2.1 KiB
Diff
79 lines
2.1 KiB
Diff
From 195069c1815a1483b2c44f8cc72e2dd25e9b8fb1 Mon Sep 17 00:00:00 2001
|
|
From: Lennart Poettering <lennart@poettering.net>
|
|
Date: Sun, 21 Feb 2010 21:59:53 +0100
|
|
Subject: [PATCH] core-util: introduce generic function pa_strip()
|
|
|
|
---
|
|
src/pulsecore/core-util.c | 28 ++++++++++++++++++++++++----
|
|
src/pulsecore/core-util.h | 1 +
|
|
2 files changed, 25 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/src/pulsecore/core-util.c b/src/pulsecore/core-util.c
|
|
index 258e8ee..d6017b9 100644
|
|
--- a/src/pulsecore/core-util.c
|
|
+++ b/src/pulsecore/core-util.c
|
|
@@ -126,6 +126,9 @@
|
|
#define MSG_NOSIGNAL 0
|
|
#endif
|
|
|
|
+#define NEWLINE "\r\n"
|
|
+#define WHITESPACE "\n\r \t"
|
|
+
|
|
static pa_strlist *recorded_env = NULL;
|
|
|
|
#ifdef OS_IS_WIN32
|
|
@@ -830,9 +833,6 @@ char *pa_split(const char *c, const char *delimiter, const char**state) {
|
|
return pa_xstrndup(current, l);
|
|
}
|
|
|
|
-/* What is interpreted as whitespace? */
|
|
-#define WHITESPACE " \t\n"
|
|
-
|
|
/* Split a string into words. Otherwise similar to pa_split(). */
|
|
char *pa_split_spaces(const char *c, const char **state) {
|
|
const char *current = *state ? *state : c;
|
|
@@ -1189,7 +1189,27 @@ int pa_lock_fd(int fd, int b) {
|
|
char* pa_strip_nl(char *s) {
|
|
pa_assert(s);
|
|
|
|
- s[strcspn(s, "\r\n")] = 0;
|
|
+ s[strcspn(s, NEWLINE)] = 0;
|
|
+ return s;
|
|
+}
|
|
+
|
|
+char *pa_strip(char *s) {
|
|
+ char *e, *l = NULL;
|
|
+
|
|
+ /* Drops trailing whitespace. Modifies the string in
|
|
+ * place. Returns pointer to first non-space character */
|
|
+
|
|
+ s += strspn(s, WHITESPACE);
|
|
+
|
|
+ for (e = s; *e; e++)
|
|
+ if (!strchr(WHITESPACE, *e))
|
|
+ l = e;
|
|
+
|
|
+ if (l)
|
|
+ *(l+1) = 0;
|
|
+ else
|
|
+ *s = 0;
|
|
+
|
|
return s;
|
|
}
|
|
|
|
diff --git a/src/pulsecore/core-util.h b/src/pulsecore/core-util.h
|
|
index eba1b40..71be9de 100644
|
|
--- a/src/pulsecore/core-util.h
|
|
+++ b/src/pulsecore/core-util.h
|
|
@@ -102,6 +102,7 @@ char *pa_split(const char *c, const char*delimiters, const char **state);
|
|
char *pa_split_spaces(const char *c, const char **state);
|
|
|
|
char *pa_strip_nl(char *s);
|
|
+char *pa_strip(char *s);
|
|
|
|
const char *pa_sig2str(int sig) PA_GCC_PURE;
|
|
|
|
--
|
|
1.6.0.2
|
|
|