(file) Return to SystemUnix.cpp CVS log (file) (dir) Up to [Pegasus] / pegasus / src / Pegasus / Common

Diff for /pegasus/src/Pegasus/Common/SystemUnix.cpp between version 1.30 and 1.34

version 1.30, 2002/03/21 18:49:58 version 1.34, 2002/05/10 02:56:08
Line 76 
Line 76 
 { {
     timeval tv;     timeval tv;
     gettimeofday(&tv, 0);     gettimeofday(&tv, 0);
     seconds = int(tv.tv_sec);      seconds = Uint32(tv.tv_sec);
     milliseconds = int(tv.tv_usec) / 1000;      milliseconds = Uint32(tv.tv_usec) / 1000;
 } }
  
 String System::getCurrentASCIITime() String System::getCurrentASCIITime()
Line 86 
Line 86 
     time_t  rawTime;     time_t  rawTime;
  
     time(&rawTime);     time(&rawTime);
     strftime(str, 40,"%T-%D", localtime(&rawTime));      strftime(str, 40,"%m/%d/%Y-%T", localtime(&rawTime));
     String time = str;     String time = str;
     return time;     return time;
 } }
Line 178 
Line 178 
     void* handle = shl_load(fileName, BIND_IMMEDIATE | DYNAMIC_PATH, 0L);     void* handle = shl_load(fileName, BIND_IMMEDIATE | DYNAMIC_PATH, 0L);
  
     Tracer::trace(TRC_OS_ABSTRACTION, Tracer::LEVEL2,     Tracer::trace(TRC_OS_ABSTRACTION, Tracer::LEVEL2,
                   "After loading lib %s, error code is %d", fileName, errno);                    "After loading lib %s, error code is %d", fileName,
                     (handle == (void *)0)?errno:0);
  
     PEG_FUNC_EXIT(TRC_OS_ABSTRACTION, METHOD_NAME);     PEG_FUNC_EXIT(TRC_OS_ABSTRACTION, METHOD_NAME);
     return DynamicLibraryHandle(handle);     return DynamicLibraryHandle(handle);
Line 205 
Line 206 
 #ifdef PEGASUS_OS_HPUX #ifdef PEGASUS_OS_HPUX
     // Note: shl_unload will unload the library even if it has been loaded     // Note: shl_unload will unload the library even if it has been loaded
     // multiple times.  No reference count is kept.     // multiple times.  No reference count is kept.
     int ignored = shl_unload(shl_t(libraryHandle));      int ignored = shl_unload(reinterpret_cast<shl_t>(libraryHandle));
 #endif #endif
 } }
  
Line 232 
Line 233 
     char* p = (char*)symbolName;     char* p = (char*)symbolName;
     void* proc = 0;     void* proc = 0;
  
     if (shl_findsym((shl_t*)&libraryHandle, p, TYPE_UNDEFINED, &proc) == 0)      if (shl_findsym((shl_t*)&libraryHandle, symbolName, TYPE_UNDEFINED,
                       &proc) == 0)
       {
         return DynamicSymbolHandle(proc);         return DynamicSymbolHandle(proc);
       }
  
     p = strcpy(new char[strlen(symbolName) + 2], symbolName);      ArrayDestroyer<char> _p((String("_") + symbolName).allocateCString());
     strcpy(p, "_");      if (shl_findsym((shl_t*)libraryHandle, _p.getPointer(), TYPE_UNDEFINED,
     strcat(p, symbolName);                      &proc) == 0)
   
     if (shl_findsym((shl_t*)libraryHandle, p, TYPE_UNDEFINED, &proc) == 0)  
     {     {
         delete [] p;  
         return DynamicSymbolHandle(proc);         return DynamicSymbolHandle(proc);
     }     }
  

Legend:
Removed from v.1.30  
changed lines
  Added in v.1.34
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2