kolan
/
gkrellm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix time formatting on win32 for monthly stats. Switch to glib/gkrellm debug logging.

This commit is contained in:
Stefan Gehn 2010-06-12 19:34:04 +00:00
parent ce0158f031
commit 22fd09df22
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/net.c
View File

@ -401,11 +401,13 @@ gkrellm_net_led_positions(gint *x_rx_led, gint *y_rx_led,
#include "pixmaps/timer/bg_timer.xpm" #include "pixmaps/timer/bg_timer.xpm"
#include "pixmaps/timer/decal_timer_button.xpm" #include "pixmaps/timer/decal_timer_button.xpm"
/* ISO 8601 date format for network stats gui*/ /* ISO 8601 date and month format strings for network stats gui*/
#ifdef WIN32 #ifdef WIN32
#define GK_NET_ISO_DATE "%Y-%m-%d" #define GK_NET_ISO_DATE "%Y-%m-%d"
#define GK_NET_MONTH_STAT_DATE "%b %d"
#else #else
#define GK_NET_ISO_DATE "%F" #define GK_NET_ISO_DATE "%F"
#define GK_NET_MONTH_STAT_DATE "%b %e"
#endif #endif
#define MIN_GRID_RES 5 #define MIN_GRID_RES 5
@ -1204,8 +1206,7 @@ format_net_data(NetMon *net, gchar *src_string, gchar *buf, gint size)
cp = net->chart; cp = net->chart;
net->totals_shown = FALSE; net->totals_shown = FALSE;
if ((_GK.debug_level & DEBUG_CHART_TEXT)) gkrellm_debug(DEBUG_CHART_TEXT, "net chart text: %s\n", src_string);
printf("net chart text: %s\n", src_string);
for (s = src_string; *s != '\0' && size > 0; ++s) for (s = src_string; *s != '\0' && size > 0; ++s)
{ {
@ -1314,8 +1315,7 @@ format_net_data(NetMon *net, gchar *src_string, gchar *buf, gint size)
} }
*buf = '\0'; *buf = '\0';
if ((_GK.debug_level & DEBUG_CHART_TEXT)) gkrellm_debug(DEBUG_CHART_TEXT, " : %s\n", result);
printf(" : %s\n", result);
} }
static void static void
@ -1759,8 +1759,8 @@ net_stat_set_date_string(NetStat *ns, enum StatType stat_type, struct tm *t)
tmx.tm_mday = days_in_month[tmx.tm_mon]; tmx.tm_mday = days_in_month[tmx.tm_mon];
if (tm.tm_mday > days_in_month[tm.tm_mon]) if (tm.tm_mday > days_in_month[tm.tm_mon])
tm.tm_mday = days_in_month[tm.tm_mon]; tm.tm_mday = days_in_month[tm.tm_mon];
strftime(bufa, sizeof(bufa), "%b %e", &tmx); strftime(bufa, sizeof(bufa), GK_NET_MONTH_STAT_DATE, &tmx);
strftime(bufb, sizeof(bufb), "%b %e", &tm); strftime(bufb, sizeof(bufb), GK_NET_MONTH_STAT_DATE, &tm);
snprintf(buf, sizeof(buf), "%s - %s", bufa, bufb); snprintf(buf, sizeof(buf), "%s - %s", bufa, bufb);
} }
} }
@ -2520,7 +2520,7 @@ load_net_config(gchar *arg)
{ /* Can't get resolution, label, launch or tooltip */ { /* Can't get resolution, label, launch or tooltip */
sscanf(item1, "%*d %d %*s %d %d", &enable, &ch_labels, &force); sscanf(item1, "%*d %d %*s %d %d", &enable, &ch_labels, &force);
strcpy(config, "enables"); strcpy(config, "enables");
sprintf(item1, "%d %d %d", enable, ch_labels, force); snprintf(item1, sizeof(item1), "%d %d %d", enable, ch_labels, force);
} }
/* Remaining configs will have a net name /* Remaining configs will have a net name
*/ */