[Ipstream-devel] IPSocket/Tracer tracer.cpp, 1.8, 1.9 tracer.h, 1.4, 1.5

[Sergey V. B. <kon...@us...>]

Update of /cvsroot/ipstream/IPSocket/Tracer
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv7760/Tracer

Modified Files:
	tracer.cpp tracer.h 
Log Message:
minor reformating

Index: tracer.cpp
===================================================================
RCS file: /cvsroot/ipstream/IPSocket/Tracer/tracer.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** tracer.cpp	17 Mar 2010 06:55:06 -0000	1.8
--- tracer.cpp	19 Mar 2010 03:55:55 -0000	1.9
***************
*** 1,4 ****
  /////////////////////////////////////////////////////////////////////////////
! // File: TCPScanner.cpp
  /////////////////////////////////////////////////////////////////////////////           
  //                                                                                      
--- 1,4 ----
  /////////////////////////////////////////////////////////////////////////////
! // File: tracer.cpp
  /////////////////////////////////////////////////////////////////////////////           
  //                                                                                      
***************
*** 22,26 ****
      #include <ctime>
  
! 	#include <cstring>
  
  // For atoi
--- 22,26 ----
      #include <ctime>
  
!     #include <cstring>
  
  // For atoi
***************
*** 53,73 ****
          #include <windows.h>
  
! BOOL APIENTRY DllMain( HANDLE hModule, 
!     DWORD  ul_reason_for_call, 
!     LPVOID lpReserved
!     )
  {
      switch ( ul_reason_for_call )
      {
!         case DLL_PROCESS_ATTACH:
!         case DLL_THREAD_ATTACH:
!         case DLL_THREAD_DETACH:
!         case DLL_PROCESS_DETACH:
              break;
      }
      return TRUE;
  }
  
- 
      #elif defined( __linux ) // Compile under Linux 
  
--- 53,70 ----
          #include <windows.h>
  
! BOOL APIENTRY DllMain( HANDLE hModule, DWORD  ul_reason_for_call, LPVOID lpReserved )
  {
      switch ( ul_reason_for_call )
      {
!         case DLL_PROCESS_ATTACH :
!         case DLL_THREAD_ATTACH :
!         case DLL_THREAD_DETACH :
!         case DLL_PROCESS_DETACH :
              break;
      }
+ 
      return TRUE;
  }
  
      #elif defined( __linux ) // Compile under Linux 
  
***************
*** 104,108 ****
  static tm sstTM;
  static time_t stmTime = 0;
! static char scarrDate[ 23 ] = { 0 };
  
  void CTracer::Init( const char* tracefile, unsigned int pid )
--- 101,105 ----
  static tm sstTM;
  static time_t stmTime = 0;
! static char scarrDate[ 23 ] = { 0};
  
  void CTracer::Init( const char* tracefile, unsigned int pid )
***************
*** 126,131 ****
  
      sprintf( scarrDate, "%02d:%02d:%02d %02d.%02d.%04d : ", ptmLocaltime -> tm_hour,
!             ptmLocaltime -> tm_min, ptmLocaltime -> tm_sec,
!             ptmLocaltime -> tm_mday, ptmLocaltime -> tm_mon + 1, ptmLocaltime -> tm_year + 1900 );
  
      // Add datetime and pid prefix to traces filename
--- 123,128 ----
  
      sprintf( scarrDate, "%02d:%02d:%02d %02d.%02d.%04d : ", ptmLocaltime -> tm_hour,
!         ptmLocaltime -> tm_min, ptmLocaltime -> tm_sec,
!         ptmLocaltime -> tm_mday, ptmLocaltime -> tm_mon + 1, ptmLocaltime -> tm_year + 1900 );
  
      // Add datetime and pid prefix to traces filename
***************
*** 260,265 ****
                      } // if ( m_strTracesFilename.empty() )
  
!                     Init( m_strTracesFilename.empty() ? 
!                         TRACES_FILENAME : m_strTracesFilename.c_str(), pid );
  
                  } while ( 0 );
--- 257,261 ----
                      } // if ( m_strTracesFilename.empty() )
  
!                     Init( m_strTracesFilename.empty() ? TRACES_FILENAME : m_strTracesFilename.c_str(), pid );
  
                  } while ( 0 );
***************
*** 314,318 ****
  void CTracer::Output( void* )
  {
!     // Until we nee to stop
      while ( !m_bStop )
      {
--- 310,314 ----
  void CTracer::Output( void* )
  {
!     // Until we need to stop
      while ( !m_bStop )
      {
***************
*** 337,340 ****
--- 333,337 ----
                      //m_spOStrStream.reset( new std::ostringstream );
                  }
+ 
              } // if ( m_spOStrStream -> pcount() )
  
***************
*** 361,376 ****
      if ( stmTime != long_time )
      {
!     	stmTime = long_time;
  
!     	tm* ptmLocaltime = &sstTM;
  
!     	localtime_r( &stmTime, ptmLocaltime );
  
          sprintf( scarrDate, "%02d:%02d:%02d %02d.%02d.%04d : ", ptmLocaltime -> tm_hour,
!         		ptmLocaltime -> tm_min, ptmLocaltime -> tm_sec,
!         		ptmLocaltime -> tm_mday, ptmLocaltime -> tm_mon + 1, ptmLocaltime -> tm_year + 1900 );
          // End of block for obtaining current datetime
  
!     }
  
      m_spOStrStream << scarrDate << ForOutput << std::endl;
--- 358,373 ----
      if ( stmTime != long_time )
      {
!         stmTime = long_time;
  
!         tm* ptmLocaltime = &sstTM;
  
!         localtime_r( &stmTime, ptmLocaltime );
  
          sprintf( scarrDate, "%02d:%02d:%02d %02d.%02d.%04d : ", ptmLocaltime -> tm_hour,
!             ptmLocaltime -> tm_min, ptmLocaltime -> tm_sec,
!             ptmLocaltime -> tm_mday, ptmLocaltime -> tm_mon + 1, ptmLocaltime -> tm_year + 1900 );
          // End of block for obtaining current datetime
  
!     } // if ( stmTime != long_time )
  
      m_spOStrStream << scarrDate << ForOutput << std::endl;

Index: tracer.h
===================================================================
RCS file: /cvsroot/ipstream/IPSocket/Tracer/tracer.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** tracer.h	16 Mar 2010 06:34:02 -0000	1.4
--- tracer.h	19 Mar 2010 03:55:55 -0000	1.5
***************
*** 1,4 ****
  /////////////////////////////////////////////////////////////////////////////
! // File: TCPScanner.cpp
  /////////////////////////////////////////////////////////////////////////////           
  //                                                                                      
--- 1,4 ----
  /////////////////////////////////////////////////////////////////////////////
! // File: tracer.h
  /////////////////////////////////////////////////////////////////////////////           
  //