diff --git a/CHANGES b/CHANGES index 899237c8..3d9cdc3c 100644 --- a/CHANGES +++ b/CHANGES @@ -17,6 +17,7 @@ SVN HEAD Drop all the chip-specific support Fix a memory leak on error Speed up sensors_get_ignored() a bit + No longer export sensors_chip_name_has_wildcards() Makefile: Drop the package and version targets Man page sensors.conf.5: Update the chip statement section Programs doc/*: Delete, obsolete diff --git a/lib/access.c b/lib/access.c index d9f7360b..0c3c0cdb 100644 --- a/lib/access.c +++ b/lib/access.c @@ -132,7 +132,7 @@ sensors_lookup_feature_name(const sensors_chip_name *chip, const char *feature) /* Check whether the chip name is an 'absolute' name, which can only match one chip, or whether it has wildcards. Returns 0 if it is absolute, 1 if there are wildcards. */ -int sensors_chip_name_has_wildcards(sensors_chip_name chip) +static int sensors_chip_name_has_wildcards(sensors_chip_name chip) { if ((chip.prefix == SENSORS_CHIP_NAME_PREFIX_ANY) || (chip.bus == SENSORS_CHIP_NAME_BUS_ANY) || diff --git a/lib/libsensors.3 b/lib/libsensors.3 index 6b29e064..26a12545 100644 --- a/lib/libsensors.3 +++ b/lib/libsensors.3 @@ -37,7 +37,6 @@ libsensors \- publicly accessible functions provided by the sensors library \fBsensors_chip_name *res);\fP .B int sensors_match_chip(sensors_chip_name chip1, \fBsensors_chip_name chip2);\fP -.B int sensors_chip_name_has_wildcards(sensors_chip_name chip); .B const char *sensors_get_adapter_name(int bus_nr); .B int sensors_get_label(sensors_chip_name name, int feature, \fBchar **result);\fP @@ -72,11 +71,6 @@ Parse a chip name to the internal representation. Return 0 on succes, <0 on erro .br Compare two chips name descriptions, to see whether they could match. Return 0 if it does not match, return 1 if it does match. -\fBint sensors_chip_name_has_wildcards - (sensors_chip_name chip);\fP -.br -Check whether the chip name is an 'absolute' name, which can only match one chip, or whether it has wildcards. Returns 0 if it is absolute, 1 if there are wildcards. - .B const char *sensors_get_adapter_name(int bus_nr); .br This function returns the adapter name of a bus number, as used within the diff --git a/lib/sensors.h b/lib/sensors.h index 01e86909..10b893c2 100644 --- a/lib/sensors.h +++ b/lib/sensors.h @@ -66,11 +66,6 @@ extern int sensors_parse_chip_name(const char *orig_name, extern int sensors_match_chip(sensors_chip_name chip1, sensors_chip_name chip2); -/* Check whether the chip name is an 'absolute' name, which can only match - one chip, or whether it has wildcards. Returns 0 if it is absolute, 1 - if there are wildcards. */ -extern int sensors_chip_name_has_wildcards(sensors_chip_name chip); - /* This function returns the adapter name of a bus number, as used within the sensors_chip_name structure. If it could not be found, it returns NULL */