From: <bni...@us...> - 2007-04-02 23:21:35
|
Revision: 752 http://svn.sourceforge.net/ganglia/?rev=752&view=rev Author: bnicholes Date: 2007-04-02 16:20:38 -0700 (Mon, 02 Apr 2007) Log Message: ----------- minor cleanups Modified Paths: -------------- trunk/monitor-core/gmond/Makefile.am trunk/monitor-core/gmond/gmond.c Modified: trunk/monitor-core/gmond/Makefile.am =================================================================== --- trunk/monitor-core/gmond/Makefile.am 2007-04-02 22:55:23 UTC (rev 751) +++ trunk/monitor-core/gmond/Makefile.am 2007-04-02 23:20:38 UTC (rev 752) @@ -6,7 +6,7 @@ sbin_PROGRAMS = gmond # metric.h and dtd.h are for gmetad/gmetric for now.... -gmond_SOURCES = gmond.c cmdline.c cmdline.h dtd.h metric.h g25_config.c g25_config.h +gmond_SOURCES = gmond.c cmdline.c cmdline.h dtd.h metric.h g25_config.c g25_config.h gm_mmn.h noinst_MANS = gmond.conf.5 Modified: trunk/monitor-core/gmond/gmond.c =================================================================== --- trunk/monitor-core/gmond/gmond.c 2007-04-02 22:55:23 UTC (rev 751) +++ trunk/monitor-core/gmond/gmond.c 2007-04-02 23:20:38 UTC (rev 752) @@ -1113,7 +1113,7 @@ memset (desc, '\0', sizeof (desc)); metric_cb = (Ganglia_metric_callback *)apr_hash_get( metric_callbacks, msg->name, APR_HASH_KEY_STRING ); - if (metric_cb) { + if (metric_cb && metric_cb->info && metric_cb->info->desc) { strncpy (desc, metric_cb->info->desc, sizeof(desc)-1); } else { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |