From 8416f31add8ebc08697f24783cdf56c708ecd7b4 Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Sat, 28 Nov 2009 12:26:44 +0000 Subject: [PATCH] Fix a build warning in set_degstr. The prototype of iconv() is stupid but won't change so we have to live with it. git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@5801 7894878c-1315-0410-8ee3-d5d059ff63e0 --- CHANGES | 1 + prog/sensors/main.c | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index 0ad18ce9..01d0b0a5 100644 --- a/CHANGES +++ b/CHANGES @@ -18,6 +18,7 @@ SVN-HEAD - Make functions more robust - Remove unused return value - Make CGI script more XHTML compatible + sensors: Fix iconv-related build warning in set_degstr sensors-detect: Refer to tmp401 driver if TMP411 is detected Clean up the discovery of i2c adapters Report unsupported Access Bus adapters diff --git a/prog/sensors/main.c b/prog/sensors/main.c index 7321a4b4..4d3a1dd3 100644 --- a/prog/sensors/main.c +++ b/prog/sensors/main.c @@ -125,15 +125,16 @@ static void set_degstr(void) /* Size hardcoded for better performance. Don't forget to count the trailing \0! */ size_t deg_latin1_size = 3; - char *deg_latin1_text[2] = { "\260C", "\260F" }; + char deg_latin1_text[2][3] = { "\260C", "\260F" }; + char *deg_latin1_ptr = deg_latin1_text[fahrenheit]; size_t nconv; size_t degstr_size = sizeof(degstr); char *degstr_ptr = degstr; iconv_t cd = iconv_open(nl_langinfo(CODESET), "ISO-8859-1"); if (cd != (iconv_t) -1) { - nconv = iconv(cd, &(deg_latin1_text[fahrenheit]), - °_latin1_size, °str_ptr, °str_size); + nconv = iconv(cd, °_latin1_ptr, °_latin1_size, + °str_ptr, °str_size); iconv_close(cd); if (nconv != (size_t) -1)