Rename access with _access or acc

John P. Hartmann reported that the build breaks with -Werror because of
the use of "access".  As a quick fix, all "access" words are replaced
with either _access or acc appropriately for avoiding conflicts.

6 files changed, 30 insertions, 30 deletions

diff --git a/src/asound.h b/src/asound.h
index 8a1bc6f..6ddf860 100644
--- a/src/asound.h
+++ b/src/asound.h
@@ -731,7 +731,7 @@ typedef struct snd_ctl_elem_list {
 typedef struct snd_ctl_elem_info {
 	snd_ctl_elem_id_t id;
 	int type;
-	unsigned int access;
+	unsigned int _access;
 	unsigned int count;
 	pid_t owner;
 	union {
diff --git a/src/control.c b/src/control.c
index ff47a74..0bddd8a 100644
--- a/src/control.c
+++ b/src/control.c
@@ -120,9 +120,9 @@ int snd_ctl_elem_add_integer(snd_ctl_t *ctl, const snd_ctl_elem_id_t *id,
 	memzero_valgrind(&info, sizeof(info));
 	info.id = *id;
 	info.type = SND_CTL_ELEM_TYPE_INTEGER;
-	info.access = SNDRV_CTL_ELEM_ACCESS_READWRITE;
+	info._access = SNDRV_CTL_ELEM_ACCESS_READWRITE;
 #if SALSA_HAS_TLV_SUPPORT
-	info.access |= SNDRV_CTL_ELEM_ACCESS_TLV_READWRITE;
+	info._access |= SNDRV_CTL_ELEM_ACCESS_TLV_READWRITE;
 #endif
 	info.count = count;
 	info.value.integer.min = min;
diff --git a/src/ctl_macros.h b/src/ctl_macros.h
index d690942..737cfd0 100644
--- a/src/ctl_macros.h
+++ b/src/ctl_macros.h
@@ -517,50 +517,50 @@ snd_ctl_elem_type_t snd_ctl_elem_info_get_type(const snd_ctl_elem_info_t *obj)
 __SALSA_EXPORT_FUNC
 int snd_ctl_elem_info_is_readable(const snd_ctl_elem_info_t *obj)
 {
-	return !!(obj->access & SNDRV_CTL_ELEM_ACCESS_READ);
+	return !!(obj->_access & SNDRV_CTL_ELEM_ACCESS_READ);
 }
 
 __SALSA_EXPORT_FUNC
 int snd_ctl_elem_info_is_writable(const snd_ctl_elem_info_t *obj)
 {
-	return !!(obj->access & SNDRV_CTL_ELEM_ACCESS_WRITE);
+	return !!(obj->_access & SNDRV_CTL_ELEM_ACCESS_WRITE);
 }
 
 __SALSA_EXPORT_FUNC
 int snd_ctl_elem_info_is_volatile(const snd_ctl_elem_info_t *obj)
 {
-	return !!(obj->access & SNDRV_CTL_ELEM_ACCESS_VOLATILE);
+	return !!(obj->_access & SNDRV_CTL_ELEM_ACCESS_VOLATILE);
 }
 
 __SALSA_EXPORT_FUNC
 int snd_ctl_elem_info_is_inactive(const snd_ctl_elem_info_t *obj)
 {
-	return !!(obj->access & SNDRV_CTL_ELEM_ACCESS_INACTIVE);
+	return !!(obj->_access & SNDRV_CTL_ELEM_ACCESS_INACTIVE);
 }
 
 __SALSA_EXPORT_FUNC
 int snd_ctl_elem_info_is_locked(const snd_ctl_elem_info_t *obj)
 {
-	return !!(obj->access & SNDRV_CTL_ELEM_ACCESS_LOCK);
+	return !!(obj->_access & SNDRV_CTL_ELEM_ACCESS_LOCK);
 }
 
 __SALSA_EXPORT_FUNC
 int snd_ctl_elem_info_is_owner(const snd_ctl_elem_info_t *obj)
 {
-	return !!(obj->access & SNDRV_CTL_ELEM_ACCESS_OWNER);
+	return !!(obj->_access & SNDRV_CTL_ELEM_ACCESS_OWNER);
 }
 
 __SALSA_EXPORT_FUNC
 int snd_ctl_elem_info_is_user(const snd_ctl_elem_info_t *obj)
 {
-	return !!(obj->access & SNDRV_CTL_ELEM_ACCESS_USER);
+	return !!(obj->_access & SNDRV_CTL_ELEM_ACCESS_USER);
 }
 
 __SALSA_EXPORT_FUNC
 int snd_ctl_elem_info_is_tlv_readable(const snd_ctl_elem_info_t *obj)
 {
 #if SALSA_HAS_TLV_SUPPORT
-	return !!(obj->access & SNDRV_CTL_ELEM_ACCESS_TLV_READ);
+	return !!(obj->_access & SNDRV_CTL_ELEM_ACCESS_TLV_READ);
 #else
 	return 0;
 #endif
@@ -570,7 +570,7 @@ __SALSA_EXPORT_FUNC
 int snd_ctl_elem_info_is_tlv_writable(const snd_ctl_elem_info_t *obj)
 {
 #if SALSA_HAS_TLV_SUPPORT
-	return !!(obj->access & SNDRV_CTL_ELEM_ACCESS_TLV_WRITE);
+	return !!(obj->_access & SNDRV_CTL_ELEM_ACCESS_TLV_WRITE);
 #else
 	return 0;
 #endif
@@ -580,7 +580,7 @@ __SALSA_EXPORT_FUNC
 int snd_ctl_elem_info_is_tlv_commandable(const snd_ctl_elem_info_t *obj)
 {
 #if SALSA_HAS_TLV_SUPPORT
-	return !!(obj->access & SNDRV_CTL_ELEM_ACCESS_TLV_COMMAND);
+	return !!(obj->_access & SNDRV_CTL_ELEM_ACCESS_TLV_COMMAND);
 #else
 	return 0;
 #endif
diff --git a/src/pcm.c b/src/pcm.c
index 27db757..b44e1c4 100644
--- a/src/pcm.c
+++ b/src/pcm.c
@@ -457,7 +457,7 @@ int snd_pcm_dump_hw_setup(snd_pcm_t *pcm, snd_output_t *out)
 	snd_output_printf(out, "  stream       : %s\n",
 			  snd_pcm_stream_name(pcm->stream));
 	snd_output_printf(out, "  access       : %s\n",
-			  snd_pcm_access_name(pcm->access));
+			  snd_pcm_access_name(pcm->_access));
 	snd_output_printf(out, "  format       : %s\n",
 			  snd_pcm_format_name(pcm->format));
 	snd_output_printf(out, "  subformat    : %s\n",
diff --git a/src/pcm_macros.h b/src/pcm_macros.h
index 85ff656..4a7a72b 100644
--- a/src/pcm_macros.h
+++ b/src/pcm_macros.h
@@ -38,7 +38,7 @@ struct _snd_pcm {
 	snd_pcm_hw_params_t hw_params;
 	snd_pcm_sw_params_t sw_params;
 
-	snd_pcm_access_t access;	/* access mode */
+	snd_pcm_access_t _access;	/* access mode */
 	snd_pcm_format_t format;	/* SND_PCM_FORMAT_* */
 	snd_pcm_subformat_t subformat;	/* subformat */
 	unsigned int channels;		/* channels */
@@ -797,46 +797,46 @@ __snd_define_type(snd_pcm_hw_params);
 
 __SALSA_EXPORT_FUNC
 int snd_pcm_hw_params_get_access(const snd_pcm_hw_params_t *params,
-				 snd_pcm_access_t *access)
+				 snd_pcm_access_t *acc)
 {
 	return _snd_pcm_hw_param_get(params, SNDRV_PCM_HW_PARAM_ACCESS,
-				    (unsigned int *)access, NULL);
+				    (unsigned int *)acc, NULL);
 }
 
 __SALSA_EXPORT_FUNC
 int snd_pcm_hw_params_test_access(snd_pcm_t *pcm, snd_pcm_hw_params_t *params,
-				  snd_pcm_access_t access)
+				  snd_pcm_access_t acc)
 {
 	return _snd_pcm_hw_param_test(pcm, params, SNDRV_PCM_HW_PARAM_ACCESS,
-				      access, NULL);
+				      acc, NULL);
 }
 
 __SALSA_EXPORT_FUNC
 int snd_pcm_hw_params_set_access(snd_pcm_t *pcm, snd_pcm_hw_params_t *params,
-				 snd_pcm_access_t access)
+				 snd_pcm_access_t acc)
 {
 	return _snd_pcm_hw_param_set(pcm, params, SNDRV_PCM_HW_PARAM_ACCESS,
-				    access, 0);
+				    acc, 0);
 }
 
 __SALSA_EXPORT_FUNC
 int snd_pcm_hw_params_set_access_first(snd_pcm_t *pcm,
 				       snd_pcm_hw_params_t *params,
-				       snd_pcm_access_t *access)
+				       snd_pcm_access_t *acc)
 {
 	return _snd_pcm_hw_param_set_first(pcm, params,
 					   SNDRV_PCM_HW_PARAM_ACCESS,
-					   (unsigned int *)access, NULL);
+					   (unsigned int *)acc, NULL);
 }
 
 __SALSA_EXPORT_FUNC
 int snd_pcm_hw_params_set_access_last(snd_pcm_t *pcm,
 				      snd_pcm_hw_params_t *params,
-				      snd_pcm_access_t *access)
+				      snd_pcm_access_t *acc)
 {
 	return _snd_pcm_hw_param_set_last(pcm, params,
 					  SNDRV_PCM_HW_PARAM_ACCESS,
-					  (unsigned int *)access, NULL);
+					  (unsigned int *)acc, NULL);
 }
 
 __SALSA_EXPORT_FUNC
@@ -2171,7 +2171,7 @@ snd_pcm_sframes_t snd_pcm_mmap_readn(snd_pcm_t *pcm, void **bufs,
 __SALSA_EXPORT_FUNC __SALSA_NOT_IMPLEMENTED
 int snd_pcm_set_params(snd_pcm_t *pcm,
                        snd_pcm_format_t format,
-                       snd_pcm_access_t access,
+                       snd_pcm_access_t acc,
                        unsigned int channels,
                        unsigned int rate,
                        int soft_resample,
diff --git a/src/pcm_params.c b/src/pcm_params.c
index 84a0b82..0683415 100644
--- a/src/pcm_params.c
+++ b/src/pcm_params.c
@@ -924,7 +924,7 @@ static int _snd_pcm_hw_params(snd_pcm_t *pcm, snd_pcm_hw_params_t *params)
 	pcm->setup = 1;
 	pcm->hw_params = *params;
 	
-	snd_pcm_hw_params_get_access(params, &pcm->access);
+	snd_pcm_hw_params_get_access(params, &pcm->_access);
 	snd_pcm_hw_params_get_format(params, &pcm->format);
 	snd_pcm_hw_params_get_subformat(params, &pcm->subformat);
 	snd_pcm_hw_params_get_channels(params, &pcm->channels);
@@ -940,9 +940,9 @@ static int _snd_pcm_hw_params(snd_pcm_t *pcm, snd_pcm_hw_params_t *params)
 	snd_pcm_sw_params_default(pcm, &sw);
 	snd_pcm_sw_params(pcm, &sw);
 
-	if (pcm->access == SND_PCM_ACCESS_MMAP_INTERLEAVED ||
-	    pcm->access == SND_PCM_ACCESS_MMAP_NONINTERLEAVED ||
-	    pcm->access == SND_PCM_ACCESS_MMAP_COMPLEX) {
+	if (pcm->_access == SND_PCM_ACCESS_MMAP_INTERLEAVED ||
+	    pcm->_access == SND_PCM_ACCESS_MMAP_NONINTERLEAVED ||
+	    pcm->_access == SND_PCM_ACCESS_MMAP_COMPLEX) {
 		err = _snd_pcm_mmap(pcm);
 		if (err < 0) {
 			_snd_pcm_munmap(pcm);