mangavalk/lcdproc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

a few changes to better support gcc 2.95 (paul_c)

Browse Source
This commit is contained in:
marschap
2007-05-28 17:55:59 +00:00
parent 5e5ee21e37
commit 0e6b1253a9
7 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clients/lcdproc/chrono.c
+2 -1
View File
@@ -98,9 +98,10 @@ time_screen(int rep, int display, int *flags_ptr)
tickTime(now, heartbeat);
if (lcd_hgt >= 4) {
machine_get_uptime(&uptime, &idle);
char tmp[40]; // should be large enough
machine_get_uptime(&uptime, &idle);
// display the uptime...
days = (int) uptime / 86400;
hour = ((int) uptime % 86400) / 3600;
clients/lcdproc/iface.c
+7 -3
View File
@@ -239,12 +239,14 @@ initialize_speed_screen(void)
void
format_value (char *buff, double value, char *unit)
{
char *mag;
/* Convert bytes to bits, if necessary */
if (strstr(unit, "b"))
value *= 8;
/* If units are bytes, then divide by 2^10, otherwise by 10^3 */
char *mag = convert_double(&value, (strstr(unit, "B")) ? 1024 : 1000, 1.0f);
mag = convert_double(&value, (strstr(unit, "B")) ? 1024 : 1000, 1.0f);
/* Formatting rules:
* - if original value was < 1000, output decimal value only
@@ -266,10 +268,12 @@ format_value (char *buff, double value, char *unit)
void
format_value_multi_interface (char *buff, double value, char *unit)
{
char *mag;
if (strstr(unit, "b"))
value *= 8;
char *mag = convert_double(&value, (strstr(unit, "B")) ? 1024 : 1000, 1.0f);
mag = convert_double(&value, (strstr(unit, "B")) ? 1024 : 1000, 1.0f);
/* Formatting rules:
* - if original value was < 1000, output decimal value only
@@ -281,7 +285,7 @@ format_value_multi_interface (char *buff, double value, char *unit)
else if (value < 10)
sprintf(buff, "%3.1f%s", value, mag);
else
sprintf(buff, "%3.f%s", value, mag);
sprintf(buff, "%3.0f%s", value, mag);
} /* format_value_multi_interface() */