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
|
Description: fix compiler warnings
Author: Giulio Paci <giuliopaci@gmail.com>
Forwarded: yes
Last-Update: 2013-11-27
--- a/src/axis.c
+++ b/src/axis.c
@@ -131,11 +131,11 @@
/* Prototypes (C ANSI pour l'instant) */
int AxisCmd( ClientData clientData, Tcl_Interp *interp,
- int argc, char *argv[]);
+ int argc, const char *argv[]);
static int AxisInstanceCmd(ClientData clientData, Tcl_Interp *interp,
- int argc, char *argv[]);
+ int argc, const char *argv[]);
static int AxisConfigure( Tcl_Interp *interp, Axis *axisPtr,
- int argc, char *argv[], int flags);
+ int argc, const char *argv[], int flags);
static void AxisDisplay(ClientData clientData);
static void AxisEventProc(ClientData clientData, XEvent *eventPtr);
static void AxisDestroy(char *blockPtr);
@@ -161,12 +161,12 @@
/* Widget class command */
int AxisCmd( ClientData clientData, Tcl_Interp *interp,
- int argc, char *argv[])
+ int argc, const char *argv[])
{
Tk_Window main = (Tk_Window) clientData;
Axis *axisPtr;
Tk_Window tkwin;
- static TkClassProcs AxisProcs = { NULL, AxisWorldChanged, NULL};
+ static TkClassProcs AxisProcs = { 0, AxisWorldChanged, NULL, NULL};
/* Cree une fenetre */
if (argc < 2) {
@@ -228,7 +228,7 @@
/* Widget instance command */
int AxisInstanceCmd(ClientData clientData, Tcl_Interp *interp,
- int argc, char *argv[])
+ int argc, const char *argv[])
{
Axis *axisPtr = (Axis *)clientData;
int len;
@@ -301,7 +301,7 @@
/* Widget (re)configuration */
int AxisConfigure( Tcl_Interp *interp, Axis *a,
- int argc, char *argv[], int flags)
+ int argc, const char *argv[], int flags)
{
double stepUnits, nbUnits;
Tk_TextLayout layout;
--- a/src/segmt.c
+++ b/src/segmt.c
@@ -177,26 +177,26 @@
/* Prototypes (C ANSI pour l'instant) */
int SegmtCmd( ClientData clientData, Tcl_Interp *interp,
- int argc, char *argv[]);
+ int argc, const char *argv[]);
static int SegmtInstanceCmd(ClientData clientData, Tcl_Interp *interp,
- int argc, char *argv[]);
+ int argc, const char *argv[]);
static int SegmtConfigure( Tcl_Interp *interp, Segmt *segmtPtr,
- int argc, char *argv[], int flags);
+ int argc, const char *argv[], int flags);
static void SegmtWorldChanged(ClientData instanceData);
static void SegmtDisplay(ClientData clientData);
static void AskRedraw(Segmt *a, int flag);
static void SegmtEventProc(ClientData clientData, XEvent *eventPtr);
static void SegmtDestroy(char *blockPtr);
static char *SegmtVarProc(ClientData clientData, Tcl_Interp *interp,
- char *name1, char *name2, int flags);
+ const char *name1, const char *name2, int flags);
static char *TimeVarProc(ClientData clientData, Tcl_Interp *interp,
- char *name1, char *name2, int flags);
+ const char *name1, const char *name2, int flags);
static int ParseSegmentVar (Segmt *a);
Tk_3DBorder GetBorder(Segmt *a, char *colorName);
/* --------------------------------------------------------------------- */
-static char *StringDup( char *s)
+static char *StringDup( const char *s)
{
int l = strlen(s);
char *t = Tcl_Alloc(l+1);
@@ -224,12 +224,12 @@
/* Widget class command */
int SegmtCmd( ClientData clientData, Tcl_Interp *interp,
- int argc, char *argv[])
+ int argc, const char *argv[])
{
Tk_Window main = (Tk_Window) clientData;
Segmt *segmtPtr;
Tk_Window tkwin;
- static TkClassProcs SegmtProcs = { NULL, SegmtWorldChanged, NULL};
+ static TkClassProcs SegmtProcs = { 0, SegmtWorldChanged, NULL, NULL};
/* Cree une fenetre */
if (argc < 2) {
@@ -303,7 +303,7 @@
/* Widget instance command */
int SegmtInstanceCmd(ClientData clientData, Tcl_Interp *interp,
- int argc, char *argv[])
+ int argc, const char *argv[])
{
Segmt *segmtPtr = (Segmt *)clientData;
int len;
@@ -357,7 +357,7 @@
/* Widget (re)configuration */
int SegmtConfigure( Tcl_Interp *interp, Segmt *a,
- int argc, char *argv[], int flags)
+ int argc, const char *argv[], int flags)
{
char *previousSegVarName = a->segVarName;
char *previousTimeArrayName = a->timeArrayName;
@@ -617,8 +617,8 @@
SegmtVarProc(clientData, interp, name1, name2, flags)
ClientData clientData; /* Information about button. */
Tcl_Interp *interp; /* Interpreter containing variable. */
- char *name1; /* Not used. */
- char *name2; /* Not used. */
+ const char *name1; /* Not used. */
+ const char *name2; /* Not used. */
int flags; /* Information about what happened. */
{
Segmt *a = (Segmt *)clientData;
@@ -644,8 +644,8 @@
TimeVarProc(clientData, interp, name1, name2, flags)
ClientData clientData; /* Information about button. */
Tcl_Interp *interp; /* Interpreter containing variable. */
- char *name1; /* Not used. */
- char *name2; /* Time indice */
+ const char *name1; /* Not used. */
+ const char *name2; /* Time indice */
int flags; /* Information about what happened. */
{
Segmt *a = (Segmt *)clientData;
--- a/src/trans.c
+++ b/src/trans.c
@@ -28,11 +28,11 @@
#endif
EXTERN int AxisCmd( ClientData clientData, Tcl_Interp *interp,
- int argc, char *argv[]);
+ int argc, const char *argv[]);
EXTERN int SegmtCmd( ClientData clientData, Tcl_Interp *interp,
- int argc, char *argv[]);
+ int argc, const char *argv[]);
EXTERN int WavfmCmd( ClientData clientData, Tcl_Interp *interp,
- int argc, char *argv[]);
+ int argc, const char *argv[]);
/*
extern Tk_ItemType axisType;
@@ -46,7 +46,7 @@
EXPORT(int,Trans_Init) _ANSI_ARGS_(( Tcl_Interp *interp))
{
Tcl_CmdInfo infoPtr;
- char *version;
+ const char *version;
int res;
union {
char c[sizeof(short)];
--- a/src/wavfm.c
+++ b/src/wavfm.c
@@ -163,11 +163,11 @@
/* Prototypes (C ANSI now) */
int WavfmCmd( ClientData clientData, Tcl_Interp *interp,
- int argc, char *argv[]);
+ int argc, const char *argv[]);
static int WavfmInstanceCmd(ClientData clientData, Tcl_Interp *interp,
- int argc, char *argv[]);
+ int argc, const char *argv[]);
static int WavfmConfigure( Tcl_Interp *interp, Wavfm *w,
- int argc, char *argv[], int flags);
+ int argc, const char *argv[], int flags);
static void WavfmDisplay(ClientData clientData);
static void WavfmAddCursor(Wavfm *w);
static void WavfmEventProc(ClientData clientData, XEvent *eventPtr);
@@ -177,7 +177,7 @@
/* Wavfm class command */
int WavfmCmd( ClientData clientData, Tcl_Interp *interp,
- int argc, char *argv[])
+ int argc, const char *argv[])
{
Tk_Window main = (Tk_Window) clientData;
Wavfm *wavfmPtr;
@@ -264,7 +264,7 @@
/* Wavfm instance command */
int WavfmInstanceCmd(ClientData clientData, Tcl_Interp *interp,
- int argc, char *argv[])
+ int argc, const char *argv[])
{
Wavfm *w = (Wavfm *)clientData;
int len;
@@ -479,7 +479,7 @@
/* Widget (re)configuration */
int WavfmConfigure( Tcl_Interp *interp, Wavfm *w,
- int argc, char *argv[], int flags)
+ int argc, const char *argv[], int flags)
{
XGCValues gcValues;
GC newGC;
|
