projects/aports·blob master · refs

371 lines · 12.1 KiB

1Patch-Source-1: https://core.tcl-lang.org/tcl/info/729ffb738f1c7936
2Patch-Source-2: https://core.tcl-lang.org/tk/info/28c359044f356c5b
3Patch-Source-3: https://github.com/chpock/tktable/commit/3a2de639485a9e07d5de360f8911bc55ccad9454
4
5--- a/src/gui/tcltk/tcl/generic/tclTomMathDecls.h
6+++ b/src/gui/tcltk/tcl/generic/tclTomMathDecls.h
7@@ -159,15 +159,15 @@ EXTERN void TclBN_mp_clear(mp_int *a);
8 /* 7 */
9 EXTERN void TclBN_mp_clear_multi(mp_int *a, ...);
10 /* 8 */
11-EXTERN int TclBN_mp_cmp(mp_int *a, mp_int *b);
12+EXTERN int TclBN_mp_cmp(const mp_int *a, const mp_int *b);
13 /* 9 */
14-EXTERN int TclBN_mp_cmp_d(mp_int *a, mp_digit b);
15+EXTERN int TclBN_mp_cmp_d(const mp_int *a, mp_digit b);
16 /* 10 */
17-EXTERN int TclBN_mp_cmp_mag(mp_int *a, mp_int *b);
18+EXTERN int TclBN_mp_cmp_mag(const mp_int *a, const mp_int *b);
19 /* 11 */
20-EXTERN int TclBN_mp_copy(mp_int *a, mp_int *b);
21+EXTERN int TclBN_mp_copy(const mp_int *a, mp_int *b);
22 /* 12 */
23-EXTERN int TclBN_mp_count_bits(mp_int *a);
24+EXTERN int TclBN_mp_count_bits(const mp_int *a);
25 /* 13 */
26 EXTERN int TclBN_mp_div(mp_int *a, mp_int *b, mp_int *q,
27 mp_int *r);
28@@ -177,7 +177,7 @@ EXTERN int TclBN_mp_div_d(mp_int *a, mp_digit b, mp_int *q,
29 /* 15 */
30 EXTERN int TclBN_mp_div_2(mp_int *a, mp_int *q);
31 /* 16 */
32-EXTERN int TclBN_mp_div_2d(mp_int *a, int b, mp_int *q,
33+EXTERN int TclBN_mp_div_2d(const mp_int *a, int b, mp_int *q,
34 mp_int *r);
35 /* 17 */
36 EXTERN int TclBN_mp_div_3(mp_int *a, mp_int *q, mp_digit *r);
37@@ -202,7 +202,7 @@ EXTERN int TclBN_mp_lshd(mp_int *a, int shift);
38 /* 27 */
39 EXTERN int TclBN_mp_mod(mp_int *a, mp_int *b, mp_int *r);
40 /* 28 */
41-EXTERN int TclBN_mp_mod_2d(mp_int *a, int b, mp_int *r);
42+EXTERN int TclBN_mp_mod_2d(const mp_int *a, int b, mp_int *r);
43 /* 29 */
44 EXTERN int TclBN_mp_mul(mp_int *a, mp_int *b, mp_int *p);
45 /* 30 */
46@@ -210,9 +210,9 @@ EXTERN int TclBN_mp_mul_d(mp_int *a, mp_digit b, mp_int *p);
47 /* 31 */
48 EXTERN int TclBN_mp_mul_2(mp_int *a, mp_int *p);
49 /* 32 */
50-EXTERN int TclBN_mp_mul_2d(mp_int *a, int d, mp_int *p);
51+EXTERN int TclBN_mp_mul_2d(const mp_int *a, int d, mp_int *p);
52 /* 33 */
53-EXTERN int TclBN_mp_neg(mp_int *a, mp_int *b);
54+EXTERN int TclBN_mp_neg(const mp_int *a, mp_int *b);
55 /* 34 */
56 EXTERN int TclBN_mp_or(mp_int *a, mp_int *b, mp_int *c);
57 /* 35 */
58@@ -278,7 +278,7 @@ EXTERN int TclBN_mp_init_set_int(mp_int *a, unsigned long i);
59 /* 62 */
60 EXTERN int TclBN_mp_set_int(mp_int *a, unsigned long i);
61 /* 63 */
62-EXTERN int TclBN_mp_cnt_lsb(mp_int *a);
63+EXTERN int TclBN_mp_cnt_lsb(const mp_int *a);
64
65 typedef struct TclTomMathStubs {
66 int magic;
67--- a/src/tommath/bn_mp_cmp.c
68+++ b/src/tommath/bn_mp_cmp.c
69@@ -17,7 +17,7 @@
70
71 /* compare two ints (signed)*/
72 int
73-mp_cmp (mp_int * a, mp_int * b)
74+mp_cmp (const mp_int * a, const mp_int * b)
75 {
76 /* compare based on sign */
77 if (a->sign != b->sign) {
78--- a/src/tommath/bn_mp_cmp_d.c
79+++ b/src/tommath/bn_mp_cmp_d.c
80@@ -16,7 +16,7 @@
81 */
82
83 /* compare a digit */
84-int mp_cmp_d(mp_int * a, mp_digit b)
85+int mp_cmp_d(const mp_int * a, mp_digit b)
86 {
87 /* compare based on sign */
88 if (a->sign == MP_NEG) {
89--- a/src/tommath/bn_mp_cmp_mag.c
90+++ b/src/tommath/bn_mp_cmp_mag.c
91@@ -16,7 +16,7 @@
92 */
93
94 /* compare maginitude of two ints (unsigned) */
95-int mp_cmp_mag (mp_int * a, mp_int * b)
96+int mp_cmp_mag (const mp_int * a, const mp_int * b)
97 {
98 int n;
99 mp_digit *tmpa, *tmpb;
100--- a/src/tommath/bn_mp_cnt_lsb.c
101+++ b/src/tommath/bn_mp_cnt_lsb.c
102@@ -20,7 +20,7 @@ static const int lnz[16] = {
103 };
104
105 /* Counts the number of lsbs which are zero before the first zero bit */
106-int mp_cnt_lsb(mp_int *a)
107+int mp_cnt_lsb(const mp_int *a)
108 {
109 int x;
110 mp_digit q, qq;
111--- a/src/tommath/bn_mp_copy.c
112+++ b/src/tommath/bn_mp_copy.c
113@@ -17,7 +17,7 @@
114
115 /* copy, b = a */
116 int
117-mp_copy (mp_int * a, mp_int * b)
118+mp_copy (const mp_int * a, mp_int * b)
119 {
120 int res, n;
121
122--- a/src/tommath/bn_mp_count_bits.c
123+++ b/src/tommath/bn_mp_count_bits.c
124@@ -17,7 +17,7 @@
125
126 /* returns the number of bits in an int */
127 int
128-mp_count_bits (mp_int * a)
129+mp_count_bits (const mp_int * a)
130 {
131 int r;
132 mp_digit q;
133--- a/src/tommath/bn_mp_div_2d.c
134+++ b/src/tommath/bn_mp_div_2d.c
135@@ -16,7 +16,7 @@
136 */
137
138 /* shift right by a certain bit count (store quotient in c, optional remainder in d) */
139-int mp_div_2d (mp_int * a, int b, mp_int * c, mp_int * d)
140+int mp_div_2d (const mp_int * a, int b, mp_int * c, mp_int * d)
141 {
142 mp_digit D, r, rr;
143 int x, res;
144--- a/src/tommath/bn_mp_mod_2d.c
145+++ b/src/tommath/bn_mp_mod_2d.c
146@@ -17,7 +17,7 @@
147
148 /* calc a value mod 2**b */
149 int
150-mp_mod_2d (mp_int * a, int b, mp_int * c)
151+mp_mod_2d (const mp_int * a, int b, mp_int * c)
152 {
153 int x, res;
154
155--- a/src/tommath/bn_mp_mul_2d.c
156+++ b/src/tommath/bn_mp_mul_2d.c
157@@ -16,7 +16,7 @@
158 */
159
160 /* shift left by a certain bit count */
161-int mp_mul_2d (mp_int * a, int b, mp_int * c)
162+int mp_mul_2d (const mp_int * a, int b, mp_int * c)
163 {
164 mp_digit d;
165 int res;
166--- a/src/tommath/bn_mp_neg.c
167+++ b/src/tommath/bn_mp_neg.c
168@@ -16,7 +16,7 @@
169 */
170
171 /* b = -a */
172-int mp_neg (mp_int * a, mp_int * b)
173+int mp_neg (const mp_int * a, mp_int * b)
174 {
175 int res;
176 if (a != b) {
177--- a/src/tommath/tommath.h
178+++ b/src/tommath/tommath.h
179@@ -241,7 +241,7 @@ int mp_init_set (mp_int * a, mp_digit b);
180 int mp_init_set_int (mp_int * a, unsigned long b);
181
182 /* copy, b = a */
183-int mp_copy(mp_int *a, mp_int *b);
184+int mp_copy(const mp_int *a, mp_int *b);
185
186 /* inits and copies, a = b */
187 int mp_init_copy(mp_int *a, mp_int *b);
188@@ -258,19 +258,19 @@ void mp_rshd(mp_int *a, int b);
189 int mp_lshd(mp_int *a, int b);
190
191 /* c = a / 2**b */
192-int mp_div_2d(mp_int *a, int b, mp_int *c, mp_int *d);
193+int mp_div_2d(const mp_int *a, int b, mp_int *c, mp_int *d);
194
195 /* b = a/2 */
196 int mp_div_2(mp_int *a, mp_int *b);
197
198 /* c = a * 2**b */
199-int mp_mul_2d(mp_int *a, int b, mp_int *c);
200+int mp_mul_2d(const mp_int *a, int b, mp_int *c);
201
202 /* b = a*2 */
203 int mp_mul_2(mp_int *a, mp_int *b);
204
205 /* c = a mod 2**d */
206-int mp_mod_2d(mp_int *a, int b, mp_int *c);
207+int mp_mod_2d(const mp_int *a, int b, mp_int *c);
208
209 /* computes a = 2**b */
210 int mp_2expt(mp_int *a, int b);
211@@ -296,16 +296,16 @@ int mp_and(mp_int *a, mp_int *b, mp_int *c);
212 /* ---> Basic arithmetic <--- */
213
214 /* b = -a */
215-int mp_neg(mp_int *a, mp_int *b);
216+int mp_neg(const mp_int *a, mp_int *b);
217
218 /* b = |a| */
219 int mp_abs(mp_int *a, mp_int *b);
220
221 /* compare a to b */
222-int mp_cmp(mp_int *a, mp_int *b);
223+int mp_cmp(const mp_int *a, const mp_int *b);
224
225 /* compare |a| to |b| */
226-int mp_cmp_mag(mp_int *a, mp_int *b);
227+int mp_cmp_mag(const mp_int *a, const mp_int *b);
228
229 /* c = a + b */
230 int mp_add(mp_int *a, mp_int *b, mp_int *c);
231@@ -328,7 +328,7 @@ int mp_mod(mp_int *a, mp_int *b, mp_int *c);
232 /* ---> single digit functions <--- */
233
234 /* compare against a single digit */
235-int mp_cmp_d(mp_int *a, mp_digit b);
236+int mp_cmp_d(const mp_int *a, mp_digit b);
237
238 /* c = a + b */
239 int mp_add_d(mp_int *a, mp_digit b, mp_int *c);
240@@ -517,7 +517,7 @@ int mp_prime_next_prime(mp_int *a, int t, int bbs_style);
241 int mp_prime_random_ex(mp_int *a, int t, int size, int flags, ltm_prime_callback cb, void *dat);
242
243 /* ---> radix conversion <--- */
244-int mp_count_bits(mp_int *a);
245+int mp_count_bits(const mp_int *a);
246
247 int mp_unsigned_bin_size(mp_int *a);
248 int mp_read_unsigned_bin(mp_int *a, const unsigned char *b, int c);
249--- a/src/gui/tcltk/tk/unix/tkUnixEvent.c
250+++ b/src/gui/tcltk/tk/unix/tkUnixEvent.c
251@@ -485,9 +485,9 @@ DisplayFileProc(
252 * nice (?!) message.
253 */
254
255- void (*oldHandler)();
256+ void (*oldHandler)(int);
257
258- oldHandler = (void (*)()) signal(SIGPIPE, SIG_IGN);
259+ oldHandler = (void (*)(int)) signal(SIGPIPE, SIG_IGN);
260 XNoOp(display);
261 XFlush(display);
262 (void) signal(SIGPIPE, oldHandler);
263--- a/src/gui/tcltk/tk/unix/tkUnixSelect.c
264+++ b/src/gui/tcltk/tk/unix/tkUnixSelect.c
265@@ -349,7 +349,7 @@ TkSelPropProc(
266 ((char *) buffer)[numItems] = 0;
267
268 errorHandler = Tk_CreateErrorHandler(eventPtr->xproperty.display,
269- -1, -1, -1, (int (*)()) NULL, NULL);
270+ -1, -1, -1, NULL, NULL);
271
272 /*
273 * Encode the data using the proper format for each type.
274@@ -810,7 +810,7 @@ ConvertSelection(
275 Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
276
277 errorHandler = Tk_CreateErrorHandler(eventPtr->display, -1, -1,-1,
278- (int (*)()) NULL, NULL);
279+ NULL, NULL);
280
281 /*
282 * Initialize the reply event.
283@@ -1056,7 +1056,7 @@ ConvertSelection(
284 }
285 Tcl_DeleteTimerHandler(incr.timeout);
286 errorHandler = Tk_CreateErrorHandler(winPtr->display,
287- -1, -1, -1, (int (*)()) NULL, NULL);
288+ -1, -1, -1, NULL, NULL);
289 XSelectInput(reply.xsel.display, reply.xsel.requestor, 0L);
290 Tk_DeleteErrorHandler(errorHandler);
291 if (tsdPtr->pendingIncrs == &incr) {
292--- a/src/gui/tcltk/tktable/generic/tkTable.h
293+++ b/src/gui/tcltk/tktable/generic/tkTable.h
294@@ -526,7 +526,7 @@ extern void Table_ClearHashTable(Tcl_HashTable *hashTblPtr);
295 extern int TableOptionBdSet(ClientData clientData,
296 Tcl_Interp *interp, Tk_Window tkwin,
297 CONST84 char *value, char *widgRec, int offset);
298-extern char * TableOptionBdGet(ClientData clientData,
299+extern const char * TableOptionBdGet(ClientData clientData,
300 Tk_Window tkwin, char *widgRec, int offset,
301 Tcl_FreeProc **freeProcPtr);
302 extern int TableTagConfigureBd(Table *tablePtr,
303@@ -535,7 +535,7 @@ extern int Cmd_OptionSet(ClientData clientData,
304 Tcl_Interp *interp,
305 Tk_Window unused, CONST84 char *value,
306 char *widgRec, int offset);
307-extern char * Cmd_OptionGet(ClientData clientData,
308+extern const char * Cmd_OptionGet(ClientData clientData,
309 Tk_Window unused, char *widgRec,
310 int offset, Tcl_FreeProc **freeProcPtr);
311
312--- a/src/gui/tcltk/tktable/generic/tkTableTag.c
313+++ b/src/gui/tcltk/tktable/generic/tkTableTag.c
314@@ -22,7 +22,7 @@ static void TableImageProc _ANSI_ARGS_((ClientData clientData, int x,
315 static int TableOptionReliefSet _ANSI_ARGS_((ClientData clientData,
316 Tcl_Interp *interp, Tk_Window tkwin,
317 CONST84 char *value, char *widgRec, int offset));
318-static char * TableOptionReliefGet _ANSI_ARGS_((ClientData clientData,
319+static const char * TableOptionReliefGet _ANSI_ARGS_((ClientData clientData,
320 Tk_Window tkwin, char *widgRec, int offset,
321 Tcl_FreeProc **freeProcPtr));
322
323@@ -1340,7 +1340,7 @@ TableOptionReliefSet(clientData, interp, tkwin, value, widgRec, offset)
324 *----------------------------------------------------------------------
325 */
326
327-static char *
328+static const char *
329 TableOptionReliefGet(clientData, tkwin, widgRec, offset, freeProcPtr)
330 ClientData clientData; /* Type of struct being set. */
331 Tk_Window tkwin; /* Window containing canvas widget. */
332--- a/src/gui/tcltk/tktable/generic/tkTableUtil.c
333+++ b/src/gui/tcltk/tktable/generic/tkTableUtil.c
334@@ -169,7 +169,7 @@ TableOptionBdSet(clientData, interp, tkwin, value, widgRec, offset)
335 *----------------------------------------------------------------------
336 */
337
338-char *
339+const char *
340 TableOptionBdGet(clientData, tkwin, widgRec, offset, freeProcPtr)
341 ClientData clientData; /* Type of struct being set. */
342 Tk_Window tkwin; /* Window containing canvas widget. */
343@@ -329,7 +329,7 @@ Cmd_OptionSet(ClientData clientData, Tcl_Interp *interp,
344 *----------------------------------------------------------------------
345 */
346
347-char *
348+const char *
349 Cmd_OptionGet(ClientData clientData, Tk_Window unused,
350 char *widgRec, int offset, Tcl_FreeProc **freeProcPtr)
351 {
352--- a/src/gui/tcltk/tktable/generic/tkTableWin.c
353+++ b/src/gui/tcltk/tktable/generic/tkTableWin.c
354@@ -17,7 +17,7 @@
355 static int StickyParseProc _ANSI_ARGS_((ClientData clientData,
356 Tcl_Interp *interp, Tk_Window tkwin,
357 CONST84 char *value, char *widgRec, int offset));
358-static char * StickyPrintProc _ANSI_ARGS_((ClientData clientData,
359+static const char * StickyPrintProc _ANSI_ARGS_((ClientData clientData,
360 Tk_Window tkwin, char *widgRec, int offset,
361 Tcl_FreeProc **freeProcPtr));
362
363@@ -117,7 +117,7 @@ static Tk_ConfigSpec winConfigSpecs[] = {
364 *
365 *----------------------------------------------------------------------
366 */
367-static char *
368+static const char *
369 StickyPrintProc(clientData, tkwin, widgRec, offset, freeProcPtr)
370 ClientData clientData; /* Ignored. */
371 Tk_Window tkwin; /* Window for text widget. */