[Sblim-commit] Git: gather - Metric Data Gatherer branch, master, updated. f642e2ffa8777b7089147f9894e0398cf00ca747

[Dave H. <hel...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "gather - Metric Data Gatherer".

The branch, master has been updated
       via  f642e2ffa8777b7089147f9894e0398cf00ca747 (commit)
      from  adb18fc7b8eaa97c731d947d9773721e58dc8d9c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f642e2ffa8777b7089147f9894e0398cf00ca747
Author: Dave Heller <hel...@us...>
Date:   Thu Oct 9 12:04:16 2014 -0400

    Fixed #2739: fix compiler warning

-----------------------------------------------------------------------

Summary of changes:
 repos.c |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/repos.c b/repos.c
index e394fc5..8869b9e 100644
--- a/repos.c
+++ b/repos.c
@@ -27,6 +27,7 @@
 #include "mrepos.h"
 #include "mtrace.h"
 #include <reposcfg.h>
+#include <commutil.h>
 #include <dirutil.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -385,10 +386,19 @@ int reposvalue_get(ValueRequest *vs, COMMHEAP ch)
 	    memcpy(vs->vsValues[actnum].viResource, mv[j][numv[j]-1].mvResource,reslen);
 	    /* Workround for [bugs:#2739]: check for duplicate timestamp, don't crash */
 	    if (mv[j][0].mvTimeStamp == mv[j][1].mvTimeStamp) {
-	      m_log(M_ERROR,M_SHOW,"Hit repeated value on calculation of %s (mid=%d)\n", mc->mcName, mv[j][0].mvId);
-	      m_log(M_ERROR,M_SHOW,"0: sys=%s res=%s value=%lu at %lu\n",mv[j][0].mvSystemId, mv[j][0].mvResource, ntohll(*(unsigned long long*)mv[j][0].mvData), mv[j][0].mvTimeStamp);
-	      m_log(M_ERROR,M_SHOW,"1: sys=%s res=%s value=%lu at %lu\n",mv[j][1].mvSystemId, mv[j][1].mvResource, ntohll(*(unsigned long long*)mv[j][1].mvData), mv[j][1].mvTimeStamp);
-	      memset(vs->vsValues[actnum].viValue, 0, sizeof(unsigned long long));
+	      m_log(M_ERROR, M_SHOW,
+	         "Hit repeated value on calculation of %s (mid=%d)\n",
+	          mc->mcName, mv[j][0].mvId);
+	      m_log(M_ERROR, M_SHOW, "0: sys=%s res=%s value=%lu at %lu\n",
+	          mv[j][0].mvSystemId, mv[j][0].mvResource,
+	          ntohll(*(unsigned long long*) mv[j][0].mvData),
+	          mv[j][0].mvTimeStamp);
+	      m_log(M_ERROR, M_SHOW, "1: sys=%s res=%s value=%lu at %lu\n",
+	          mv[j][1].mvSystemId, mv[j][1].mvResource,
+	          ntohll(*(unsigned long long*) mv[j][1].mvData),
+	          mv[j][1].mvTimeStamp);
+	      memset(vs->vsValues[actnum].viValue, 0,
+	          sizeof(unsigned long long));
 	      vs->vsValues[actnum].viValueLen = sizeof(unsigned long long);
 	    } else // do the calculation as normal
 	    if (mc->mcCalc(mv[j],


hooks/post-receive
-- 
gather - Metric Data Gatherer