From 79761d55b499afc3d1a73f2e596927f741f5e211 Mon Sep 17 00:00:00 2001 From: protoCall7 Date: Mon, 16 Jun 2014 00:09:54 -0700 Subject: [PATCH] explicitly set sentinal values on varadic functions to void pointer --- gmond/gmond.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gmond/gmond.c b/gmond/gmond.c index fe51fab01..1f882a962 100644 --- a/gmond/gmond.c +++ b/gmond/gmond.c @@ -2516,8 +2516,8 @@ setup_metric_info_impl(Ganglia_metric_callback *metric_cb, int group_once, const spfname_val = apr_table_get((apr_table_t *)metric_info->metadata, SPOOF_NAME); if (spfname_val) { - char *spoofedname = apr_pstrcat(global_context, spfname_val, ":", name, NULL); - char *spoofedkey = apr_pstrcat(global_context, spfname_val, ":", name, ":", spfhost_val, NULL); + char *spoofedname = apr_pstrcat(global_context, spfname_val, ":", name, (void *)0); + char *spoofedkey = apr_pstrcat(global_context, spfname_val, ":", name, ":", spfhost_val, (void *)0); metric_cb->msg.Ganglia_value_msg_u.gstr.metric_id.name = spoofedname; metric_cb->msg.Ganglia_value_msg_u.gstr.metric_id.spoof = TRUE; @@ -2731,7 +2731,7 @@ setup_collection_groups( void ) ptrs[j++].iov_len = i-k; } - title_r = apr_pstrcatv(p, ptrs, j, NULL); + title_r = apr_pstrcatv(p, ptrs, j, (void *)0); } cb = val; @@ -2957,7 +2957,7 @@ Ganglia_collection_group_send( Ganglia_collection_group *group, apr_time_t now) name = cb->msg.Ganglia_value_msg_u.gstr.metric_id.name; if (override_hostname != NULL) { - cb->msg.Ganglia_value_msg_u.gstr.metric_id.host = apr_pstrcat(global_context, (char *)( override_ip != NULL ? override_ip : override_hostname ), ":", (char *) override_hostname, NULL); + cb->msg.Ganglia_value_msg_u.gstr.metric_id.host = apr_pstrcat(global_context, (char *)( override_ip != NULL ? override_ip : override_hostname ), ":", (char *) override_hostname, (void *)0); cb->msg.Ganglia_value_msg_u.gstr.metric_id.spoof = TRUE; } val = apr_pstrdup(gm_pool, host_metric_value(cb->info, &(cb->msg)));