You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2011/06/17 00:58:06 UTC
svn commit: r1136727 - in /trafficserver/traffic/trunk: CHANGES
iocore/hostdb/HostDB.cc lib/ts/Compatability.h mgmt/utils/MgmtUtils.cc
mgmt/web2/WebIntrMain.cc
Author: zwoop
Date: Thu Jun 16 22:58:06 2011
New Revision: 1136727
URL: http://svn.apache.org/viewvc?rev=1136727&view=rev
Log:
[TS-359] Remove DIR_SEP and use slash directly
Modified:
trafficserver/traffic/trunk/CHANGES
trafficserver/traffic/trunk/iocore/hostdb/HostDB.cc
trafficserver/traffic/trunk/lib/ts/Compatability.h
trafficserver/traffic/trunk/mgmt/utils/MgmtUtils.cc
trafficserver/traffic/trunk/mgmt/web2/WebIntrMain.cc
Modified: trafficserver/traffic/trunk/CHANGES
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/CHANGES?rev=1136727&r1=1136726&r2=1136727&view=diff
==============================================================================
--- trafficserver/traffic/trunk/CHANGES (original)
+++ trafficserver/traffic/trunk/CHANGES Thu Jun 16 22:58:06 2011
@@ -1,6 +1,8 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 3.1.0
+ *) [TS-359] Remove DIR_SEP and use slash directly.
+
*) [TS-839] Build problems when specifying lmza location.
*) [TS-828] Various memory leaks and uninitialized values. Author:
Modified: trafficserver/traffic/trunk/iocore/hostdb/HostDB.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/hostdb/HostDB.cc?rev=1136727&r1=1136726&r2=1136727&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/hostdb/HostDB.cc (original)
+++ trafficserver/traffic/trunk/iocore/hostdb/HostDB.cc Thu Jun 16 22:58:06 2011
@@ -305,7 +305,7 @@ HostDBCache::start(int flags)
i++;
}
ink_strncpy(storage_path, system_root_dir, sizeof(storage_path));
- strcat(storage_path, DIR_SEP);
+ strcat(storage_path, "\\");
strcat(storage_path, szPath);
#else
IOCORE_ReadConfigString(storage_path, "proxy.config.hostdb.storage_path", PATH_NAME_MAX);
Modified: trafficserver/traffic/trunk/lib/ts/Compatability.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/lib/ts/Compatability.h?rev=1136727&r1=1136726&r2=1136727&view=diff
==============================================================================
--- trafficserver/traffic/trunk/lib/ts/Compatability.h (original)
+++ trafficserver/traffic/trunk/lib/ts/Compatability.h Thu Jun 16 22:58:06 2011
@@ -46,9 +46,6 @@ template<class T> T max(const T a, const
return a > b ? a : b;
}
-// Define the directory separator for UNIX
-#define DIR_SEP "/"
-
#define _O_ATTRIB_NORMAL 0x0000
#define _O_ATTRIB_OVERLAPPED 0x0000
Modified: trafficserver/traffic/trunk/mgmt/utils/MgmtUtils.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/utils/MgmtUtils.cc?rev=1136727&r1=1136726&r2=1136727&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/utils/MgmtUtils.cc (original)
+++ trafficserver/traffic/trunk/mgmt/utils/MgmtUtils.cc Thu Jun 16 22:58:06 2011
@@ -675,7 +675,6 @@ mgmt_getAddrForIntr(char *intrName, stru
close(fakeSocket);
#else /* _WIN32 */
-
// There is no notion of network interface names on NT.
// So we use a winnt_intr.config file to give each of
// the interface a name.
@@ -684,9 +683,9 @@ mgmt_getAddrForIntr(char *intrName, stru
FILE *fp = NULL;
#ifdef LOCAL_MANAGER
- snprintf(intr_file, sizeof(intr_file), "%s%sconfig%s%s", ts_base_dir, DIR_SEP, DIR_SEP, "winnt_intr.config");
+ snprintf(intr_file, sizeof(intr_file), "%s\\config\\%s", ts_base_dir, "winnt_intr.config");
#else
- snprintf(intr_file, sizeof(intr_file), "%s%sconfig%s%s", system_base_install, DIR_SEP, DIR_SEP, "winnt_intr.config");
+ snprintf(intr_file, sizeof(intr_file), "%s\\config\\%s", system_base_install, "winnt_intr.config");
#endif
if ((fp = fopen(intr_file, "r")) == NULL) {
Modified: trafficserver/traffic/trunk/mgmt/web2/WebIntrMain.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/web2/WebIntrMain.cc?rev=1136727&r1=1136726&r2=1136727&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/web2/WebIntrMain.cc (original)
+++ trafficserver/traffic/trunk/mgmt/web2/WebIntrMain.cc Thu Jun 16 22:58:06 2011
@@ -128,7 +128,7 @@ checkWebContext(WebContext * wctx, const
}
defaultFile.copyFrom(wctx->docRoot, strlen(wctx->docRoot));
- defaultFile.copyFrom(DIR_SEP, 1);
+ defaultFile.copyFrom("/", 1); // TODO: Win32 support here ?
defaultFile.copyFrom(wctx->defaultFile, strlen(wctx->defaultFile));
if (stat(defaultFile.bufPtr(), &fInfo) < 0) {
@@ -438,8 +438,8 @@ webIntr_main(void *x)
bzero(api_sock_path, 1024);
bzero(event_sock_path, 1024);
- snprintf(api_sock_path, sizeof(api_sock_path), "%s%smgmtapisocket", system_runtime_dir, DIR_SEP);
- snprintf(event_sock_path, sizeof(event_sock_path), "%s%seventapisocket", system_runtime_dir, DIR_SEP);
+ snprintf(api_sock_path, sizeof(api_sock_path), "%s/mgmtapisocket", system_runtime_dir);
+ snprintf(event_sock_path, sizeof(event_sock_path), "%s/eventapisocket", system_runtime_dir);
// INKqa12562: MgmtAPI sockets should be created with 775 permission
mode_t oldmask = umask(S_IWOTH);