mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2026-02-13 04:27:44 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "conf: fix load_for_all_cards() - do not merge the card specific contents"

Browse source 
This reverts commit eda76146c5.

Also, revert additional related commits:

  Revert "conf: fix possible memory leak in config_file_open() - error path"
  This reverts commit 2f59398c83.

  Revert "conf: merge card specific contents per file (whole) after parsing"
  This reverts commit a6238053c4.

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Jaroslav Kysela 2025-12-10 12:03:29 +01:00
parent 2f59398c83
commit 2ef8952b46
1 changed files with 12 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/conf.c
View file

@ -4116,27 +4116,14 @@ static int config_filename_filter(const struct dirent64 *dirent)
return 0; return 0;
} }
static int config_file_open(snd_config_t *root, const char *filename, int merge) static int config_file_open(snd_config_t *root, const char *filename)
{ {
snd_input_t *in; snd_input_t *in;
snd_config_t *top;
int err; int err;
err = snd_input_stdio_open(&in, filename, "r"); err = snd_input_stdio_open(&in, filename, "r");
if (err >= 0) { if (err >= 0) {
if (merge) { err = snd_config_load(root, in);
err = snd_config_load(root, in);
} else {
err = snd_config_top(&top);
if (err >= 0) {
err = snd_config_load(top, in);
if (err >= 0) {
err = snd_config_merge(root, top, 1);
if (err < 0)
snd_config_delete(top);
}
}
}
snd_input_close(in); snd_input_close(in);
if (err < 0) if (err < 0)
snd_error(CORE, "%s may be old or corrupted: consider to remove or fix it", filename); snd_error(CORE, "%s may be old or corrupted: consider to remove or fix it", filename);
@ -4146,7 +4133,7 @@ static int config_file_open(snd_config_t *root, const char *filename, int merge)
return err; return err;
} }
static int config_file_load(snd_config_t *root, const char *fn, int errors, int merge) static int config_file_load(snd_config_t *root, const char *fn, int errors)
{ {
struct stat64 st; struct stat64 st;
struct dirent64 **namelist; struct dirent64 **namelist;
@ -4159,7 +4146,7 @@ static int config_file_load(snd_config_t *root, const char *fn, int errors, int
return 1; return 1;
} }
if (!S_ISDIR(st.st_mode)) if (!S_ISDIR(st.st_mode))
return config_file_open(root, fn, merge); return config_file_open(root, fn);
#ifndef DOC_HIDDEN #ifndef DOC_HIDDEN
#if defined(_GNU_SOURCE) && \ #if defined(_GNU_SOURCE) && \
!defined(__NetBSD__) && \ !defined(__NetBSD__) && \
@ -4185,7 +4172,7 @@ static int config_file_load(snd_config_t *root, const char *fn, int errors, int
snprintf(filename, sl, "%s/%s", fn, namelist[j]->d_name); snprintf(filename, sl, "%s/%s", fn, namelist[j]->d_name);
filename[sl-1] = '\0'; filename[sl-1] = '\0';
err = config_file_open(root, filename, merge); err = config_file_open(root, filename);
free(filename); free(filename);
} }
free(namelist[j]); free(namelist[j]);
@ -4197,20 +4184,20 @@ static int config_file_load(snd_config_t *root, const char *fn, int errors, int
return 0; return 0;
} }
static int config_file_load_user(snd_config_t *root, const char *fn, int errors, int merge) static int config_file_load_user(snd_config_t *root, const char *fn, int errors)
{ {
char *fn2; char *fn2;
int err; int err;
err = snd_user_file(fn, &fn2); err = snd_user_file(fn, &fn2);
if (err < 0) if (err < 0)
return config_file_load(root, fn, errors, merge); return config_file_load(root, fn, errors);
err = config_file_load(root, fn2, errors, merge); err = config_file_load(root, fn2, errors);
free(fn2); free(fn2);
return err; return err;
} }
static int config_file_load_user_all(snd_config_t *_root, snd_config_t *_file, int errors, int merge) static int config_file_load_user_all(snd_config_t *_root, snd_config_t *_file, int errors)
{ {
snd_config_t *file = _file, *root = _root, *n; snd_config_t *file = _file, *root = _root, *n;
char *name, *name2, *remain, *rname = NULL; char *name, *name2, *remain, *rname = NULL;
@ -4241,7 +4228,7 @@ static int config_file_load_user_all(snd_config_t *_root, snd_config_t *_file, i
*remain = '\0'; *remain = '\0';
remain += 3; remain += 3;
} }
err = config_file_load_user(root, name2, errors, merge); err = config_file_load_user(root, name2, errors);
if (err < 0) if (err < 0)
goto _err; goto _err;
if (err == 0) /* first hit wins */ if (err == 0) /* first hit wins */
@ -4290,7 +4277,7 @@ int snd_config_hook_load(snd_config_t *root, snd_config_t *config, snd_config_t
{ {
snd_config_t *n; snd_config_t *n;
snd_config_iterator_t i, next; snd_config_iterator_t i, next;
int err, idx = 0, errors = 1, merge = 1, hit; int err, idx = 0, errors = 1, hit;
assert(root && dst); assert(root && dst);
if ((err = snd_config_search(config, "errors", &n)) >= 0) { if ((err = snd_config_search(config, "errors", &n)) >= 0) {
@ -4300,10 +4287,6 @@ int snd_config_hook_load(snd_config_t *root, snd_config_t *config, snd_config_t
return errors; return errors;
} }
} }
/* special case, we know the card number (may be multiple times) */
if (private_data && snd_config_search(private_data, "integer", &n) >= 0) {
merge = 0;
}
if ((err = snd_config_search(config, "files", &n)) < 0) { if ((err = snd_config_search(config, "files", &n)) < 0) {
snd_error(CORE, "Unable to find field files in the pre-load section"); snd_error(CORE, "Unable to find field files in the pre-load section");
return -EINVAL; return -EINVAL;
@ -4316,7 +4299,6 @@ int snd_config_hook_load(snd_config_t *root, snd_config_t *config, snd_config_t
snd_error(CORE, "Invalid type for field filenames"); snd_error(CORE, "Invalid type for field filenames");
goto _err; goto _err;
} }
do { do {
hit = 0; hit = 0;
snd_config_for_each(i, next, n) { snd_config_for_each(i, next, n) {
@ -4330,7 +4312,7 @@ int snd_config_hook_load(snd_config_t *root, snd_config_t *config, snd_config_t
goto _err; goto _err;
} }
if (i == idx) { if (i == idx) {
err = config_file_load_user_all(root, n, errors, merge); err = config_file_load_user_all(root, n, errors);
if (err < 0) if (err < 0)
goto _err; goto _err;
idx++; idx++;