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 2010/08/04 01:21:40 UTC

svn commit: r982068 - in /trafficserver/traffic/trunk: iocore/eventsystem/ iocore/net/ libinktomi++/ proxy/

Author: zwoop
Date: Tue Aug  3 23:21:39 2010
New Revision: 982068

URL: http://svn.apache.org/viewvc?rev=982068&view=rev
Log:
TS-400: Checkpoint 2 in cleanup.

Modified:
    trafficserver/traffic/trunk/iocore/eventsystem/I_Continuation.h
    trafficserver/traffic/trunk/iocore/eventsystem/I_VConnection.h
    trafficserver/traffic/trunk/iocore/eventsystem/P_Freer.h
    trafficserver/traffic/trunk/iocore/eventsystem/P_IOBuffer.h
    trafficserver/traffic/trunk/iocore/eventsystem/P_UnixSocketManager.h
    trafficserver/traffic/trunk/iocore/net/Connection.cc
    trafficserver/traffic/trunk/iocore/net/I_NetVConnection.h
    trafficserver/traffic/trunk/iocore/net/P_Connection.h
    trafficserver/traffic/trunk/iocore/net/P_NetAccept.h
    trafficserver/traffic/trunk/iocore/net/P_SSLNetAccept.h
    trafficserver/traffic/trunk/iocore/net/P_UDPConnection.h
    trafficserver/traffic/trunk/iocore/net/P_UDPNet.h
    trafficserver/traffic/trunk/iocore/net/P_UnixCompletionUtil.h
    trafficserver/traffic/trunk/iocore/net/P_UnixNet.h
    trafficserver/traffic/trunk/iocore/net/P_UnixNetVConnection.h
    trafficserver/traffic/trunk/libinktomi++/HostLookup.cc
    trafficserver/traffic/trunk/libinktomi++/SimpleDBM.cc
    trafficserver/traffic/trunk/libinktomi++/TextBuffer.cc
    trafficserver/traffic/trunk/libinktomi++/ink_time.cc
    trafficserver/traffic/trunk/proxy/Error.h

Modified: trafficserver/traffic/trunk/iocore/eventsystem/I_Continuation.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/eventsystem/I_Continuation.h?rev=982068&r1=982067&r2=982068&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/eventsystem/I_Continuation.h (original)
+++ trafficserver/traffic/trunk/iocore/eventsystem/I_Continuation.h Tue Aug  3 23:21:39 2010
@@ -63,7 +63,7 @@ typedef int (Continuation::*Continuation
 class force_VFPT_to_top
 {
 public:
-  virtual ~ force_VFPT_to_top()
+  virtual ~force_VFPT_to_top()
   {
   }
 };
@@ -92,7 +92,9 @@ public:
   the Continuation's class constructor.
 
 */
-class Continuation:force_VFPT_to_top
+
+// TODO: The ICCcompiler defaults this to "private", is that really correct?
+class Continuation: public force_VFPT_to_top
 {
 public:
 

Modified: trafficserver/traffic/trunk/iocore/eventsystem/I_VConnection.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/eventsystem/I_VConnection.h?rev=982068&r1=982067&r2=982068&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/eventsystem/I_VConnection.h (original)
+++ trafficserver/traffic/trunk/iocore/eventsystem/I_VConnection.h Tue Aug  3 23:21:39 2010
@@ -378,7 +378,7 @@ public:
   int lerrno;
 };
 
-struct DummyVConnection:VConnection
+struct DummyVConnection: public VConnection
 {
   virtual VIO *do_io_write(Continuation *c = NULL, int64 nbytes = INT64_MAX, IOBufferReader *buf = 0, bool owner = false) {
     (void) c;

Modified: trafficserver/traffic/trunk/iocore/eventsystem/P_Freer.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/eventsystem/P_Freer.h?rev=982068&r1=982067&r2=982068&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/eventsystem/P_Freer.h (original)
+++ trafficserver/traffic/trunk/iocore/eventsystem/P_Freer.h Tue Aug  3 23:21:39 2010
@@ -27,7 +27,7 @@
 
 #include "inktomi++.h"
 
-template<class C> struct DeleterContinuation:Continuation
+template<class C> struct DeleterContinuation: public Continuation
 {
 public:                        // Needed by WinNT compiler (compiler bug)
   C * p;
@@ -52,7 +52,7 @@ new_Deleter(C * ap, ink_hrtime t)
   eventProcessor.schedule_in(NEW(new DeleterContinuation<C> (ap)), t, ET_CALL);
 }
 
-template<class C> struct FreeCallContinuation:Continuation
+template<class C> struct FreeCallContinuation: public Continuation
 {
 public:                        // Needed by WinNT compiler (compiler bug)
   C * p;
@@ -79,7 +79,7 @@ new_FreeCaller(C * ap, ink_hrtime t)
 struct FreerContinuation;
 typedef int (FreerContinuation::*FreerContHandler) (int, void *);
 
-struct FreerContinuation:Continuation
+struct FreerContinuation: public Continuation
 {
   void *p;
   int dieEvent(int event, Event * e)
@@ -102,7 +102,7 @@ new_Freer(void *ap, ink_hrtime t)
   eventProcessor.schedule_in(NEW(new FreerContinuation(ap)), t, ET_CALL);
 }
 
-template<class C> struct DereferContinuation:Continuation
+template<class C> struct DereferContinuation: public Continuation
 {
   C *p;
   int dieEvent(int event, Event * e)

Modified: trafficserver/traffic/trunk/iocore/eventsystem/P_IOBuffer.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/eventsystem/P_IOBuffer.h?rev=982068&r1=982067&r2=982068&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/eventsystem/P_IOBuffer.h (original)
+++ trafficserver/traffic/trunk/iocore/eventsystem/P_IOBuffer.h Tue Aug  3 23:21:39 2010
@@ -145,10 +145,12 @@ iobuffer_mem_inc(const char *_loc, int64
     _loc = "memory/IOBuffer/UNKNOWN-LOCATION";
   Resource *res = res_lookup(_loc);
   ink_debug_assert(strcmp(_loc, res->path) == 0);
-  int64 r = ink_atomic_increment64(&res->value,
-                                   index_to_buffer_size(_size_index));
-  NOWARN_UNUSED(r);
+#ifdef DEBUG  
+  int64 r = ink_atomic_increment64(&res->value, index_to_buffer_size(_size_index));
   ink_debug_assert(r >= 0);
+#else
+  ink_atomic_increment64(&res->value, index_to_buffer_size(_size_index));
+#endif
 }
 
 TS_INLINE void
@@ -163,10 +165,12 @@ iobuffer_mem_dec(const char *_loc, int64
     _loc = "memory/IOBuffer/UNKNOWN-LOCATION";
   Resource *res = res_lookup(_loc);
   ink_debug_assert(strcmp(_loc, res->path) == 0);
-  int64 r = ink_atomic_increment64(&res->value,
-                                   -index_to_buffer_size(_size_index));
-  NOWARN_UNUSED(r);
+#ifdef DEBUG  
+  int64 r = ink_atomic_increment64(&res->value, -index_to_buffer_size(_size_index));
   ink_debug_assert(r >= index_to_buffer_size(_size_index));
+#else
+  ink_atomic_increment64(&res->value, -index_to_buffer_size(_size_index));
+#endif
 }
 #endif
 

Modified: trafficserver/traffic/trunk/iocore/eventsystem/P_UnixSocketManager.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/eventsystem/P_UnixSocketManager.h?rev=982068&r1=982067&r2=982068&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/eventsystem/P_UnixSocketManager.h (original)
+++ trafficserver/traffic/trunk/iocore/eventsystem/P_UnixSocketManager.h Tue Aug  3 23:21:39 2010
@@ -89,6 +89,7 @@ SocketManager::open(const char *path, in
 TS_INLINE int64
 SocketManager::read(int fd, void *buf, int size, void *pOLP)
 {
+  NOWARN_UNUSED(pOLP);
   int64 r;
   do {
     r =::read(fd, buf, size);
@@ -102,6 +103,7 @@ SocketManager::read(int fd, void *buf, i
 TS_INLINE int64
 SocketManager::pread(int fd, void *buf, int size, off_t offset, char *tag)
 {
+  NOWARN_UNUSED(tag);
   int64 r;
   do {
     r =::pread(fd, buf, size, offset);
@@ -127,6 +129,7 @@ SocketManager::readv(int fd, struct iove
 TS_INLINE int64
 SocketManager::vector_io(int fd, struct iovec *vector, size_t count, int read_request, void *pOLP)
 {
+  NOWARN_UNUSED(pOLP);
   const int max_iovecs_per_request = 16;
   int n;
   int64 r = 0;
@@ -198,6 +201,7 @@ SocketManager::recvfrom(int fd, void *bu
 TS_INLINE int64
 SocketManager::write(int fd, void *buf, int size, void *pOLP)
 {
+  NOWARN_UNUSED(pOLP);
   int64 r;
   do {
     if (likely((r =::write(fd, buf, size)) >= 0))
@@ -210,6 +214,7 @@ SocketManager::write(int fd, void *buf, 
 TS_INLINE int64
 SocketManager::pwrite(int fd, void *buf, int size, off_t offset, char *tag)
 {
+  NOWARN_UNUSED(tag);
   int64 r;
   do {
     if (unlikely((r =::pwrite(fd, buf, size, offset)) < 0))
@@ -262,6 +267,7 @@ SocketManager::sendto(int fd, void *buf,
 TS_INLINE int
 SocketManager::sendmsg(int fd, struct msghdr *m, int flags, void *pOLP)
 {
+  NOWARN_UNUSED(pOLP);
   int r;
   do {
     if (unlikely((r =::sendmsg(fd, m, flags)) < 0))
@@ -504,6 +510,7 @@ SocketManager::getsockname(int s, struct
 TS_INLINE int
 SocketManager::socket(int domain, int type, int protocol, bool bNonBlocking)
 {
+  NOWARN_UNUSED(bNonBlocking);
   return::socket(domain, type, protocol);
 }
 

Modified: trafficserver/traffic/trunk/iocore/net/Connection.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/Connection.cc?rev=982068&r1=982067&r2=982068&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/Connection.cc (original)
+++ trafficserver/traffic/trunk/iocore/net/Connection.cc Tue Aug  3 23:21:39 2010
@@ -50,7 +50,7 @@ get_listen_backlog(void)
 
   IOCORE_ReadConfigInteger(listen_backlog, "proxy.config.net.listen_backlog");
   return listen_backlog;
-};
+}
 
 
 //

Modified: trafficserver/traffic/trunk/iocore/net/I_NetVConnection.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/I_NetVConnection.h?rev=982068&r1=982067&r2=982068&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/I_NetVConnection.h (original)
+++ trafficserver/traffic/trunk/iocore/net/I_NetVConnection.h Tue Aug  3 23:21:39 2010
@@ -63,7 +63,7 @@ struct NetVCOptions {
   /// Values for valid IP protocols.
   enum ip_protocol_t {
     USE_TCP, ///< TCP protocol.
-    USE_UDP, ///< UDP protocol.
+    USE_UDP ///< UDP protocol.
   };
 
   /// IP protocol to use on socket.
@@ -83,13 +83,13 @@ struct NetVCOptions {
   enum addr_bind_style {
     ANY_ADDR, ///< Bind to any available local address (don't care, default).
     INTF_ADDR, ///< Bind to the interface address in @a local_addr.
-    FOREIGN_ADDR, ///< Bind to foreign address in @a local_addr.
+    FOREIGN_ADDR ///< Bind to foreign address in @a local_addr.
   };
 
   /// The set of ways in which the local port should be bound.
   enum port_bind_style {
     ANY_PORT, ///< Bind to any available local port (dont' care, default).
-    FIXED_PORT, ///< Bind to the port in @a local_port.
+    FIXED_PORT ///< Bind to the port in @a local_port.
   };
 
   /// Port to use for local side of connection.
@@ -483,7 +483,7 @@ public:
 #else
   // These are here to simplify the usage of these APIs, i.e. no need to
   // add the #ifdef ATS_USE_DETAILED_LOG a million times.
-  void addLogMessage(const char *message) {}
+  void addLogMessage(const char *message) { NOWARN_UNUSED(message); }
   bool loggingEnabled() const { return false; }
 #endif
 

Modified: trafficserver/traffic/trunk/iocore/net/P_Connection.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/P_Connection.h?rev=982068&r1=982067&r2=982068&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/P_Connection.h (original)
+++ trafficserver/traffic/trunk/iocore/net/P_Connection.h Tue Aug  3 23:21:39 2010
@@ -155,7 +155,7 @@ protected:
 // Server
 //
 ///////////////////////////////////////////////////////////////////////
-struct Server:Connection
+struct Server: public Connection
 {
   //
   // IP address in network byte order

Modified: trafficserver/traffic/trunk/iocore/net/P_NetAccept.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/P_NetAccept.h?rev=982068&r1=982067&r2=982068&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/P_NetAccept.h (original)
+++ trafficserver/traffic/trunk/iocore/net/P_NetAccept.h Tue Aug  3 23:21:39 2010
@@ -57,7 +57,7 @@ AcceptFunction net_accept;
 class UnixNetVConnection;
 
 // TODO fix race between cancel accept and call back
-struct NetAcceptAction:public Action, RefCountObj
+struct NetAcceptAction:public Action, public RefCountObj
 {
   Server *server;
 
@@ -81,7 +81,7 @@ struct NetAcceptAction:public Action, Re
 // NetAccept
 // Handles accepting connections.
 //
-struct NetAccept:Continuation
+struct NetAccept:public Continuation
 {
   int port;
   ink_hrtime period;

Modified: trafficserver/traffic/trunk/iocore/net/P_SSLNetAccept.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/P_SSLNetAccept.h?rev=982068&r1=982067&r2=982068&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/P_SSLNetAccept.h (original)
+++ trafficserver/traffic/trunk/iocore/net/P_SSLNetAccept.h Tue Aug  3 23:21:39 2010
@@ -50,7 +50,7 @@ struct UnixNetVConnection;
 // NetAccept
 // Handles accepting connections.
 //
-struct SSLNetAccept:NetAccept
+struct SSLNetAccept: public NetAccept
 {
 
 #ifndef _IOCORE_WIN32_WINNT

Modified: trafficserver/traffic/trunk/iocore/net/P_UDPConnection.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/P_UDPConnection.h?rev=982068&r1=982067&r2=982068&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/P_UDPConnection.h (original)
+++ trafficserver/traffic/trunk/iocore/net/P_UDPConnection.h Tue Aug  3 23:21:39 2010
@@ -188,13 +188,13 @@ UDPConnection::cancel(void)
   p->sendGenerationNum++;
   p->lastPktStartTime = p->lastSentPktStartTime;
   return p->lastSentPktTSSeqNum;
-};
+}
 
 TS_INLINE void
 UDPConnection::SetLastSentPktTSSeqNum(int64 sentSeqNum)
 {
   ((UDPConnectionInternal *) this)->lastSentPktTSSeqNum = sentSeqNum;
-};
+}
 
 TS_INLINE void
 UDPConnection::setContinuation(Continuation * c)

Modified: trafficserver/traffic/trunk/iocore/net/P_UDPNet.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/P_UDPNet.h?rev=982068&r1=982067&r2=982068&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/P_UDPNet.h (original)
+++ trafficserver/traffic/trunk/iocore/net/P_UDPNet.h Tue Aug  3 23:21:39 2010
@@ -320,7 +320,7 @@ private:
 
 void initialize_thread_for_udp_net(EThread * thread);
 
-struct UDPNetHandler:Continuation
+struct UDPNetHandler: public Continuation
 {
 public:
   // to be polled for read

Modified: trafficserver/traffic/trunk/iocore/net/P_UnixCompletionUtil.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/P_UnixCompletionUtil.h?rev=982068&r1=982067&r2=982068&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/P_UnixCompletionUtil.h (original)
+++ trafficserver/traffic/trunk/iocore/net/P_UnixCompletionUtil.h Tue Aug  3 23:21:39 2010
@@ -37,14 +37,14 @@ completionUtil::create()
 {
   UDPIOEvent *u = UDPIOEventAllocator.alloc();
   return u;
-};
+}
 TS_INLINE void
 completionUtil::destroy(Event * e)
 {
   ink_assert(e != NULL);
   UDPIOEvent *u = (UDPIOEvent *) e;
   UDPIOEvent::free(u);
-};
+}
 TS_INLINE void
 completionUtil::setThread(Event * e, EThread * t)
 {

Modified: trafficserver/traffic/trunk/iocore/net/P_UnixNet.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/P_UnixNet.h?rev=982068&r1=982067&r2=982068&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/P_UnixNet.h (original)
+++ trafficserver/traffic/trunk/iocore/net/P_UnixNet.h Tue Aug  3 23:21:39 2010
@@ -664,6 +664,7 @@ TS_INLINE int EventIO::modify(int e) {
   }
   return 0;
 #else
+  NOWARN_UNUSED(e);
   return 0;
 #endif
 }
@@ -700,6 +701,7 @@ TS_INLINE int EventIO::refresh(int e) {
   }
   return 0;
 #else
+  NOWARN_UNUSED(e);
   return 0;
 #endif
 }

Modified: trafficserver/traffic/trunk/iocore/net/P_UnixNetVConnection.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/P_UnixNetVConnection.h?rev=982068&r1=982067&r2=982068&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/P_UnixNetVConnection.h (original)
+++ trafficserver/traffic/trunk/iocore/net/P_UnixNetVConnection.h Tue Aug  3 23:21:39 2010
@@ -100,9 +100,9 @@ public:
   virtual Action *send_OOB(Continuation *cont, char *buf, int len);
   virtual void cancel_OOB();
 
-  virtual void setSSLHandshakeWantsRead(bool flag) { return; }
+  virtual void setSSLHandshakeWantsRead(bool flag) { NOWARN_UNUSED(flag); return; }
   virtual bool getSSLHandshakeWantsRead() { return false; }
-  virtual void setSSLHandshakeWantsWrite(bool flag) { return; }
+  virtual void setSSLHandshakeWantsWrite(bool flag) { NOWARN_UNUSED(flag); return; }
 
   virtual bool getSSLHandshakeWantsWrite() { return false; }
 
@@ -196,10 +196,10 @@ public:
   NetState read;
   NetState write;
 
-  LINKM(UnixNetVConnection, read, ready_link);
-  SLINKM(UnixNetVConnection, read, enable_link);
-  LINKM(UnixNetVConnection, write, ready_link);
-  SLINKM(UnixNetVConnection, write, enable_link);
+  LINKM(UnixNetVConnection, read, ready_link)
+  SLINKM(UnixNetVConnection, read, enable_link)
+  LINKM(UnixNetVConnection, write, ready_link)
+  SLINKM(UnixNetVConnection, write, enable_link)
 
   ink_hrtime inactivity_timeout_in;
   ink_hrtime active_timeout_in;

Modified: trafficserver/traffic/trunk/libinktomi++/HostLookup.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/HostLookup.cc?rev=982068&r1=982067&r2=982068&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/HostLookup.cc (original)
+++ trafficserver/traffic/trunk/libinktomi++/HostLookup.cc Tue Aug  3 23:21:39 2010
@@ -802,6 +802,7 @@ HostLookup::~HostLookup()
 static void
 empty_print_fn(void *opaque_data)
 {
+  NOWARN_UNUSED(opaque_data);
 }
 
 void

Modified: trafficserver/traffic/trunk/libinktomi++/SimpleDBM.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/SimpleDBM.cc?rev=982068&r1=982067&r2=982068&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/SimpleDBM.cc (original)
+++ trafficserver/traffic/trunk/libinktomi++/SimpleDBM.cc Tue Aug  3 23:21:39 2010
@@ -113,6 +113,7 @@ SimpleDBM::~SimpleDBM()
 int
 SimpleDBM::open(char *db_name, int flags, void* info)
 {
+  NOWARN_UNUSED(info);
   int return_code = 0;
 #ifdef SIMPLEDBM_USE_SQLITE3
   int sqlite3_flags = SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE;
@@ -751,6 +752,7 @@ SimpleDBM::iterate(SimpleDBMIteratorFunc
 int
 SimpleDBM::lock(bool shared_lock)
 {
+  NOWARN_UNUSED(shared_lock);
   int return_code = 0;
 
   switch (_dbm_type) {

Modified: trafficserver/traffic/trunk/libinktomi++/TextBuffer.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/TextBuffer.cc?rev=982068&r1=982067&r2=982068&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/TextBuffer.cc (original)
+++ trafficserver/traffic/trunk/libinktomi++/TextBuffer.cc Tue Aug  3 23:21:39 2010
@@ -186,7 +186,6 @@ int
 textBuffer::readFromFD(int fd)
 {
   int readSize;
-  char *begin;
 
   // Check to see if we have got a resonable amount of space left in our
   //   buffer, if not try to get somemore
@@ -196,7 +195,6 @@ textBuffer::readFromFD(int fd)
     }
   }
 
-  begin = nextAdd;
   readSize = read(fd, nextAdd, spaceLeft - 1);
 
   if (readSize == 0) {

Modified: trafficserver/traffic/trunk/libinktomi++/ink_time.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/ink_time.cc?rev=982068&r1=982067&r2=982068&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/ink_time.cc (original)
+++ trafficserver/traffic/trunk/libinktomi++/ink_time.cc Tue Aug  3 23:21:39 2010
@@ -325,7 +325,7 @@ ink_time_dayrange_to_string(InkTimeDayRa
     buf[0] = '\0';
   }
 
-  snprintf(buf, bufSize, "range_start_%u_width_%u", dayrange_ptr->base, dayrange_ptr->width);
+  snprintf(buf, bufSize, "range_start_%d_width_%u", dayrange_ptr->base, dayrange_ptr->width);
   return (buf);
 }                               /* End ink_time_dayrange_to_string */
 

Modified: trafficserver/traffic/trunk/proxy/Error.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/Error.h?rev=982068&r1=982067&r2=982068&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/Error.h (original)
+++ trafficserver/traffic/trunk/proxy/Error.h Tue Aug  3 23:21:39 2010
@@ -72,7 +72,7 @@ struct ErrorClass
 //
 //////////////////////////////////////////////////////////////////////////////
 
-struct FatalClass:ErrorClass
+struct FatalClass: public ErrorClass
 {
   FatalClass(const char *afile, int aline, const char *afunction)
   : ErrorClass(afile, aline, afunction)
@@ -87,7 +87,7 @@ struct FatalClass:ErrorClass
 //
 //////////////////////////////////////////////////////////////////////////////
 
-struct RequestFatalClass:FatalClass
+struct RequestFatalClass: public FatalClass
 {
   virtual void raise(va_list ap, const char *prefix = NULL);
     RequestFatalClass(const char *afile, int aline, const char *afunction)
@@ -104,7 +104,7 @@ struct RequestFatalClass:FatalClass
 //
 //////////////////////////////////////////////////////////////////////////////
 
-struct ThreadFatalClass:FatalClass
+struct ThreadFatalClass: public FatalClass
 {
   virtual void raise(va_list ap, const char *prefix = NULL);
     ThreadFatalClass(const char *afile, int aline, const char *afunction)
@@ -121,7 +121,7 @@ struct ThreadFatalClass:FatalClass
 //
 //////////////////////////////////////////////////////////////////////////////
 
-struct ProcessorFatalClass:FatalClass
+struct ProcessorFatalClass: public FatalClass
 {
   virtual void raise(va_list ap, const char *prefix = NULL);
     ProcessorFatalClass(const char *afile, int aline, const char *afunction)
@@ -139,7 +139,7 @@ struct ProcessorFatalClass:FatalClass
 //
 //////////////////////////////////////////////////////////////////////////////
 
-struct ProcessFatalClass:FatalClass
+struct ProcessFatalClass: public FatalClass
 {
   virtual void raise(va_list ap, const char *prefix = NULL);
     ProcessFatalClass(const char *afile, int aline, const char *afunction)
@@ -158,7 +158,7 @@ struct ProcessFatalClass:FatalClass
 //
 //////////////////////////////////////////////////////////////////////////////
 
-struct MachineFatalClass:FatalClass
+struct MachineFatalClass: public FatalClass
 {
   virtual void raise(va_list ap, const char *prefix = NULL);
     MachineFatalClass(const char *afile, int aline, const char *afunction)