wt/lm-sensors
1
0 Fork 0
mirror of https://github.com/lm-sensors/lm-sensors.git synced 2026-11-02 13:30:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

print_temp_info is only ever called with precision values of 1, so we

Browse Source 
can hard-code this precision for improved performance.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4716 7894878c-1315-0410-8ee3-d5d059ff63e0
This commit is contained in:
Jean Delvare committed 2007-08-26 20:35:26 +00:00
1 parent 2cc20c4487
commit 02e4d6fe83
1 file changed
+17 -21
Download Patch File Download Diff File Expand all files Collapse all files
prog/sensors/chips.c
+17 -21
View File
@@ -40,12 +40,9 @@ static inline float deg_ctof(float cel)
#define SINGLE 4
#define HYSTONLY 5
/* minmax = 0 for limit/hysteresis, 1 for max/min, 2 for max only;
curprec and limitprec are # of digits after decimal point
for the current temp and the limits
note: symbolic constants defined in chips.h */
/* symbolic constants for minmax defined above */
static void print_temp_info(float n_cur, float n_over, float n_hyst,
int minmax, int curprec, int limitprec)
int minmax)
{
/* note: deg_ctof() will preserve HUGEVAL */
if (fahrenheit) {
@@ -54,30 +51,29 @@ static void print_temp_info(float n_cur, float n_over, float n_hyst,
n_hyst = deg_ctof(n_hyst);
}
/* use %* to pass precision as an argument */
if (n_cur != HUGE_VAL)
printf("%+6.*f%s ", curprec, n_cur, degstr);
printf("%+6.1f%s ", n_cur, degstr);
else
printf(" FAULT ");
if (minmax == MINMAX)
printf("(low = %+5.*f%s, high = %+5.*f%s) ",
limitprec, n_hyst, degstr,
limitprec, n_over, degstr);
printf("(low = %+5.1f%s, high = %+5.1f%s) ",
n_hyst, degstr,
n_over, degstr);
else if (minmax == MAXONLY)
printf("(high = %+5.*f%s) ",
limitprec, n_over, degstr);
printf("(high = %+5.1f%s) ",
n_over, degstr);
else if (minmax == CRIT)
printf("(high = %+5.*f%s, crit = %+5.*f%s) ",
limitprec, n_over, degstr,
limitprec, n_hyst, degstr);
printf("(high = %+5.1f%s, crit = %+5.1f%s) ",
n_over, degstr,
n_hyst, degstr);
else if (minmax == HYST)
printf("(high = %+5.*f%s, hyst = %+5.*f%s) ",
limitprec, n_over, degstr,
limitprec, n_hyst, degstr);
printf("(high = %+5.1f%s, hyst = %+5.1f%s) ",
n_over, degstr,
n_hyst, degstr);
else if (minmax == HYSTONLY)
printf("(hyst = %+5.*f%s) ",
limitprec, n_over, degstr);
printf("(hyst = %+5.1f%s) ",
n_over, degstr);
else if (minmax != SINGLE)
printf("Unknown temperature mode!");
}
@@ -241,7 +237,7 @@ static void print_generic_chip_temp(const sensors_chip_name *name,
print_label(label, label_size);
free(label);
print_temp_info(val, max, min, type, 1, 1);
print_temp_info(val, max, min, type);
/* ALARM features */
if ((TEMP_FEATURE(SENSORS_FEATURE_TEMP_ALARM) &&