X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ffilexml.h;h=af45e3088bd8adde783af10b37ed613fae204d14;hb=c279e21fc2394a7908bbd1ba8c79b116fe9fb14a;hp=c6506f02d8e108ed030afbde35d33959a1e3ca2c;hpb=8de624882f93013542044d4ad39c3f6e2f77d752;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/filexml.h b/cinelerra-5.1/cinelerra/filexml.h
index c6506f02..af45e308 100644
--- a/cinelerra-5.1/cinelerra/filexml.h
+++ b/cinelerra-5.1/cinelerra/filexml.h
@@ -38,10 +38,10 @@ class XMLBuffer
 	unsigned char *inp, *outp, *bfr, *lmt;
 	int destroy;
 
-	unsigned char *&demand(long len);
+	int demand(long len);
 public:
 	XMLBuffer(long buf_size=0x1000, long max_size=LONG_MAX, int del=1);
-	XMLBuffer(long buf_size, const char *buf, int del=0); // writing
+	XMLBuffer(long buf_size, char *buf, int del=0); // writing
 	XMLBuffer(const char *buf, long buf_size, int del=0); // reading
 	~XMLBuffer();
 
@@ -56,10 +56,7 @@ public:
 
 	int cur()  { return outp>=inp ? -1 : *outp; }
 	int next() { return outp>=inp ? -1 : *outp++; }
-	int next(int ch) {
-		demand(otell()+1);
-		return *inp++ = ch;
-	}
+	int next(int ch) { return !demand(otell()+1) ? -1 : *inp++ = ch; }
 
 	static char *decode_data(char *bp, const char *sp, int n=-1);
 	static char *encode_data(char *bp, const char *sp, int n=-1);