mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-10-31 22:25:35 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

conf: snd_config_merge() - substitute non-compound config handles

Browse source 
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Jaroslav Kysela 2021-05-24 10:00:08 +02:00
parent 6a944d1b2a
commit b623b5dfed
1 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/conf.c
View file

@ -2202,24 +2202,28 @@ static int _snd_config_array_merge(snd_config_t *dst, snd_config_t *src, int ind
} }
/** /**
* \brief In-place merge of two compounds * \brief In-place merge of two config handles
* \param dst[out] Compound handle for the merged contents * \param dst[out] Config handle for the merged contents
* \param src[in] Compound handle to merge into dst (may be NULL) * \param src[in] Config handle to merge into dst (may be NULL)
* \param override[in] Override flag * \param override[in] Override flag
* \return Zero if successful, otherwise a negative error code. * \return Zero if successful, otherwise a negative error code.
* *
* This function merges all fields from the source compound to the destination compound. * This function merges all fields from the source compound to the destination compound.
* When the \a override flag is set, the related subtree in \a dst is replaced from \a src. * When the \a override flag is set, the related subtree in \a dst is replaced from \a src.
* *
* When \a override is not set, the child compounds are traversed and merged. The configuration * When \a override is not set, the child compounds are traversed and merged.
* elements other than compounds are always substituted (overwritten) from the \a src tree.
* *
* The src compound is deleted. * The configuration elements other than compounds are always substituted (overwritten)
* from the \a src config handle.
*
* The src handle is deleted.
*
* Note: On error, config handles may be modified.
* *
* \par Errors: * \par Errors:
* <dl> * <dl>
* <dt>-EINVAL<dd>\dst is not a compound * <dt>-EEXIST<dd>identifier already exists (!overwrite)
* <dt>-EINVAL<dd>\src is not a compound * <dt>-ENOMEM<dd>not enough memory
* </dl> * </dl>
*/ */
int snd_config_merge(snd_config_t *dst, snd_config_t *src, int override) int snd_config_merge(snd_config_t *dst, snd_config_t *src, int override)
@ -2232,7 +2236,7 @@ int snd_config_merge(snd_config_t *dst, snd_config_t *src, int override)
if (src == NULL) if (src == NULL)
return 0; return 0;
if (dst->type != SND_CONFIG_TYPE_COMPOUND || src->type != SND_CONFIG_TYPE_COMPOUND) if (dst->type != SND_CONFIG_TYPE_COMPOUND || src->type != SND_CONFIG_TYPE_COMPOUND)
return -EINVAL; return snd_config_substitute(dst, src);
array = snd_config_is_array(dst); array = snd_config_is_array(dst);
if (array && snd_config_is_array(src)) if (array && snd_config_is_array(src))
return _snd_config_array_merge(dst, src, array); return _snd_config_array_merge(dst, src, array);