merge patched-debian/master into debian/master
Thorsten Alteholz
2 years ago
58 | 58 | */ |
59 | 59 | void ClearBuffer(char *data, int bytes) |
60 | 60 | { |
61 | register i; | |
61 | register int i; | |
62 | 62 | for(i = 0; i < bytes; data[i++] = 0); |
63 | 63 | } /* ClearBuffer */ |
64 | 64 | |
65 | 65 | /* |
66 | 66 | * Initialize a sweep buffer |
67 | 67 | */ |
68 | SweepBuffer_Init (struct tSweepBuffer *SweepBuffer, int bytesize) | |
68 | void SweepBuffer_Init (struct tSweepBuffer *SweepBuffer, int bytesize) | |
69 | 69 | { |
70 | 70 | SweepBuffer->bytepos = 0; |
71 | 71 | SweepBuffer->bitpos = 0; |
142 | 142 | void PrintSweep(char *buffer, char *header, int bytesize, int width, int leftmargin, FILE *out) |
143 | 143 | { |
144 | 144 | int bstart; |
145 | register i; | |
145 | register int i; | |
146 | 146 | /* Remove zeros and set a margin instead. Faster Printing. */ |
147 | 147 | bstart = ReduceBytes(buffer, BYTES_PER_COLUMN, &leftmargin, |
148 | 148 | &width, &bytesize); |
171 | 171 | */ |
172 | 172 | int LineSum(signed char line[], int length) |
173 | 173 | { |
174 | register i = 0; | |
174 | register int i = 0; | |
175 | 175 | while (i < length) |
176 | 176 | if(line[i++] != 0) return 1; |
177 | 177 | return 0; |
215 | 215 | { |
216 | 216 | |
217 | 217 | /* Get memory and clear it. */ |
218 | SweepBuffer_Init(&blkbuffer, blkbytesize); | |
218 | SweepBuffer_Init(&blkbuffer, blkbytesize * 2); | |
219 | 219 | for (i=0; i<COLOR_BUFFERS; i++) { |
220 | 220 | SweepBuffer_Init(&colbuffer[i], colbytesize); |
221 | 221 | colbuffer[i].bufpos = i; |
0 | 0 | # see git-dpm(1) from git-dpm package |
1 | 9b039767df21eecb2fd87f2906224a4bb7ff70f8 | |
2 | 9b039767df21eecb2fd87f2906224a4bb7ff70f8 | |
1 | 4ecf1da966003c485126e3bce6e18f5f4e795053 | |
2 | 4ecf1da966003c485126e3bce6e18f5f4e795053 | |
3 | 3 | ee18550dc32e4bf9a44b716929b6b406ab41486d |
4 | 4 | ee18550dc32e4bf9a44b716929b6b406ab41486d |
5 | 5 | c2050_0.3b.orig.tar.gz |
0 | From 4ecf1da966003c485126e3bce6e18f5f4e795053 Mon Sep 17 00:00:00 2001 | |
1 | From: Thorsten Alteholz <debian@alteholz.de> | |
2 | Date: Tue, 19 Oct 2021 19:10:58 +0000 | |
3 | Subject: avoid crash | |
4 | ||
5 | --- | |
6 | c2050.c | 10 +++++----- | |
7 | 1 file changed, 5 insertions(+), 5 deletions(-) | |
8 | ||
9 | diff --git a/c2050.c b/c2050.c | |
10 | index d2dc23c..d5bf91a 100644 | |
11 | --- a/c2050.c | |
12 | +++ b/c2050.c | |
13 | @@ -59,14 +59,14 @@ struct tSweepBuffer { | |
14 | */ | |
15 | void ClearBuffer(char *data, int bytes) | |
16 | { | |
17 | - register i; | |
18 | + register int i; | |
19 | for(i = 0; i < bytes; data[i++] = 0); | |
20 | } /* ClearBuffer */ | |
21 | ||
22 | /* | |
23 | * Initialize a sweep buffer | |
24 | */ | |
25 | -SweepBuffer_Init (struct tSweepBuffer *SweepBuffer, int bytesize) | |
26 | +void SweepBuffer_Init (struct tSweepBuffer *SweepBuffer, int bytesize) | |
27 | { | |
28 | SweepBuffer->bytepos = 0; | |
29 | SweepBuffer->bitpos = 0; | |
30 | @@ -143,7 +143,7 @@ int ReduceBytes(char *buffer, int bytespercolumn, | |
31 | void PrintSweep(char *buffer, char *header, int bytesize, int width, int leftmargin, FILE *out) | |
32 | { | |
33 | int bstart; | |
34 | - register i; | |
35 | + register int i; | |
36 | /* Remove zeros and set a margin instead. Faster Printing. */ | |
37 | bstart = ReduceBytes(buffer, BYTES_PER_COLUMN, &leftmargin, | |
38 | &width, &bytesize); | |
39 | @@ -172,7 +172,7 @@ void PrintSweep(char *buffer, char *header, int bytesize, int width, int leftmar | |
40 | */ | |
41 | int LineSum(signed char line[], int length) | |
42 | { | |
43 | - register i = 0; | |
44 | + register int i = 0; | |
45 | while (i < length) | |
46 | if(line[i++] != 0) return 1; | |
47 | return 0; | |
48 | @@ -216,7 +216,7 @@ void LexPrint(FILE *in, FILE *out) { | |
49 | { | |
50 | ||
51 | /* Get memory and clear it. */ | |
52 | - SweepBuffer_Init(&blkbuffer, blkbytesize); | |
53 | + SweepBuffer_Init(&blkbuffer, blkbytesize * 2); | |
54 | for (i=0; i<COLOR_BUFFERS; i++) { | |
55 | SweepBuffer_Init(&colbuffer[i], colbytesize); | |
56 | colbuffer[i].bufpos = i; |