Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-18 02:55:12 +00:00
Code Issues Releases Activity

be thorough about setting portmon defaults

Browse Source 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@398 7f574dfc-610e-0410-a909-a81674777703
This commit is contained in:
Philip Kovacs 2005-11-11 22:21:34 +00:00
parent 257dd33e55
commit 50dc71425a
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/conky.c
View File

@ -4899,21 +4899,35 @@ else if (strcasecmp(name, a) == 0 || strcasecmp(name, b) == 0)
{
if ( !value ||
(sscanf(value, "%d", &tcp_port_monitor_collection_args.min_port_monitors) != 1) ||
tcp_port_monitor_collection_args.min_port_monitors <= 0 )
tcp_port_monitor_collection_args.min_port_monitors < 0 )
{
/* an error. use default, warn and continue. */
tcp_port_monitor_collection_args.min_port_monitors = MIN_PORT_MONITORS_DEFAULT;
CONF_ERR;
}
else if ( tcp_port_monitor_collection_args.min_port_monitors == 0 )
{
/* no error, just use default */
tcp_port_monitor_collection_args.min_port_monitors = MIN_PORT_MONITORS_DEFAULT;
}
/* else tcp_port_monitor_collection_args.min_port_monitors > 0 as per config */
}
CONF("min_port_monitor_connections")
{
if ( !value ||
(sscanf(value, "%d", &tcp_port_monitor_args.min_port_monitor_connections) != 1)
|| tcp_port_monitor_args.min_port_monitor_connections <= 0 )
|| tcp_port_monitor_args.min_port_monitor_connections < 0 )
{
/* an error. use default, warni and continue. */
tcp_port_monitor_args.min_port_monitor_connections = MIN_PORT_MONITOR_CONNECTIONS_DEFAULT;
CONF_ERR;
}
else if ( tcp_port_monitor_args.min_port_monitor_connections == 0 )
{
/* no error, just use default */
tcp_port_monitor_args.min_port_monitor_connections = MIN_PORT_MONITOR_CONNECTIONS_DEFAULT;
}
/* else tcp_port_monitor_args.min_port_monitor_connections > 0 as per config */
}
#endif
else
@ -4946,6 +4960,11 @@ int main(int argc, char **argv)
g_signal_pending=0;
memset(&info, 0, sizeof(info) );
#ifdef TCP_PORT_MONITOR
tcp_port_monitor_collection_args.min_port_monitors = MIN_PORT_MONITORS_DEFAULT;
tcp_port_monitor_args.min_port_monitor_connections = MIN_PORT_MONITOR_CONNECTIONS_DEFAULT;
#endif
/* handle command line parameters that don't change configs */
#ifdef X11
char *s;