From 8901084a9536a8e085c0e192a03328ecdf135260 Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Thu, 16 Aug 2007 17:49:50 +0000 Subject: [PATCH] Typo and white space cleanps. git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@4679 7894878c-1315-0410-8ee3-d5d059ff63e0 --- lib/data.c | 22 +++++++++++----------- lib/sensors.h | 18 +++++++++--------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/lib/data.c b/lib/data.c index 3954df0b..e84a6da4 100644 --- a/lib/data.c +++ b/lib/data.c @@ -63,7 +63,7 @@ static int sensors_substitute_chip(sensors_chip_name *name,int lineno); be any decimal i2c bus number. '5e' can be any hexadecimal i2c device address, and '10dd' any hexadecimal isa address. - If '*' is used in prefixes, together with dashes, ambigious parses are + If '*' is used in prefixes, together with dashes, ambiguous parses are introduced. In that case, the prefix is kept as small as possible. The 'prefix' part in the result is freshly allocated. All old contents @@ -81,7 +81,7 @@ int sensors_parse_chip_name(const char *orig_name, sensors_chip_name *res) /* Play it safe */ res->busname = NULL; - + if (! name) sensors_fatal_error("sensors_parse_chip_name","Allocating new name"); /* First split name in upto four pieces. */ @@ -89,7 +89,7 @@ int sensors_parse_chip_name(const char *orig_name, sensors_chip_name *res) *part4++ = '\0'; if ((part3 = strrchr(name,'-'))) *part3++ = '\0'; - if ((part2 = strrchr(name,'-'))) + if ((part2 = strrchr(name,'-'))) *part2++ = '\0'; /* No dashes found? */ @@ -99,7 +99,7 @@ int sensors_parse_chip_name(const char *orig_name, sensors_chip_name *res) res->bus = SENSORS_CHIP_NAME_BUS_ANY; res->addr = SENSORS_CHIP_NAME_ADDR_ANY; goto SUCCES; - } else + } else goto ERROR; } @@ -110,7 +110,7 @@ int sensors_parse_chip_name(const char *orig_name, sensors_chip_name *res) if ((strlen(part4) > 4) || (strlen(part4) == 0)) goto ERROR; res->addr = 0; - for (i = 0; ; i++) { + for (i = 0; ; i++) { switch (part4[i]) { case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': @@ -154,7 +154,7 @@ DONE:; if ((strlen(part3) > 3) || (strlen(part3) == 0)) goto ERROR; res->bus = 0; - for (i = 0; ; i++) { + for (i = 0; ; i++) { switch (part3[i]) { case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': @@ -178,11 +178,11 @@ DONE2:; sensors_fatal_error("sensors_parse_chip_name","Allocating new busname"); } else goto ERROR; - + if (!strcmp(name,"*")) res->prefix = SENSORS_CHIP_NAME_PREFIX_ANY; else if (! (res->prefix = strdup(name))) - sensors_fatal_error("sensors_parse_chip_name","Allocating new name"); + sensors_fatal_error("sensors_parse_chip_name", "Allocating name prefix"); goto SUCCES; SUCCES: @@ -210,7 +210,7 @@ int sensors_parse_i2cbus_name(const char *name, int *res) if ((strlen(name) > 3) || (strlen(name) == 0)) return -SENSORS_ERR_BUS_NAME; *res = 0; - for (i = 0; ; i++) { + for (i = 0; ; i++) { switch (name[i]) { case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': @@ -255,13 +255,13 @@ int sensors_substitute_chip(sensors_chip_name *name,int lineno) return 0; } - + int sensors_substitute_busses(void) { int err,i,j,lineno; sensors_chip_name_list *chips; int res=0; - + for(i = 0; i < sensors_config_chips_count; i++) { lineno = sensors_config_chips[i].lineno; chips = &sensors_config_chips[i].chips; diff --git a/lib/sensors.h b/lib/sensors.h index 9eab477a..849db627 100644 --- a/lib/sensors.h +++ b/lib/sensors.h @@ -36,7 +36,7 @@ extern "C" { #endif /* __cplusplus */ -/* A chip name is encoded is in this structure */ +/* A chip name is encoded in this structure */ typedef struct sensors_chip_name { char *prefix; int bus; @@ -44,7 +44,7 @@ typedef struct sensors_chip_name { char *busname; /* if dummy */ } sensors_chip_name; -/* (Re)load the configuration file and the detected chips list. If this +/* (Re)load the configuration file and the detected chips list. If this returns a value unequal to zero, you are in trouble; you can not assume anything will be initialized properly. */ extern int sensors_init(FILE *input); @@ -53,14 +53,14 @@ extern int sensors_init(FILE *input); this, until the next sensors_init() call! */ extern void sensors_cleanup(void); -/* Parse a chip name to the internal representation. Return 0 on succes, <0 +/* Parse a chip name to the internal representation. Return 0 on success, <0 on error. */ extern int sensors_parse_chip_name(const char *orig_name, sensors_chip_name *res); /* Compare two chips name descriptions, to see whether they could match. Return 0 if it does not match, return 1 if it does match. */ -extern int sensors_match_chip(sensors_chip_name chip1, +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 @@ -69,7 +69,7 @@ extern int sensors_match_chip(sensors_chip_name chip1, 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, + as used within the sensors_chip_name structure. If it could not be found, it returns NULL */ extern const char *sensors_get_adapter_name(int bus_nr); @@ -80,7 +80,7 @@ extern const char *sensors_get_algorithm_name(int bus_nr); contain wildcard values! *result is newly allocated (free it yourself). This function will return 0 on success, and <0 on failure. This function takes logical mappings into account. */ -extern int sensors_get_label(sensors_chip_name name, int feature, +extern int sensors_get_label(sensors_chip_name name, int feature, char **result); /* Looks up whether a feature should be ignored. Returns <0 on failure, @@ -110,7 +110,7 @@ extern int sensors_do_all_sets(void); /* This function returns all detected chips, one by one. To start at the beginning of the list, use 0 for nr; NULL is returned if we are - at the end of the list. Do not try to change these chip names, as + at the end of the list. Do not try to change these chip names, as they point to internal structures! Do not use nr for anything else. */ extern const sensors_chip_name *sensors_get_detected_chips(int *nr); @@ -135,7 +135,7 @@ typedef struct sensors_feature_data { int mode; } sensors_feature_data; -/* This returns all features of a specific chip. They are returned in +/* This returns all features of a specific chip. They are returned in bunches: everything with the same mapping is returned just after each other, with the master feature in front (that feature does not map to itself, but has SENSORS_NO_MAPPING as mapping field). nr1 and nr2 are @@ -143,7 +143,7 @@ typedef struct sensors_feature_data { begin of the list. If no more features are found NULL is returned. Do not try to change the returned structure; you will corrupt internal data structures. */ -extern const sensors_feature_data *sensors_get_all_features +extern const sensors_feature_data *sensors_get_all_features (sensors_chip_name name, int *nr1,int *nr2); #ifdef __cplusplus