diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2003-01-12 14:49:33 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2003-01-12 14:49:33 +0000 |
| commit | 24455b9be53b712e6b1145612ebcbfb302ec1174 (patch) | |
| tree | c7ec1a8f198e9c65612908beacd36d2f45a39344 /src/Fl_Text_Buffer.cxx | |
| parent | d43b146df3dc86053e111da818620f35873824bf (diff) | |
Fix use of free() for memory allocated using new.
Fix error messages to use Fl::error() instead of fprintf().
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2898 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl_Text_Buffer.cxx')
| -rw-r--r-- | src/Fl_Text_Buffer.cxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/Fl_Text_Buffer.cxx b/src/Fl_Text_Buffer.cxx index ffc30beba..e672ebf77 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.15 2002/11/12 22:48:36 matthiaswm Exp $" +// "$Id: Fl_Text_Buffer.cxx,v 1.9.2.16 2003/01/12 14:49:33 easysw Exp $" // // Copyright 2001-2002 by Bill Spitzak and others. // Original code Copyright Mark Edel. Permission to distribute under @@ -130,12 +130,12 @@ Fl_Text_Buffer::Fl_Text_Buffer( int requestedSize ) { Fl_Text_Buffer::~Fl_Text_Buffer() { free( mBuf ); if ( mNModifyProcs != 0 ) { - free( ( void * ) mNodifyProcs ); - free( ( void * ) mCbArgs ); + delete[] mNodifyProcs; + delete[] mCbArgs; } if ( mNPredeleteProcs != 0 ) { - free( ( void * ) mPredeleteProcs ); - free( ( void * ) mPredeleteCbArgs ); + delete[] mPredeleteProcs; + delete[] mPredeleteCbArgs; } } @@ -400,7 +400,7 @@ void Fl_Text_Buffer::insert_column( int column, int startPos, const char *s, insert_column_( column, lineStartPos, s, &insertDeleted, &nInserted, &mCursorPosHint ); if ( nDeleted != insertDeleted ) - fprintf( stderr, "internal consistency check ins1 failed" ); + Fl::error("Fl_Text_Buffer::insert_column(): internal consistency check ins1 failed"); call_modify_callbacks( lineStartPos, nDeleted, nInserted, 0, deletedText ); free( (void *) deletedText ); if ( charsInserted != NULL ) @@ -429,7 +429,7 @@ void Fl_Text_Buffer::overlay_rectangular( int startPos, int rectStart, overlay_rectangular_( lineStartPos, rectStart, rectEnd, s, &insertDeleted, &nInserted, &mCursorPosHint ); if ( nDeleted != insertDeleted ) - fprintf( stderr, "internal consistency check ovly1 failed" ); + Fl::error("Fl_Text_Buffer::overlay_rectangle(): internal consistency check ovly1 failed"); call_modify_callbacks( lineStartPos, nDeleted, nInserted, 0, deletedText ); free( (void *) deletedText ); if ( charsInserted != NULL ) @@ -491,7 +491,7 @@ void Fl_Text_Buffer::replace_rectangular( int start, int end, int rectStart, /* Figure out how many chars were inserted and call modify callbacks */ if ( insertDeleted != deleteInserted + linesPadded ) - fprintf( stderr, "NEdit: internal consistency check repl1 failed\n" ); + Fl::error("Fl_Text_Buffer::replace_rectangular(): internal consistency check repl1 failed"); call_modify_callbacks( start, end - start, insertInserted, 0, deletedText ); free( (void *) deletedText ); if ( nInsertedLines < nDeletedLines ) @@ -749,7 +749,7 @@ void Fl_Text_Buffer::remove_modify_callback( Fl_Text_Modify_Cb bufModifiedCB, } } if ( toRemove == -1 ) { - fprintf( stderr, "Internal Error: Can't find modify CB to remove\n" ); + Fl::error("Fl_Text_Buffer::remove_modify_callback(): Can't find modify CB to remove"); return; } @@ -823,7 +823,7 @@ void Fl_Text_Buffer::remove_predelete_callback( } } if (toRemove == -1) { - fprintf(stderr, "Internal Error: Can't find pre-delete CB to remove\n"); + Fl::error("Fl_Text_Buffer::remove_predelete_callback(): Can't find pre-delete CB to remove"); return; } @@ -2509,5 +2509,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.15 2002/11/12 22:48:36 matthiaswm Exp $". +// End of "$Id: Fl_Text_Buffer.cxx,v 1.9.2.16 2003/01/12 14:49:33 easysw Exp $". // |
