diff options
| author | avg <avg@FreeBSD.org> | 2010-06-15 07:06:54 +0000 |
|---|---|---|
| committer | avg <avg@FreeBSD.org> | 2010-06-15 07:06:54 +0000 |
| commit | b3f689911f5a6573e4b49b1c7f7d3d8587d4aae5 (patch) | |
| tree | d1532ffb12065cf4ae143bd65a809056ad58d178 /sys/dev/sound | |
| parent | f630934da70d4d34df892850a43110f60f7b2926 (diff) | |
| download | FreeBSD-src-b3f689911f5a6573e4b49b1c7f7d3d8587d4aae5.zip FreeBSD-src-b3f689911f5a6573e4b49b1c7f7d3d8587d4aae5.tar.gz | |
sound/pcm: use non-const string as a value with SYSCTL_STRING
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
Diffstat (limited to 'sys/dev/sound')
| -rw-r--r-- | sys/dev/sound/pcm/feeder_eq.c | 2 | ||||
| -rw-r--r-- | sys/dev/sound/pcm/feeder_rate.c | 2 | ||||
| -rw-r--r-- | sys/dev/sound/pcm/sound.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/sound/pcm/feeder_eq.c b/sys/dev/sound/pcm/feeder_eq.c index 3a51b2c..dee38a3 100644 --- a/sys/dev/sound/pcm/feeder_eq.c +++ b/sys/dev/sound/pcm/feeder_eq.c @@ -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"); diff --git a/sys/dev/sound/pcm/feeder_rate.c b/sys/dev/sound/pcm/feeder_rate.c index 9e8813f..cb30dd9 100644 --- a/sys/dev/sound/pcm/feeder_rate.c +++ b/sys/dev/sound/pcm/feeder_rate.c @@ -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"); diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c index d1b7be5..08a831a 100644 --- a/sys/dev/sound/pcm/sound.c +++ b/sys/dev/sound/pcm/sound.c @@ -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"); |
