diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Fl_Preferences.cxx | 16 | ||||
| -rw-r--r-- | src/Fl_Text_Buffer.cxx | 6 |
2 files changed, 11 insertions, 11 deletions
diff --git a/src/Fl_Preferences.cxx b/src/Fl_Preferences.cxx index 3ca1a6d74..4c305ccd0 100644 --- a/src/Fl_Preferences.cxx +++ b/src/Fl_Preferences.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Preferences.cxx,v 1.1.2.9 2002/05/01 00:03:35 easysw Exp $" +// "$Id: Fl_Preferences.cxx,v 1.1.2.10 2002/05/03 20:30:19 easysw Exp $" // // Preferences methods for the Fast Light Tool Kit (FLTK). // @@ -43,7 +43,7 @@ #endif -char Fl_Preferences::nameBuffer[]; +char Fl_Preferences::nameBuffer[128]; /** @@ -56,7 +56,7 @@ char Fl_Preferences::nameBuffer[]; * Must be a valid file name. * example: Fl_Preferences base( Fl_Preferences::USER, "fltk.org", "test01"); */ -Fl_Preferences::Fl_Preferences( enum Root root, const char *vendor, const char *application ) +Fl_Preferences::Fl_Preferences( Root root, const char *vendor, const char *application ) { node = new Node( "." ); rootNode = new RootNode( this, root, vendor, application ); @@ -586,7 +586,7 @@ static char makePath( const char *path ) int ret = stat( path, &stats ); if ( ret ) { - char *s = strrchr( path, '/' ); + const char *s = strrchr( path, '/' ); if ( !s ) return 0; int len = s-path; char *p = (char*)malloc( len+1 ); @@ -606,7 +606,7 @@ static char makePath( const char *path ) // strip the filename and create a path static void makePathForFile( const char *path ) { - char *s = strrchr( path, '/' ); + const char *s = strrchr( path, '/' ); if ( !s ) return; int len = s-path; char *p = (char*)malloc( len+1 ); @@ -618,7 +618,7 @@ static void makePathForFile( const char *path ) // create the root node // - construct the name of the file that will hold our preferences -Fl_Preferences::RootNode::RootNode( Fl_Preferences *prefs, enum Root root, const char *vendor, const char *application ) +Fl_Preferences::RootNode::RootNode( Fl_Preferences *prefs, Root root, const char *vendor, const char *application ) { char filename[ FL_PATH_MAX ]; filename[0] = 0; #ifdef WIN32 @@ -928,7 +928,7 @@ void Fl_Preferences::Node::set( const char *line ) } else { - char *c = strchr( line, ':' ); + const char *c = strchr( line, ':' ); if ( c ) { strncpy( nameBuffer, line, c-line ); @@ -1084,5 +1084,5 @@ char Fl_Preferences::Node::remove() // -// End of "$Id: Fl_Preferences.cxx,v 1.1.2.9 2002/05/01 00:03:35 easysw Exp $". +// End of "$Id: Fl_Preferences.cxx,v 1.1.2.10 2002/05/03 20:30:19 easysw Exp $". // diff --git a/src/Fl_Text_Buffer.cxx b/src/Fl_Text_Buffer.cxx index 3fba90de1..fba4d4800 100644 --- a/src/Fl_Text_Buffer.cxx +++ b/src/Fl_Text_Buffer.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Text_Buffer.cxx,v 1.9.2.4 2002/04/11 11:52:41 easysw Exp $" +// "$Id: Fl_Text_Buffer.cxx,v 1.9.2.5 2002/05/03 20:30:19 easysw Exp $" // // Copyright 2001-2002 by Bill Spitzak and others. // Original code Copyright Mark Edel. Permission to distribute under @@ -364,7 +364,7 @@ void Fl_Text_Buffer::replace_rectangular( int start, int end, int rectStart, int rectEnd, const char *text ) { char *insPtr; const char *deletedText; - char *insText = ""; + char *insText = (char *)""; int i, nInsertedLines, nDeletedLines, insLen, hint; int insertDeleted, insertInserted, deleteInserted; int linesPadded = 0; @@ -2285,5 +2285,5 @@ Fl_Text_Buffer::outputfile(const char *file, int start, int end, int buflen) { // -// End of "$Id: Fl_Text_Buffer.cxx,v 1.9.2.4 2002/04/11 11:52:41 easysw Exp $". +// End of "$Id: Fl_Text_Buffer.cxx,v 1.9.2.5 2002/05/03 20:30:19 easysw Exp $". // |