From: Rodolphe Quiédeville <rquiedeville@bearstech.com>
Date: Thu, 23 Apr 2009 09:33:54 +0000 (+0200)
Subject: mysql plugin: Replace all `magic numbers' (static string lengths).
X-Git-Tag: collectd-4.7.0~44
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=e4f81dd8b051eda866933ae4637eca1c40b1a027;p=collectd.git

mysql plugin: Replace all `magic numbers' (static string lengths).

I saw you correct my patch to suppress 'magic numbers', as I copy/paste another
part I suppose you want to supress all off them, I dit it in this patch. This
patch correct the typo I made on my name.

Regards

--
Rodolphe Quiedeville
www.bearstech.com
---

diff --git a/src/mysql.c b/src/mysql.c
index b700ff02..f243c500 100644
--- a/src/mysql.c
+++ b/src/mysql.c
@@ -24,7 +24,7 @@
  *   Mirko Buffoni <briareos at eswat.org>
  *   Doug MacEachern <dougm at hyperic.com>
  *   Sebastian tokkee Harl <sh at tokkee.org>
- *   Rodolphe Quiédevillel <rquiedeville at bearstech.com>
+ *   Rodolphe Quiédeville <rquiedeville at bearstech.com>
  **/
 
 #include "collectd.h"
@@ -747,23 +747,30 @@ static int mysql_read (user_data_t *ud)
 		key = row[0];
 		val = atoll (row[1]);
 
-		if (strncmp (key, "Com_", 4) == 0)
+		if (strncmp (key, "Com_", 
+			          strlen ("Com_")) == 0)
 		{
 			if (val == 0ULL)
 				continue;
 
 			/* Ignore `prepared statements' */
-			if (strncmp (key, "Com_stmt_", 9) != 0)
-				counter_submit ("mysql_commands", key + 4, val, db);
+			if (strncmp (key, "Com_stmt_", strlen ("Com_stmt_")) != 0)
+				counter_submit ("mysql_commands", 
+						key + strlen ("Com_"), 
+						val, db);
 		}
-		else if (strncmp (key, "Handler_", 8) == 0)
+		else if (strncmp (key, "Handler_", 
+				        strlen ("Handler_")) == 0)
 		{
 			if (val == 0ULL)
 				continue;
 
-			counter_submit ("mysql_handler", key + 8, val, db);
+			counter_submit ("mysql_handler", 
+					key + strlen ("Handler_"), 
+					val, db);
 		}
-		else if (strncmp (key, "Qcache_", 7) == 0)
+		else if (strncmp (key, "Qcache_",
+       				        strlen ("Qcache_")) == 0)
 		{
 			if (strcmp (key, "Qcache_hits") == 0)
 				qcache_hits = val;
@@ -776,14 +783,16 @@ static int mysql_read (user_data_t *ud)
 			else if (strcmp (key, "Qcache_queries_in_cache") == 0)
 				qcache_queries_in_cache = (int) val;
 		}
-		else if (strncmp (key, "Bytes_", 6) == 0)
+		else if (strncmp (key, "Bytes_", 
+				        strlen ("Bytes_")) == 0)
 		{
 			if (strcmp (key, "Bytes_received") == 0)
 				traffic_incoming += val;
 			else if (strcmp (key, "Bytes_sent") == 0)
 				traffic_outgoing += val;
 		}
-		else if (strncmp (key, "Threads_", 8) == 0)
+		else if (strncmp (key, "Threads_", 
+       				        strlen ("Threads_")) == 0)
 		{
 			if (strcmp (key, "Threads_running") == 0)
 				threads_running = (int) val;