summaryrefslogtreecommitdiff
path: root/editors/hte/files/patch-cstream.cc
blob: 4998254c2217f6e945b48e3f4ec580362f17b79c (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
--- cstream.cc.orig	Mon Jul  1 02:08:48 2002
+++ cstream.cc	Wed Aug  4 18:09:28 2004
@@ -115,12 +115,13 @@
 	return true;
 }
 
-UINT	ht_compressed_stream::read(void *buf, UINT size)
+UINT	ht_compressed_stream::read(void *aBuf, UINT size)
 {
 	UINT ssize = size;
+	byte *buf = (byte *)aBuf;
 	while (size >= bufferpos) {
 		memcpy(buf, buffer+buffersize-bufferpos, bufferpos);
-		((byte *)buf) += bufferpos;
+		buf += bufferpos;
 		size -= bufferpos;
 		bufferpos = 0;
 		if (size) {
@@ -134,13 +135,14 @@
 	return ssize;
 }
 
-UINT	ht_compressed_stream::write(const void *buf, UINT size)
+UINT	ht_compressed_stream::write(const void *aBuf, UINT size)
 {
 	UINT ssize = size;
+	const byte *buf = (const byte *)aBuf;
 	while (bufferpos+size >= buffersize) {
 		memcpy(buffer+bufferpos, buf, buffersize-bufferpos);
 		size -= buffersize-bufferpos;
-		((byte *)buf) += buffersize-bufferpos;
+		buf += buffersize-bufferpos;
 		bufferpos = buffersize;
 		if (size) {
 			if (!flush_compressed()) return ssize - size;