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
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
|
$NetBSD: patch-ac,v 1.2 2004/04/01 00:52:39 minskim Exp $
--- cal_tcl.C.orig 2000-06-30 08:23:29.000000000 -0500
+++ cal_tcl.C
@@ -16,6 +16,9 @@
#include "calfile.h"
#include "uid.h"
+static char One[2] = "1";
+static char Zero[2] = "0";
+
implementArray(FileList,CalFile*)
Calendar_Tcl::Calendar_Tcl(Tcl_Interp* tcl, char const* h, char const* f)
@@ -192,27 +195,27 @@ void Calendar_Tcl::add_error(char const*
/*
* Forward declaration of handler procedures.
*/
-static int cal_delete (ClientData, Tcl_Interp*, int, char*[]);
-static int cal_main (ClientData, Tcl_Interp*, int, char*[]);
-static int cal_include (ClientData, Tcl_Interp*, int, char*[]);
-static int cal_exclude (ClientData, Tcl_Interp*, int, char*[]);
-static int cal_forincs (ClientData, Tcl_Interp*, int, char*[]);
-static int cal_add (ClientData, Tcl_Interp*, int, char*[]);
-static int cal_remove (ClientData, Tcl_Interp*, int, char*[]);
-static int cal_hide (ClientData, Tcl_Interp*, int, char*[]);
-static int cal_ronly (ClientData, Tcl_Interp*, int, char*[]);
-static int cal_dirty (ClientData, Tcl_Interp*, int, char*[]);
-static int cal_stale (ClientData, Tcl_Interp*, int, char*[]);
-static int cal_save (ClientData, Tcl_Interp*, int, char*[]);
-static int cal_reread (ClientData, Tcl_Interp*, int, char*[]);
-static int cal_query (ClientData, Tcl_Interp*, int, char*[]);
-static int cal_listing (ClientData, Tcl_Interp*, int, char*[]);
-static int cal_loop (ClientData, Tcl_Interp*, int, char*[]);
-static int cal_incal (ClientData, Tcl_Interp*, int, char*[]);
-static int cal_option (ClientData, Tcl_Interp*, int, char*[]);
-static int cal_doption (ClientData, Tcl_Interp*, int, char*[]);
-static int cal_loopf (ClientData, Tcl_Interp*, int, char*[]);
-static int cal_loopb (ClientData, Tcl_Interp*, int, char*[]);
+static int cal_delete (ClientData, Tcl_Interp*, int, const char*[]);
+static int cal_main (ClientData, Tcl_Interp*, int, const char*[]);
+static int cal_include (ClientData, Tcl_Interp*, int, const char*[]);
+static int cal_exclude (ClientData, Tcl_Interp*, int, const char*[]);
+static int cal_forincs (ClientData, Tcl_Interp*, int, const char*[]);
+static int cal_add (ClientData, Tcl_Interp*, int, const char*[]);
+static int cal_remove (ClientData, Tcl_Interp*, int, const char*[]);
+static int cal_hide (ClientData, Tcl_Interp*, int, const char*[]);
+static int cal_ronly (ClientData, Tcl_Interp*, int, const char*[]);
+static int cal_dirty (ClientData, Tcl_Interp*, int, const char*[]);
+static int cal_stale (ClientData, Tcl_Interp*, int, const char*[]);
+static int cal_save (ClientData, Tcl_Interp*, int, const char*[]);
+static int cal_reread (ClientData, Tcl_Interp*, int, const char*[]);
+static int cal_query (ClientData, Tcl_Interp*, int, const char*[]);
+static int cal_listing (ClientData, Tcl_Interp*, int, const char*[]);
+static int cal_loop (ClientData, Tcl_Interp*, int, const char*[]);
+static int cal_incal (ClientData, Tcl_Interp*, int, const char*[]);
+static int cal_option (ClientData, Tcl_Interp*, int, const char*[]);
+static int cal_doption (ClientData, Tcl_Interp*, int, const char*[]);
+static int cal_loopf (ClientData, Tcl_Interp*, int, const char*[]);
+static int cal_loopb (ClientData, Tcl_Interp*, int, const char*[]);
static Dispatch_Entry calendar_dispatch[] = {
{ "delete", 0, 0, cal_delete },
@@ -243,7 +246,7 @@ static Dispatch_Entry calendar_dispatch[
// query operations.
static int parse_items(Tcl_Interp* tcl, Calendar_Tcl* cal, ItemList& items,
- int& argc, char**& argv)
+ int& argc, const char**& argv)
{
// modifies items, argc, argv
// effects If "argc/argv" starts with "-all", then strips off
@@ -282,7 +285,7 @@ static int parse_items(Tcl_Interp* tcl,
if ((argc >= 2) && (strcmp(argv[0], "-items") == 0)) {
int count;
- char** list;
+ const char** list;
if (Tcl_SplitList(tcl, argv[1], &count, &list) != TCL_OK) {
TCL_Error(tcl, "invalid item list");
}
@@ -309,23 +312,23 @@ static int parse_items(Tcl_Interp* tcl,
return TCL_OK;
}
-int Calendar_Tcl::method(int argc, char* argv[]) {
+int Calendar_Tcl::method(int argc, const char* argv[]) {
return Dispatch(calendar_dispatch, (ClientData)this, tcl(), argc, argv);
}
-static int cal_delete(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){
+static int cal_delete(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]){
Calendar_Tcl* cal = (Calendar_Tcl*) c;
delete cal;
TCL_Return(tcl, "");
}
-static int cal_main(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){
+static int cal_main(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]){
Calendar_Tcl* cal = (Calendar_Tcl*) c;
TCL_Return(tcl, (char*) cal->main->GetName());
}
-static int cal_include(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){
+static int cal_include(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]){
Calendar_Tcl* cal = (Calendar_Tcl*) c;
if (cal->main->GetCalendar()->ReadOnly()) {
@@ -348,7 +351,7 @@ static int cal_include(ClientData c, Tcl
TCL_Return(tcl, "");
}
-static int cal_exclude(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){
+static int cal_exclude(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]){
Calendar_Tcl* cal = (Calendar_Tcl*) c;
if (cal->main->GetCalendar()->ReadOnly()) {
@@ -381,11 +384,11 @@ static int cal_exclude(ClientData c, Tcl
TCL_Error(tcl, "no such calendar");
}
-static int cal_forincs(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){
+static int cal_forincs(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]){
Calendar_Tcl* cal = (Calendar_Tcl*) c;
- char* var = argv[0];
- char* body = argv[1];
+ const char* var = argv[0];
+ const char* body = argv[1];
for (int i = 0; i < cal->includes->size(); i++) {
if (Tcl_SetVar(tcl, var, (char*) (cal->includes->slot(i)->GetName()),
0) == NULL) {
@@ -401,7 +404,7 @@ static int cal_forincs(ClientData c, Tcl
TCL_Return(tcl, "");
}
-static int cal_add(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){
+static int cal_add(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]){
Calendar_Tcl* cal = (Calendar_Tcl*) c;
// Find item
@@ -444,7 +447,7 @@ static int cal_add(ClientData c, Tcl_Int
TCL_Return(tcl, "");
}
-static int cal_remove(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){
+static int cal_remove(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]){
Calendar_Tcl* cal = (Calendar_Tcl*) c;
// Find item
@@ -471,7 +474,7 @@ static int cal_remove(ClientData c, Tcl_
TCL_Return(tcl, "");
}
-static int cal_hide(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){
+static int cal_hide(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]){
Calendar_Tcl* cal = (Calendar_Tcl*) c;
// Find item
@@ -509,7 +512,7 @@ static int cal_hide(ClientData c, Tcl_In
TCL_Return(tcl, "");
}
-static int cal_ronly(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){
+static int cal_ronly(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]){
Calendar_Tcl* cal = (Calendar_Tcl*) c;
CalFile* file = cal->name2file(argv[0]);
@@ -517,10 +520,10 @@ static int cal_ronly(ClientData c, Tcl_I
TCL_Error(tcl, "no such calendar");
}
- TCL_Return(tcl, file->GetCalendar()->ReadOnly() ? "1" : "0");
+ TCL_Return(tcl, file->GetCalendar()->ReadOnly() ? One : Zero);
}
-static int cal_dirty(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){
+static int cal_dirty(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]){
Calendar_Tcl* cal = (Calendar_Tcl*) c;
CalFile* file = cal->name2file(argv[0]);
@@ -528,10 +531,10 @@ static int cal_dirty(ClientData c, Tcl_I
TCL_Error(tcl, "no such calendar");
}
- TCL_Return(tcl, (file->IsModified() ? "1" : "0"));
+ TCL_Return(tcl, (file->IsModified() ? One : Zero));
}
-static int cal_stale(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){
+static int cal_stale(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]){
Calendar_Tcl* cal = (Calendar_Tcl*) c;
CalFile* file = cal->name2file(argv[0]);
@@ -539,10 +542,10 @@ static int cal_stale(ClientData c, Tcl_I
TCL_Error(tcl, "no such calendar");
}
- TCL_Return(tcl, (file->FileHasChanged() ? "1" : "0"));
+ TCL_Return(tcl, (file->FileHasChanged() ? One : Zero));
}
-static int cal_save(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){
+static int cal_save(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]){
Calendar_Tcl* cal = (Calendar_Tcl*) c;
CalFile* file = cal->name2file(argv[0]);
@@ -561,7 +564,7 @@ static int cal_save(ClientData c, Tcl_In
TCL_Return(tcl, "");
}
-static int cal_reread(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){
+static int cal_reread(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]){
Calendar_Tcl* cal = (Calendar_Tcl*) c;
CalFile* file = cal->name2file(argv[0]);
@@ -602,7 +605,7 @@ static int cal_reread(ClientData c, Tcl_
// If "body" says "continue", move to the next iteration
static int item_loop(Tcl_Interp* tcl, Occurrences const& list,
- char* ivar, char* dvar, char* body) {
+ const char* ivar, const char* dvar, const char* body) {
for (int i = 0; i < list.size(); i++) {
if (Tcl_SetVar(tcl, ivar, (char*) list[i].item->handle(), 0) == NULL) {
TCL_Error(tcl, "could not set loop variable");
@@ -624,7 +627,7 @@ static int item_loop(Tcl_Interp* tcl, Oc
TCL_Return(tcl, "");
}
-static int cal_query(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){
+static int cal_query(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]){
Calendar_Tcl* cal = (Calendar_Tcl*) c;
ItemList items;
@@ -651,7 +654,7 @@ static int cal_query(ClientData c, Tcl_I
return (item_loop(tcl, list, argv[2], argv[3], argv[4]));
}
-static int cal_loopf(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){
+static int cal_loopf(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]){
Calendar_Tcl* cal = (Calendar_Tcl*) c;
ItemList items;
@@ -718,7 +721,7 @@ static int cal_loopf(ClientData c, Tcl_I
TCL_Return(tcl, "");
}
-static int cal_loopb(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){
+static int cal_loopb(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]){
Calendar_Tcl* cal = (Calendar_Tcl*) c;
ItemList items;
@@ -785,7 +788,7 @@ static int cal_loopb(ClientData c, Tcl_I
TCL_Return(tcl, "");
}
-static int cal_listing(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){
+static int cal_listing(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]){
Calendar_Tcl* cal = (Calendar_Tcl*) c;
ItemList items;
@@ -812,7 +815,7 @@ static int cal_listing(ClientData c, Tcl
return (item_loop(tcl, list, argv[2], argv[3], argv[4]));
}
-static int cal_loop(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){
+static int cal_loop(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]){
Calendar_Tcl* cal = (Calendar_Tcl*) c;
ItemList items;
@@ -838,7 +841,7 @@ static int cal_loop(ClientData c, Tcl_In
return (item_loop(tcl, list, argv[0], 0, argv[1]));
}
-static int cal_incal(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){
+static int cal_incal(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]){
Calendar_Tcl* cal = (Calendar_Tcl*) c;
CalFile* file = cal->name2file(argv[0]);
@@ -868,7 +871,7 @@ static int cal_incal(ClientData c, Tcl_I
return (item_loop(tcl, list, argv[1], 0, argv[2]));
}
-static int cal_option(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]) {
+static int cal_option(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]) {
Calendar_Tcl* cal = (Calendar_Tcl*) c;
CalFile* file = cal->main;
@@ -899,7 +902,7 @@ static int cal_option(ClientData c, Tcl_
TCL_Return(tcl, "");
}
-static int cal_doption(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]) {
+static int cal_doption(ClientData c, Tcl_Interp* tcl, int argc, const char* argv[]) {
Calendar_Tcl* cal = (Calendar_Tcl*) c;
CalFile* file = cal->main;
|
