From 296ac5f517fc3306f88204712eb39bbbc0dfaed3 Mon Sep 17 00:00:00 2001 From: Frodo Looijaard Date: Wed, 1 Dec 1999 21:12:03 +0000 Subject: [PATCH] Oops, corrupted access.c in the last commit... git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@650 7894878c-1315-0410-8ee3-d5d059ff63e0 --- lib/access.c | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/lib/access.c b/lib/access.c index 35bc47bf..4ff57840 100644 --- a/lib/access.c +++ b/lib/access.c @@ -128,12 +128,10 @@ int sensors_chip_name_has_wildcards(sensors_chip_name chip) return 0; } -#include - /* Look up the label which belongs to this chip. Note that chip should not contain wildcard values! *result is newly allocated (free it yourself). This function will return 0 on success, and <0 on failure. */ -int sensors_get_label1(sensors_chip_name name, int feature, char **result) +int sensors_get_label(sensors_chip_name name, int feature, char **result) { const sensors_chip *chip; const sensors_chip_feature *featureptr; @@ -155,17 +153,10 @@ int sensors_get_label1(sensors_chip_name name, int feature, char **result) return 0; } -int sensors_get_label(sensors_chip_name name, int feature, char **result) -{ - int res=sensors_get_label1(name,feature,result); - if (res) fprintf(stderr,"\nerror get_label: %d\n",res); - return res; -} - /* Read the value of a feature of a certain chip. Note that chip should not contain wildcard values! This function will return 0 on success, and <0 on failure. */ -int sensors_get_feature1(sensors_chip_name name, int feature, double *result) +int sensors_get_feature(sensors_chip_name name, int feature, double *result) { const sensors_chip_feature *main_feature; const sensors_chip_feature *alt_feature; @@ -205,13 +196,6 @@ int sensors_get_feature1(sensors_chip_name name, int feature, double *result) return 0; } -int sensors_get_feature(sensors_chip_name name, int feature, double *result) -{ - int res=sensors_get_feature1(name,feature,result); - if (res) fprintf(stderr,"\nerror get_feature: %d\n",res); - return res; -} - /* Set the value of a feature of a certain chip. Note that chip should not contain wildcard values! This function will return 0 on success, and <0 on failure. */