svn commit: r1172340 - in /trafficserver/traffic/trunk/proxy/stats: CoupledStats.h Stats.cc

[igalic]

Author: igalic
Date: Sun Sep 18 20:38:10 2011
New Revision: 1172340

URL: http://svn.apache.org/viewvc?rev=1172340&view=rev
Log:
TS-953: consolidate string copy/concat for proxy/stats

Modified:
    trafficserver/traffic/trunk/proxy/stats/CoupledStats.h
    trafficserver/traffic/trunk/proxy/stats/Stats.cc

Modified: trafficserver/traffic/trunk/proxy/stats/CoupledStats.h
URL: 
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/stats/CoupledStats.h?rev=1172340&r1=1172339&r2=1172340&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/stats/CoupledStats.h (original)
+++ trafficserver/traffic/trunk/proxy/stats/CoupledStats.h Sun Sep 18 20:38:10 
2011
@@ -31,7 +31,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <limits.h>
-#include <string.h>
 #include <sys/types.h>
 
 #include "ink_resource.h"
@@ -103,7 +102,7 @@ m_snap_taken(false)
   if (!name || strlen(name) >= 80) {
     name = "nil_category";
   }
-  ink_strncpy(&m_name[0], name, sizeof(m_name));
+  ink_strlcpy(m_name, name, sizeof(m_name));
 
   ink_mutex_init(&m_mux, "CoupledStatMutex");
   grow_check(NULL);

Modified: trafficserver/traffic/trunk/proxy/stats/Stats.cc
URL: 
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/stats/Stats.cc?rev=1172340&r1=1172339&r2=1172340&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/stats/Stats.cc (original)
+++ trafficserver/traffic/trunk/proxy/stats/Stats.cc Sun Sep 18 20:38:10 2011
@@ -96,15 +96,15 @@ StatDescriptor::CreateDescriptor(const c
     return NULL;
 
   if (prefix) {
-    t = &tv[0];
+    t = tv;
     int pln = strlen(prefix);
     int nln = strlen(name);
     if (pln + nln > 126)
       return NULL;              // return &G_NULL_STAT;
 
-    ink_strncpy(t, prefix, name_len);
-    t[pln] = '.';
-    ink_strncpy(t + pln + 1, name, name_len - pln - 1);
+    ink_strlcpy(t, prefix, name_len);
+    t[pln] = '.'; t[pln + 1] = 0;
+    ink_strlcat(t, name, name_len);
   }
 
   return CreateDescriptor(t, init_value);
@@ -122,15 +122,15 @@ StatDescriptor::CreateDescriptor(const c
   // return &G_NULL_STAT;
 
   if (prefix) {
-    t = &tv[0];
+    t = tv;
     int pln = strlen(prefix);
     int nln = strlen(name);
     if (pln + nln > 126)
       return NULL;              // return &G_NULL_STAT;
 
-    ink_strncpy(t, prefix, name_len);
-    t[pln] = '.';
-    ink_strncpy(t + pln + 1, name, name_len - pln - 1);
+    ink_strlcpy(t, prefix, name_len);
+    t[pln] = '.'; t[pln + 1] = 0;
+    ink_strlcat(t, name, name_len);
   }
 
   return CreateDescriptor(t, init_value);
@@ -156,7 +156,7 @@ StatDescriptor::CreateDescriptor(const c
     ink_assert(ref.m_name == NULL);
     size_t len = strlen(name) + 1;
     ref.m_name = new char[len];
-    ink_strncpy(ref.m_name, name, len);
+    ink_strlcpy(ref.m_name, name, len);
     ref.m_type = RECD_INT;
     ref.m_value.rec_int = init_value;
     ref.m_magic = ALIVE;
@@ -187,7 +187,7 @@ StatDescriptor::CreateDescriptor(const c
     ink_assert(ref.m_name == NULL);
     size_t len = strlen(name) + 1;
     ref.m_name = new char[len];
-    ink_strncpy(ref.m_name, name, len);
+    ink_strlcpy(ref.m_name, name, len);
     ref.m_type = RECD_FLOAT;
     ref.m_value.rec_float = init_value;
     ref.m_magic = ALIVE;