View | Details | Raw Unified | Return to bug 70114
Collapse All | Expand All

(-)editors/hte/files/patch-cstream.cc (+35 lines)
Line 0 Link Here
1 
--- cstream.cc.orig	Mon Jul  1 02:08:48 2002
2 
+++ cstream.cc	Wed Aug  4 18:09:28 2004
3 
@@ -115,12 +115,13 @@
4 
 	return true;
5 
 }
6
7 
-UINT	ht_compressed_stream::read(void *buf, UINT size)
8 
+UINT	ht_compressed_stream::read(void *aBuf, UINT size)
9 
 {
10 
 	UINT ssize = size;
11 
+	byte *buf = (byte *)aBuf;
12 
 	while (size >= bufferpos) {
13 
 		memcpy(buf, buffer+buffersize-bufferpos, bufferpos);
14 
-		((byte *)buf) += bufferpos;
15 
+		buf += bufferpos;
16 
 		size -= bufferpos;
17 
 		bufferpos = 0;
18 
 		if (size) {
19 
@@ -134,13 +135,14 @@
20 
 	return ssize;
21 
 }
22
23 
-UINT	ht_compressed_stream::write(const void *buf, UINT size)
24 
+UINT	ht_compressed_stream::write(const void *aBuf, UINT size)
25 
 {
26 
 	UINT ssize = size;
27 
+	const byte *buf = (const byte *)aBuf;
28 
 	while (bufferpos+size >= buffersize) {
29 
 		memcpy(buffer+bufferpos, buf, buffersize-bufferpos);
30 
 		size -= buffersize-bufferpos;
31 
-		((byte *)buf) += buffersize-bufferpos;
32 
+		buf += buffersize-bufferpos;
33 
 		bufferpos = buffersize;
34 
 		if (size) {
35 
 			if (!flush_compressed()) return ssize - size;
(-)editors/hte/files/patch-htle.cc (+46 lines)
Line 0 Link Here
1 
--- htle.cc.orig	Thu Oct 10 03:32:50 2002
2 
+++ htle.cc	Wed Aug  4 18:14:34 2004
3 
@@ -475,19 +475,20 @@
4 
 	return false;
5 
 }
6
7 
-UINT ht_le_page_file::read(void *buf, UINT size)
8 
+UINT ht_le_page_file::read(void *aBuf, UINT size)
9 
 {
10 
 	FILEOFS mofs;
11 
 	UINT msize;
12 
 	int c = 0;
13 
 	while (size) {
14 
 		UINT s = size;
15 
+		byte *buf = (byte *)aBuf;
16 
 		if (!map_ofs(ofs, &mofs, &msize)) break;
17 
 		if (s>msize) s = msize;
18 
 		streamfile->seek(mofs);
19 
 		s = streamfile->read(buf, s);
20 
 		if (!s) break;
21 
-		((byte*)buf) += s;
22 
+		buf += s;
23 
 		size -= s;
24 
 		c += s;
25 
 		ofs += s;
26 
@@ -546,17 +547,18 @@
27 
 	return ht_layer_streamfile::vcntl(cmd, vargs);
28 
 }
29
30 
-UINT ht_le_page_file::write(const void *buf, UINT size)
31 
+UINT ht_le_page_file::write(const void *aBuf, UINT size)
32 
 {
33 
 	FILEOFS mofs;
34 
 	UINT msize;
35 
 	int c = 0;
36 
 	while (size) {
37 
 		UINT s = size;
38 
+		const byte *buf = (const byte *)aBuf;
39 
 		if (!map_ofs(ofs, &mofs, &msize)) break;
40 
 		if (s>msize) s = msize;
41 
 		streamfile->seek(mofs);
42 
-		((byte*)buf) += streamfile->write(buf, s);
43 
+		buf += streamfile->write(buf, s);
44 
 		size -= s;
45 
 		c += s;
46 
 		ofs += s;
(-)editors/hte/files/patch-src::srt_x86.cc (+18 lines)
Line 0 Link Here
1 
--- srt/srt_x86.cc.orig	Mon Sep  2 02:05:13 2002
2 
+++ srt/srt_x86.cc	Wed Aug  4 17:53:58 2004
3 
@@ -60,13 +60,13 @@
4 
 		k = &cpu->flags[(idx-8) % X86_FLAGS];
5 
 		(*k)->done();
6 
 		delete *k;
7 
-		((Object*)*k) = o;
8 
+		k = (sym_bool **)o;
9 
 	} else {
10 
 		sym_int **k;
11 
 		k = &cpu->regs[idx & 7];
12 
 		(*k)->done();
13 
 		delete *k;
14 
-		((Object*)*k) = o;
15 
+		k = (sym_int **)o;
16 
 	}
17 
 }
18 

            






  

  Return to bug 70114