mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-04 13:29:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

replace homegrown endswith() with pa_endswith() from util.h

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@720 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2006-04-16 09:13:41 +00:00
parent 0990d8c796
commit 998affc984
1 changed files with 4 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/modules/module-detect.c
View file

@ -37,6 +37,7 @@
#include <polypcore/modargs.h> #include <polypcore/modargs.h>
#include <polypcore/xmalloc.h> #include <polypcore/xmalloc.h>
#include <polypcore/log.h> #include <polypcore/log.h>
#include <polypcore/util.h>
#include "module-detect-symdef.h" #include "module-detect-symdef.h"
@ -45,20 +46,8 @@ PA_MODULE_DESCRIPTION("Detect available audio hardware and load matching drivers
PA_MODULE_VERSION(PACKAGE_VERSION) PA_MODULE_VERSION(PACKAGE_VERSION)
PA_MODULE_USAGE("just-one=<boolean>") PA_MODULE_USAGE("just-one=<boolean>")
static const char *endswith(const char *haystack, const char *needle) {
size_t l, m;
const char *p;
if ((l = strlen(haystack)) < (m = strlen(needle)))
return NULL;
if (strcmp(p = haystack + l - m, needle))
return NULL;
return p;
}
#ifdef HAVE_ALSA #ifdef HAVE_ALSA
static int detect_alsa(pa_core *c, int just_one) { static int detect_alsa(pa_core *c, int just_one) {
FILE *f; FILE *f;
int n = 0, n_sink = 0, n_source = 0; int n = 0, n_sink = 0, n_source = 0;
@ -81,9 +70,9 @@ static int detect_alsa(pa_core *c, int just_one) {
line[strcspn(line, "\r\n")] = 0; line[strcspn(line, "\r\n")] = 0;
if (endswith(line, "digital audio playback")) if (pa_endswith(line, "digital audio playback"))
is_sink = 1; is_sink = 1;
else if (endswith(line, "digital audio capture")) else if (pa_endswith(line, "digital audio capture"))
is_sink = 0; is_sink = 0;
else else
continue; continue;