d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sound/pcm: use non-const string as a value with SYSCTL_STRING

Browse Source 
Although the sysctls are marked with CTLFLAG_RD and the values will stay
immutable, current sysctl implementation stores value pointer in
void* type, which means that const qualifier is discarded anyway
and some newer compilers complaint about that.
We can't use de-const trick in sysctl implementation, because in that
case we could miss an opposite situation where a const value is used
with CTLFLAG_RW sysctl.

Complaint from:	gcc 4.4, clang
MFC after:	2 weeks
This commit is contained in:
Andriy Gapon 2010-06-15 07:06:54 +00:00
parent 09071d46ab
commit a9bdb5d3ad
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/dev/sound/pcm/feeder_eq.c
View File

@ -93,7 +93,7 @@ SND_DECLARE_FILE("$FreeBSD$");
static int feeder_eq_exact_rate = 0;
#ifdef _KERNEL
static const char feeder_eq_presets[] = FEEDER_EQ_PRESETS;
static char feeder_eq_presets[] = FEEDER_EQ_PRESETS;
SYSCTL_STRING(_hw_snd, OID_AUTO, feeder_eq_presets, CTLFLAG_RD,
&feeder_eq_presets, 0, "compile-time eq presets");

2
sys/dev/sound/pcm/feeder_rate.c
View File

@ -159,7 +159,7 @@ int feeder_rate_quality = Z_QUALITY_DEFAULT;
static int feeder_rate_polyphase_max = Z_POLYPHASE_MAX;
#ifdef _KERNEL
static const char feeder_rate_presets[] = FEEDER_RATE_PRESETS;
static char feeder_rate_presets[] = FEEDER_RATE_PRESETS;
SYSCTL_STRING(_hw_snd, OID_AUTO, feeder_rate_presets, CTLFLAG_RD,
&feeder_rate_presets, 0, "compile-time rate presets");

2
sys/dev/sound/pcm/sound.c
View File

@ -68,7 +68,7 @@ SYSCTL_NODE(_hw, OID_AUTO, snd, CTLFLAG_RD, 0, "Sound driver");
* XXX I've had enough with people not telling proper version/arch
* while reporting problems, not after 387397913213th questions/requests.
*/
static const char snd_driver_version[] =
static char snd_driver_version[] =
__XSTRING(SND_DRV_VERSION)"/"MACHINE_ARCH;
SYSCTL_STRING(_hw_snd, OID_AUTO, version, CTLFLAG_RD, &snd_driver_version,
0, "driver version/arch");