wt/lm-sensors
1
0 Fork 0
mirror of https://github.com/lm-sensors/lm-sensors.git synced 2026-10-25 12:14:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use strchr() and strrchr() instead of the deprecated index() and rindex().

Browse Source 
Patch from Bernhard Fischer.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@4861 7894878c-1315-0410-8ee3-d5d059ff63e0
This commit is contained in:
Jean Delvare committed 2007-09-23 21:23:12 +00:00
1 parent 7721b59f83
commit 1092d1d731
2 files changed
+8 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

lib/proc.c
+7 -7
View File
@@ -93,16 +93,16 @@ int sensors_read_proc_bus(void)
while (fgets(line,255,f)) {
if (strlen(line) > 0)
line[strlen(line)-1] = '\0';
if (! (border = rindex(line,'\t')))
if (! (border = strrchr(line,'\t')))
goto ERROR;
/* Skip algorithm name */
*border='\0';
if (! (border = rindex(line,'\t')))
if (! (border = strrchr(line,'\t')))
goto ERROR;
if (! (entry.adapter = strdup(border + 1)))
goto FAT_ERROR;
*border='\0';
if (! (border = rindex(line,'\t')))
if (! (border = strrchr(line,'\t')))
goto ERROR;
*border='\0';
if (strncmp(line,"i2c-",4))
@@ -155,8 +155,8 @@ int sensors_read_proc(sensors_chip_name name, int feature, double *value)
strcpy(n, name.busname);
strcat(n, "/");
strcpy(altn, n);
/* use rindex to append sysname to n */
getsysname(the_feature, rindex(n, '\0'), &mag, rindex(altn, '\0'));
/* use strrchr to append sysname to n */
getsysname(the_feature, strrchr(n, '\0'), &mag, strrchr(altn, '\0'));
if ((f = fopen(n, "r")) != NULL
|| (f = fopen(altn, "r")) != NULL) {
int res = fscanf(f, "%lf", value);
@@ -198,8 +198,8 @@ int sensors_write_proc(sensors_chip_name name, int feature, double value)
strcpy(n, name.busname);
strcat(n, "/");
strcpy(altn, n);
/* use rindex to append sysname to n */
getsysname(the_feature, rindex(n, '\0'), &mag, rindex(altn, '\0'));
/* use strrchr to append sysname to n */
getsysname(the_feature, strrchr(n, '\0'), &mag, strrchr(altn, '\0'));
if ((f = fopen(n, "w")) != NULL
|| (f = fopen(altn, "w")) != NULL) {
for (; mag > 0; mag --)
prog/dump/i2cbusses.c
+1 -1
View File
@@ -185,7 +185,7 @@ found:
fprintf(stderr, "%s: read error\n", n);
continue;
}
if((border = index(x, '\n')) != NULL)
if((border = strchr(x, '\n')) != NULL)
*border = 0;
if(count++ == 0 && !procfmt)
fprintf(stderr," Installed I2C busses:\n");