Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Nov 2, 2008, 12:22:42 AM (16 years ago)
Author:
rgrieder
Message:

Merged r2101 (objecthierarchy) to trunk.

Location:
code/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • code/trunk

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • code/trunk/src/util

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • code/trunk/src/util/SignalHandler.cc

    • Property svn:mergeinfo changed (with no actual effect on merging)
    r2087 r2103  
    5858 * register signal handlers for SIGSEGV and SIGABRT
    5959 * @param appName path to executable eg argv[0]
    60  * @param fileName filename to append backtrace to
    61  */
    62 void SignalHandler::doCatch( const std::string & appName, const std::string & fileName )
     60 * @param filename filename to append backtrace to
     61 */
     62void SignalHandler::doCatch( const std::string & appName, const std::string & filename )
    6363{
    6464  this->appName = appName;
    65   this->fileName = fileName;
     65  this->filename = filename;
    6666
    6767  // prepare for restoring XAutoKeyRepeat
     
    326326  bt.insert(0, timeString);
    327327
    328   FILE * f = fopen( getInstance()->fileName.c_str(), "a" );
     328  FILE * f = fopen( getInstance()->filename.c_str(), "a" );
    329329
    330330  if ( !f )
    331331  {
    332     perror( ( std::string( "could not append to " ) + getInstance()->fileName ).c_str() );
     332    perror( ( std::string( "could not append to " ) + getInstance()->filename ).c_str() );
    333333    exit(EXIT_FAILURE);
    334334  }
     
    336336  if ( fwrite( bt.c_str(), 1, bt.length(), f ) != bt.length() )
    337337  {
    338     COUT(0) << "could not write " << bt.length() << " byte to " << getInstance()->fileName << std::endl;
     338    COUT(0) << "could not write " << bt.length() << " byte to " << getInstance()->filename << std::endl;
    339339    exit(EXIT_FAILURE);
    340340  }
Note: See TracChangeset for help on using the changeset viewer.