From 269a286192181e8357e5b8ccbb126bdb1e1af6de Mon Sep 17 00:00:00 2001 From: Francois Fleuret Date: Sun, 18 Apr 2010 11:58:55 +0200 Subject: [PATCH] Fixed a bug for level 0 which must now be defined in the configuration file. --- breezed.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/breezed.c b/breezed.c index 498df00..6c4895b 100644 --- a/breezed.c +++ b/breezed.c @@ -155,7 +155,7 @@ void define_temperature_thresholds(char *definition) { exit(EXIT_FAILURE); } - nb_temperature_thresholds = 1; + nb_temperature_thresholds = 0; char *s, *u; @@ -171,10 +171,8 @@ void define_temperature_thresholds(char *definition) { speed_names = safe_malloc(nb_temperature_thresholds * sizeof(char *)); - temperature_thresholds[0] = -1; - s = definition; - int k = 1; + int k = 0; while(s) { s = next_word(token, s, buffer_size); u = token; @@ -197,6 +195,17 @@ void define_temperature_thresholds(char *definition) { } k++; } + + if(nb_temperature_thresholds <= 0) { + fprintf(stderr, "There has to be at least one temperature.\n"); + exit(EXIT_FAILURE); + } + + if(temperature_thresholds[0] > 0) { + fprintf(stderr, "The lowest temperature has to be 0.\n"); + exit(EXIT_FAILURE); + } + } void evaluate_one_configuration_line(char *line, int line_number) { @@ -615,8 +624,10 @@ Written by Francois Fleuret (francois@fleuret.org).\n", nb_rounds_since_last_change = 0; last_level = new_level; if(debug) { - printf("Temperature is %dC setting the fan level to %d.\n", - temperature, new_level); + printf("Temperature is %dC setting the fan level to %d (%s).\n", + temperature, + new_level, + speed_names[new_level]); } } -- 2.20.1