X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Fmemory-stream.cc;h=c72eb53947a6b9c549368cf77d575b9bfb0d0e1e;hb=6f6ea6500252a574985dd7550e7f01a84827cdd7;hp=4ea43c214969a1462cab85a834224a644333292a;hpb=a6bd229f7fe1dc4a03478e14ccc0c0c66b225061;p=lilypond.git diff --git a/flower/memory-stream.cc b/flower/memory-stream.cc index 4ea43c2149..c72eb53947 100644 --- a/flower/memory-stream.cc +++ b/flower/memory-stream.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 2005--2010 Han-Wen Nienhuys + Copyright (C) 2005--2011 Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -31,7 +31,8 @@ const int Memory_out_stream::block_size_ = 1024; lily_cookie_io_functions_t Memory_out_stream::functions_ -= { += +{ Memory_out_stream::reader, Memory_out_stream::writer, Memory_out_stream::seeker, @@ -87,8 +88,8 @@ Memory_out_stream::get_string () const ssize_t Memory_out_stream::writer (void *cookie, - char const *buffer, - size_t size) + char const *buffer, + size_t size) { Memory_out_stream *stream = (Memory_out_stream *) cookie; @@ -104,7 +105,7 @@ Memory_out_stream::writer (void *cookie, if (change) stream->buffer_ = (char *) realloc (stream->buffer_, - stream->buffer_blocks_ * block_size_); + stream->buffer_blocks_ * block_size_); memcpy (stream->buffer_ + stream->size_, buffer, size); stream->size_ = newsize; @@ -114,8 +115,8 @@ Memory_out_stream::writer (void *cookie, ssize_t Memory_out_stream::reader (void * /* cookie */, - char * /* buffer */, - size_t /* size */) + char * /* buffer */, + size_t /* size */) { assert (false); return 0; @@ -123,8 +124,8 @@ Memory_out_stream::reader (void * /* cookie */, int Memory_out_stream::seeker (void *, - off64_t *, - int) + off64_t *, + int) { assert (false); return 0;