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

conf-parser: Pass parser state in a struct also for parse callbacks.

Browse source 
As suggested by Maarten Bosmans:
http://article.gmane.org/gmane.comp.audio.pulseaudio.general/12079
This commit is contained in:
Tanu Kaskinen 2012-04-13 14:48:26 +03:00 • committed by Tanu Kaskinen
parent 9a1647500c
commit 7449f6d9e5
5 changed files with 422 additions and 583 deletions
Download patch file Download diff file Expand all files Collapse all files

60
src/modules/module-augment-properties.c
View file

@ -78,19 +78,15 @@ static void rule_free(struct rule *r) {
pa_xfree(r);
}
static int parse_properties(
const char *filename,
unsigned line,
const char *section,
const char *lvalue,
const char *rvalue,
void *data,
void *userdata) {
struct rule *r = userdata;
static int parse_properties(pa_config_parser_state *state) {
struct rule *r;
pa_proplist *n;
if (!(n = pa_proplist_from_string(rvalue)))
pa_assert(state);
r = state->userdata;
if (!(n = pa_proplist_from_string(state->rvalue)))
return -1;
if (r->proplist) {
@ -102,20 +98,16 @@ static int parse_properties(
return 0;
}
static int parse_categories(
const char *filename,
unsigned line,
const char *section,
const char *lvalue,
const char *rvalue,
void *data,
void *userdata) {
struct rule *r = userdata;
const char *state = NULL;
static int parse_categories(pa_config_parser_state *state) {
struct rule *r;
const char *split_state = NULL;
char *c;
while ((c = pa_split(rvalue, ";", &state))) {
pa_assert(state);
r = state->userdata;
while ((c = pa_split(state->rvalue, ";", &split_state))) {
if (pa_streq(c, "Game")) {
pa_xfree(r->role);
@ -131,27 +123,13 @@ static int parse_categories(
return 0;
}
static int check_type(
const char *filename,
unsigned line,
const char *section,
const char *lvalue,
const char *rvalue,
void *data,
void *userdata) {
static int check_type(pa_config_parser_state *state) {
pa_assert(state);
return pa_streq(rvalue, "Application") ? 0 : -1;
return pa_streq(state->rvalue, "Application") ? 0 : -1;
}
static int catch_all(
const char *filename,
unsigned line,
const char *section,
const char *lvalue,
const char *rvalue,
void *data,
void *userdata) {
static int catch_all(pa_config_parser_state *state) {
return 0;
}