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
|
src/stubs.c | 33 +++++++++++++++++----------------
1 file changed, 17 insertions(+), 16 deletions(-)
diff --git a/src/stubs.c b/src/stubs.c
index 794485c..cec2c04 100644
--- a/src/stubs.c
+++ b/src/stubs.c
@@ -40,8 +40,8 @@ int wn_findvalidsearches (ClientData clientData, Tcl_Interp *interp,
char *morph;
int pos;
if (argc != 3) {
- interp -> result =
- "usage: findvalidsearches searchword partofspeechnum";
+ Tcl_SetResult(interp,
+ "usage: findvalidsearches searchword partofspeechnum", TCL_STATIC);
return TCL_ERROR;
}
pos = atoi (argv[2]);
@@ -52,7 +52,7 @@ int wn_findvalidsearches (ClientData clientData, Tcl_Interp *interp,
} while ((morph = morphstr (NULL, pos)) != NULL);
}
sprintf (bitfieldstr, "%u", bitfield);
- interp -> result = bitfieldstr;
+ Tcl_SetResult(interp, bitfieldstr, TCL_STATIC);
return TCL_OK;
}
@@ -69,13 +69,13 @@ int wn_bit (ClientData clientData, Tcl_Interp *interp,
static char bitfieldstr[32];
int whichbit;
if (argc != 2) {
- interp -> result = "usage: bit bitnum";
+ Tcl_SetResult(interp, "usage: bit bitnum", TCL_STATIC);
return TCL_ERROR;
}
whichbit = atoi (argv[1]);
bitfield = bit (whichbit);
sprintf (bitfieldstr, "%u", bitfield);
- interp -> result = bitfieldstr;
+ Tcl_SetResult(interp, bitfieldstr, TCL_STATIC);
return TCL_OK;
}
@@ -89,8 +89,8 @@ int wn_search (ClientData clientData, Tcl_Interp *interp,
int pos, searchtype, sense;
char *morph;
if (argc != 5) {
- interp -> result =
- "usage: search searchword partofspeechnum searchtypenum sensenum";
+ Tcl_SetResult(interp,
+ "usage: search searchword partofspeechnum searchtypenum sensenum", TCL_STATIC);
return TCL_ERROR;
}
pos = atoi (argv[2]);
@@ -102,7 +102,7 @@ int wn_search (ClientData clientData, Tcl_Interp *interp,
strcat (resultbuf, findtheinfo (morph, pos, searchtype, sense));
} while ((morph = morphstr (NULL, pos)) != NULL);
}
- interp -> result = resultbuf;
+ Tcl_SetResult(interp, resultbuf, TCL_STATIC);
return TCL_OK;
}
@@ -114,7 +114,7 @@ int wn_search (ClientData clientData, Tcl_Interp *interp,
int wn_glosses (ClientData clientData, Tcl_Interp *interp,
int argc, char *argv[]) {
if (argc != 2) {
- interp -> result = "usage: glosses [1 | 0]";
+ Tcl_SetResult(interp, "usage: glosses [1 | 0]", TCL_STATIC);
return TCL_ERROR;
}
dflag = atoi (argv[1]);
@@ -129,7 +129,7 @@ int wn_glosses (ClientData clientData, Tcl_Interp *interp,
int wn_fileinfo (ClientData clientData, Tcl_Interp *interp,
int argc, char *argv[]) {
if (argc != 2) {
- interp -> result = "usage: fileinfo [1 | 0]";
+ Tcl_SetResult(interp, "usage: fileinfo [1 | 0]", TCL_STATIC);
return TCL_ERROR;
}
fileinfoflag = atoi (argv[1]);
@@ -144,7 +144,7 @@ int wn_fileinfo (ClientData clientData, Tcl_Interp *interp,
int wn_byteoffset (ClientData clientData, Tcl_Interp *interp,
int argc, char *argv[]) {
if (argc != 2) {
- interp -> result = "usage: byteoffset [1 | 0]";
+ Tcl_SetResult(interp, "usage: byteoffset [1 | 0]", TCL_STATIC);
return TCL_ERROR;
}
offsetflag = atoi (argv[1]);
@@ -159,7 +159,7 @@ int wn_byteoffset (ClientData clientData, Tcl_Interp *interp,
int wn_senseflag (ClientData clientData, Tcl_Interp *interp,
int argc, char *argv[]) {
if (argc != 2) {
- interp -> result = "usage: senseflag [1 | 0]";
+ Tcl_SetResult(interp, "usage: senseflag [1 | 0]", TCL_STATIC);
return TCL_ERROR;
}
wnsnsflag = atoi (argv[1]);
@@ -175,12 +175,13 @@ int wn_contextualhelp (ClientData clientData, Tcl_Interp *interp,
int argc, char *argv[]) {
int pos, searchtype;
if (argc != 3) {
- interp -> result = "usage: contextualhelp partofspeechnum searchtypenum";
+ Tcl_SetResult(interp,
+ "usage: contextualhelp partofspeechnum searchtypenum", TCL_STATIC);
return TCL_ERROR;
}
pos = atoi (argv[1]);
searchtype = atoi (argv[2]);
- interp -> result = helptext[pos][searchtype];
+ Tcl_SetResult(interp, helptext[pos][searchtype], TCL_STATIC);
return TCL_OK;
}
@@ -190,7 +191,7 @@ int wn_contextualhelp (ClientData clientData, Tcl_Interp *interp,
int wn_reopendb (ClientData clientData, Tcl_Interp *interp,
int argc, char *argv[]) {
if (argc != 1) {
- interp -> result = "usage: reopendb";
+ Tcl_SetResult(interp, "usage: reopendb", TCL_STATIC);
return TCL_ERROR;
}
re_wninit ();
@@ -204,7 +205,7 @@ int wn_reopendb (ClientData clientData, Tcl_Interp *interp,
int wn_abortsearch (ClientData clientData, Tcl_Interp *interp,
int argc, char *argv[]) {
if (argc != 1) {
- interp -> result = "usage: abortsearch";
+ Tcl_SetResult(interp, "usage: abortsearch", TCL_STATIC);
return TCL_ERROR;
}
abortsearch = 1;
|
GitWeb