From: <bo...@us...> - 2003-11-20 14:41:55
|
Update of /cvsroot/sharedaemon/core/src In directory sc8-pr-cvs1:/tmp/cvs-serv20068 Modified Files: ParseClass.cpp ParseClass.h Log Message: Corrected constness of buffer to Read methode Index: ParseClass.cpp =================================================================== RCS file: /cvsroot/sharedaemon/core/src/ParseClass.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- ParseClass.cpp 27 Oct 2003 18:20:57 -0000 1.5 +++ ParseClass.cpp 20 Nov 2003 14:41:11 -0000 1.6 @@ -269,7 +269,7 @@ int PClevel; -size_t ParseClass::IncrementalRead(u8 * buffer,size_t buffsize,size_t n) { +size_t ParseClass::IncrementalRead(const u8 * buffer,size_t buffsize,size_t n) { const struct parsestruct * ps; size_t i,done; u8 * dataptr; @@ -528,7 +528,7 @@ return done; } -bool ParseClass::Read(u8 * buffer,size_t buffsize) { +bool ParseClass::Read(const u8 * buffer,size_t buffsize) { size_t done; done=IncrementalRead(buffer,buffsize,1); @@ -539,8 +539,8 @@ if (done!=buffsize) { fprintf( stderr, - "%s:%s:%i: Warning: done!=buffsize: buffsize=%i, done=%i.\n" - ,__FILE__,__FUNCTION__,__LINE__,buffsize,done + "%s:%s:%i: Warning: done!=buffsize: buffsize=%u, done=%u.\n" + ,__FILE__,__FUNCTION__,__LINE__,(unsigned)buffsize,(unsigned)done ); } Index: ParseClass.h =================================================================== RCS file: /cvsroot/sharedaemon/core/src/ParseClass.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- ParseClass.h 26 Oct 2003 17:09:37 -0000 1.5 +++ ParseClass.h 20 Nov 2003 14:41:11 -0000 1.6 @@ -171,7 +171,7 @@ /* * Helper for the Read method. */ - size_t IncrementalRead(u8 * buffer,size_t buffsize,size_t n); + size_t IncrementalRead(const u8 * buffer,size_t buffsize,size_t n); /* * Get @@ -315,7 +315,7 @@ if (data) free(data); } - bool Read(u8 * buffer,size_t buffsize); + bool Read(const u8 * buffer,size_t buffsize); bool Read(FILE * file); bool Read(const char * filename); |