You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by ig...@apache.org on 2011/09/20 03:05:04 UTC

svn commit: r1172935 - in /trafficserver/traffic/trunk/iocore/cluster: ClusterMachine.cc test_I_Cluster.cc test_P_Cluster.cc

Author: igalic
Date: Tue Sep 20 01:05:03 2011
New Revision: 1172935

URL: http://svn.apache.org/viewvc?rev=1172935&view=rev
Log:
TS-953: consolidate string copy/concat for the iocore/cluster.

Modified:
    trafficserver/traffic/trunk/iocore/cluster/ClusterMachine.cc
    trafficserver/traffic/trunk/iocore/cluster/test_I_Cluster.cc
    trafficserver/traffic/trunk/iocore/cluster/test_P_Cluster.cc

Modified: trafficserver/traffic/trunk/iocore/cluster/ClusterMachine.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cluster/ClusterMachine.cc?rev=1172935&r1=1172934&r2=1172935&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cluster/ClusterMachine.cc (original)
+++ trafficserver/traffic/trunk/iocore/cluster/ClusterMachine.cc Tue Sep 20 01:05:03 2011
@@ -193,13 +193,10 @@ read_MachineList(char *filename, int afd
   MachineList *l = NULL;
   ink_assert(filename || (afd != -1));
   char p[PATH_NAME_MAX];
-  size_t remaining_str_size = sizeof p;
   if (filename) {
-    ink_strncpy(p, cache_system_config_directory, remaining_str_size);
-    remaining_str_size -= strlen(cache_system_config_directory);
-    strncat(p, "/", remaining_str_size);
-    remaining_str_size--;
-    strncat(p, filename, remaining_str_size);
+    ink_strlcpy(p, cache_system_config_directory, sizeof(p));
+    ink_strlcat(p, "/", sizeof(p));
+    ink_strlcat(p, filename, sizeof(p));
   }
   int fd = ((afd != -1) ? afd : open(p, O_RDONLY));
   if (fd >= 0) {

Modified: trafficserver/traffic/trunk/iocore/cluster/test_I_Cluster.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cluster/test_I_Cluster.cc?rev=1172935&r1=1172934&r2=1172935&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cluster/test_I_Cluster.cc (original)
+++ trafficserver/traffic/trunk/iocore/cluster/test_I_Cluster.cc Tue Sep 20 01:05:03 2011
@@ -104,7 +104,7 @@ init_diags(char *bdt, char *bat)
 {
   FILE *diags_log_fp;
   char diags_logpath[500];
-  strcpy(diags_logpath, DIAGS_LOG_FILE);
+  ink_strlcpy(diags_logpath, DIAGS_LOG_FILE, sizeof(diags_logpath));
 
   diags_log_fp = fopen(diags_logpath, "w");
   if (diags_log_fp) {

Modified: trafficserver/traffic/trunk/iocore/cluster/test_P_Cluster.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cluster/test_P_Cluster.cc?rev=1172935&r1=1172934&r2=1172935&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cluster/test_P_Cluster.cc (original)
+++ trafficserver/traffic/trunk/iocore/cluster/test_P_Cluster.cc Tue Sep 20 01:05:03 2011
@@ -104,7 +104,7 @@ init_diags(char *bdt, char *bat)
 {
   FILE *diags_log_fp;
   char diags_logpath[500];
-  strcpy(diags_logpath, DIAGS_LOG_FILE);
+  ink_strlcpy(diags_logpath, DIAGS_LOG_FILE, sizeof(diags_logpath));
 
   diags_log_fp = fopen(diags_logpath, "w");
   if (diags_log_fp) {