From 3bccde0087375596142859f04ffe45806a356eec Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Wed, 23 Oct 2002 17:49:34 +0000 Subject: [PATCH] Removed clear() functions --- include/pcm.h | 4 ---- src/pcm/pcm.c | 42 +----------------------------------------- 2 files changed, 1 insertion(+), 45 deletions(-) diff --git a/include/pcm.h b/include/pcm.h index 8a73de59..291611c2 100644 --- a/include/pcm.h +++ b/include/pcm.h @@ -436,7 +436,6 @@ size_t snd_pcm_info_sizeof(void); #define snd_pcm_info_alloca(ptr) do { assert(ptr); *ptr = (snd_pcm_info_t *) alloca(snd_pcm_info_sizeof()); memset(*ptr, 0, snd_pcm_info_sizeof()); } while (0) int snd_pcm_info_malloc(snd_pcm_info_t **ptr); void snd_pcm_info_free(snd_pcm_info_t *obj); -void snd_pcm_info_clear(snd_pcm_info_t *obj); void snd_pcm_info_copy(snd_pcm_info_t *dst, const snd_pcm_info_t *src); unsigned int snd_pcm_info_get_device(const snd_pcm_info_t *obj); unsigned int snd_pcm_info_get_subdevice(const snd_pcm_info_t *obj); @@ -515,7 +514,6 @@ size_t snd_pcm_hw_params_sizeof(void); #define snd_pcm_hw_params_alloca(ptr) do { assert(ptr); *ptr = (snd_pcm_hw_params_t *) alloca(snd_pcm_hw_params_sizeof()); memset(*ptr, 0, snd_pcm_hw_params_sizeof()); } while (0) int snd_pcm_hw_params_malloc(snd_pcm_hw_params_t **ptr); void snd_pcm_hw_params_free(snd_pcm_hw_params_t *obj); -void snd_pcm_hw_params_clear(snd_pcm_hw_params_t *obj); void snd_pcm_hw_params_copy(snd_pcm_hw_params_t *dst, const snd_pcm_hw_params_t *src); #ifndef ALSA_LIBRARY_BUILD @@ -789,7 +787,6 @@ size_t snd_pcm_sw_params_sizeof(void); #define snd_pcm_sw_params_alloca(ptr) do { assert(ptr); *ptr = (snd_pcm_sw_params_t *) alloca(snd_pcm_sw_params_sizeof()); memset(*ptr, 0, snd_pcm_sw_params_sizeof()); } while (0) int snd_pcm_sw_params_malloc(snd_pcm_sw_params_t **ptr); void snd_pcm_sw_params_free(snd_pcm_sw_params_t *obj); -void snd_pcm_sw_params_clear(snd_pcm_sw_params_t *obj); void snd_pcm_sw_params_copy(snd_pcm_sw_params_t *dst, const snd_pcm_sw_params_t *src); #ifndef ALSA_LIBRARY_BUILD @@ -926,7 +923,6 @@ size_t snd_pcm_status_sizeof(void); #define snd_pcm_status_alloca(ptr) do { assert(ptr); *ptr = (snd_pcm_status_t *) alloca(snd_pcm_status_sizeof()); memset(*ptr, 0, snd_pcm_status_sizeof()); } while (0) int snd_pcm_status_malloc(snd_pcm_status_t **ptr); void snd_pcm_status_free(snd_pcm_status_t *obj); -void snd_pcm_status_clear(snd_pcm_status_t *obj); void snd_pcm_status_copy(snd_pcm_status_t *dst, const snd_pcm_status_t *src); snd_pcm_state_t snd_pcm_status_get_state(const snd_pcm_status_t *obj); void snd_pcm_status_get_trigger_tstamp(const snd_pcm_status_t *obj, snd_timestamp_t *ptr); diff --git a/src/pcm/pcm.c b/src/pcm/pcm.c index ed55a8f3..c08469fc 100644 --- a/src/pcm/pcm.c +++ b/src/pcm/pcm.c @@ -746,7 +746,7 @@ int snd_pcm_hw_params_current(snd_pcm_t *pcm, snd_pcm_hw_params_t *params) assert(pcm && params); if (!pcm->setup) return -EBADFD; - snd_pcm_hw_params_clear(params); + memset(params, 0, snd_pcm_hw_params_sizeof()); snd_mask_copy(¶ms->masks[SND_PCM_HW_PARAM_ACCESS], (snd_mask_t *)&pcm->access); snd_mask_copy(¶ms->masks[SND_PCM_HW_PARAM_FORMAT], (snd_mask_t *)&pcm->format); snd_mask_copy(¶ms->masks[SND_PCM_HW_PARAM_SUBFORMAT], (snd_mask_t *)&pcm->subformat); @@ -2826,16 +2826,6 @@ void snd_pcm_hw_params_free(snd_pcm_hw_params_t *obj) free(obj); } -/** - * \brief clear snd_pcm_hw_params_t structure - * \param obj pointer to structure - */ -void snd_pcm_hw_params_clear(snd_pcm_hw_params_t *obj) -{ - assert(obj); - memset(obj, 0, snd_pcm_hw_params_sizeof()); -} - /** * \brief copy one #snd_pcm_hw_params_t to another * \param dst pointer to destination @@ -4970,16 +4960,6 @@ void snd_pcm_sw_params_free(snd_pcm_sw_params_t *obj) free(obj); } -/** - * \brief clear snd_pcm_sw_params_t structure - * \param obj pointer to structure - */ -void snd_pcm_sw_params_clear(snd_pcm_sw_params_t *obj) -{ - assert(obj); - memset(obj, 0, snd_pcm_sw_params_sizeof()); -} - /** * \brief copy one #snd_pcm_sw_params_t to another * \param dst pointer to destination @@ -5457,16 +5437,6 @@ void snd_pcm_status_free(snd_pcm_status_t *obj) free(obj); } -/** - * \brief clear snd_pcm_status_t structure - * \param obj pointer to structure - */ -void snd_pcm_status_clear(snd_pcm_status_t *obj) -{ - assert(obj); - memset(obj, 0, snd_pcm_status_sizeof()); -} - /** * \brief copy one #snd_pcm_status_t to another * \param dst pointer to destination @@ -5586,16 +5556,6 @@ void snd_pcm_info_free(snd_pcm_info_t *obj) free(obj); } -/** - * \brief clear snd_pcm_info_t structure - * \param obj pointer to structure - */ -void snd_pcm_info_clear(snd_pcm_info_t *obj) -{ - assert(obj); - memset(obj, 0, snd_pcm_info_sizeof()); -} - /** * \brief copy one #snd_pcm_info_t to another * \param dst pointer to destination -- 2.47.1