summaryrefslogtreecommitdiff
path: root/net/tcl-scotty/patches/patch-tnm_snmp_tnmMibQuery.c
blob: e855c3497a310120f21c1e6a431574431caa748d (plain)
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
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
$NetBSD: patch-tnm_snmp_tnmMibQuery.c,v 1.1 2014/03/05 13:52:29 he Exp $

Constify.

--- tnm/snmp/tnmMibQuery.c~	1999-12-09 16:17:00.000000000 +0100
+++ tnm/snmp/tnmMibQuery.c	2014-03-04 23:18:46.000000000 +0100
@@ -57,29 +57,29 @@
  * Forward declarations for procedures defined later in this file:
  */
 
-static char *
-FormatOctetTC		_ANSI_ARGS_((char *val, char *fmt));
+static const char *
+FormatOctetTC		_ANSI_ARGS_((const char *val, char *fmt));
 
-static char *
-FormatIntTC		_ANSI_ARGS_((char *val, char *fmt));
+static const char *
+FormatIntTC		_ANSI_ARGS_((const char *val, char *fmt));
 
-static char *
-FormatTimeTicks		_ANSI_ARGS_((char *val));
+static const char *
+FormatTimeTicks		_ANSI_ARGS_((const char *val));
 
-static char *
-FormatOID		_ANSI_ARGS_((char *val));
+static const char *
+FormatOID		_ANSI_ARGS_((const char *val));
 
-static char *
-ScanOctetTC		_ANSI_ARGS_((char *val, char *fmt));
+static const char *
+ScanOctetTC		_ANSI_ARGS_((const char *val, char *fmt));
 
-static char *
-ScanIntTC		_ANSI_ARGS_((char *val, char *fmt));
+static const char *
+ScanIntTC		_ANSI_ARGS_((const char *val, char *fmt));
 
-static char *
-ScanTimeTicks		_ANSI_ARGS_((char *val));
+static const char *
+ScanTimeTicks		_ANSI_ARGS_((const char *val));
 
 static void
-GetMibPath		_ANSI_ARGS_((Tnm_MibNode *nodePtr, char *soid));
+GetMibPath		_ANSI_ARGS_((const Tnm_MibNode *nodePtr, char *soid));
 
 static void
 FormatUnsigned		_ANSI_ARGS_((unsigned u, char *s));
@@ -141,7 +141,7 @@
 
 static void
 GetMibPath(nodePtr, s) 
-    Tnm_MibNode *nodePtr;
+    const Tnm_MibNode *nodePtr;
     char *s;
 {
     if (! nodePtr) return;
@@ -173,7 +173,7 @@
 
 static void
 GetMibPath2(nodePtr, oid, oidLen) 
-    Tnm_MibNode *nodePtr;
+    const Tnm_MibNode *nodePtr;
     Tnm_Oid *oid;
     int *oidLen;
 {
@@ -203,7 +203,7 @@
 
 int
 Tnm_MibNodeGetOid(nodePtr, oid)
-    Tnm_MibNode *nodePtr;
+    const Tnm_MibNode *nodePtr;
     Tnm_Oid *oid;
 {
     int len = 0;
@@ -230,9 +230,9 @@
  *----------------------------------------------------------------------
  */
 
-char*
+const char*
 Tnm_MibGetOid(label, exact)
-    char *label;
+    const char *label;
     int exact;
 {
     char *expanded = Tnm_HexToOid(label);
@@ -275,7 +275,7 @@
 
 char*
 Tnm_MibGetName(label, exact)
-    char *label;
+    const char *label;
     int exact;
 {
     char *expanded = Tnm_HexToOid(label);
@@ -321,7 +321,7 @@
 
 char*
 Tnm_MibGetDescription(name, exact)
-    char *name;
+    const char *name;
     int exact;
 {
     FILE *fp;
@@ -407,7 +407,7 @@
 
 char*
 Tnm_MibGetSucc(name)
-    char *name;
+    const char *name;
 {
     Tnm_MibNode *nodePtr;
     int retoid;
@@ -467,7 +467,7 @@
 
 char*
 Tnm_MibGetSyntax(name, exact)
-    char *name;
+    const char *name;
     int exact;
 {
     Tnm_MibNode *nodePtr = Tnm_MibFindNode(name, NULL, exact);
@@ -517,7 +517,7 @@
 
 int
 Tnm_MibGetBaseSyntax(name, exact)
-    char *name;
+    const char *name;
     int exact;
 {
     int syntax = ASN1_OTHER;
@@ -561,7 +561,7 @@
 
 char*
 Tnm_MibGetAccess(name, exact)
-    char *name;
+    const char *name;
     int exact;
 {
     Tnm_MibNode *nodePtr = Tnm_MibFindNode(name, NULL, exact);
@@ -594,7 +594,7 @@
 
 char*
 Tnm_MibGetMacro(name, exact)
-    char *name;
+    const char *name;
     int exact;
 {
     Tnm_MibNode *nodePtr = Tnm_MibFindNode(name, NULL, exact);
@@ -627,7 +627,7 @@
 
 char*
 Tnm_MibGetModule(name, exact)
-    char *name;
+    const char *name;
     int exact;
 {
     Tnm_MibNode *nodePtr = Tnm_MibFindNode(name, NULL, exact);
@@ -657,9 +657,9 @@
  *----------------------------------------------------------------------
  */
 
-static char *
+static const char *
 FormatOctetTC(val, fmt)
-    char *val;
+    const char *val;
     char *fmt;
 {
     int pfx, have_pfx;			/* counter prefix */
@@ -850,9 +850,9 @@
  *----------------------------------------------------------------------
  */
 
-static char *
+static const char *
 FormatIntTC(val, fmt)
-    char *val;
+    const char *val;
     char *fmt;
 {
     static char *ret = NULL;
@@ -988,9 +988,9 @@
  *----------------------------------------------------------------------
  */
 
-static char *
+static const char *
 FormatTimeTicks(value)
-    char *value;
+    const char *value;
 {
     u_int d, h, m, s, f;
     static char buf[80];
@@ -1026,9 +1026,9 @@
  *----------------------------------------------------------------------
  */
 
-static char *
+static const char *
 FormatOID(value)
-    char *value;
+    const char *value;
 {
     Tnm_MibNode *nodePtr = Tnm_MibFindNode(value, NULL, 1);
     static char *buffer = NULL;
@@ -1069,9 +1069,9 @@
  *----------------------------------------------------------------------
  */
 
-static char *
+static const char *
 ScanOctetTC(val, fmt)
-    char *val;
+    const char *val;
     char *fmt;
 {
     int pfx, have_pfx;			/* counter prefix */
@@ -1261,9 +1261,9 @@
  *----------------------------------------------------------------------
  */
 
-static char *
+static const char *
 ScanIntTC(val, fmt)
-    char *val;
+    const char *val;
     char *fmt;
 {
     static char ret [100];
@@ -1367,9 +1367,9 @@
  *----------------------------------------------------------------------
  */
 
-static char *
+static const char *
 ScanTimeTicks(value)
-    char *value;
+    const char *value;
 {
     u_int u, d, h, m, s, f, n;
     static char str[20];
@@ -1419,11 +1419,11 @@
  *----------------------------------------------------------------------
  */
 
-char *
+const char *
 Tnm_MibFormat(name, exact, value)
-    char *name;
+    const char *name;
     int exact;
-    char *value;
+    const char *value;
 {
     Tnm_MibNode *nodePtr = Tnm_MibFindNode(name, NULL, exact);
    
@@ -1447,7 +1447,7 @@
 	     */
 
 	    if (nodePtr->tc->displayHint) {
-		char *ret = NULL;
+		const char *ret = NULL;
 		if (nodePtr->syntax == ASN1_OCTET_STRING) {
 		    ret = FormatOctetTC(value, nodePtr->tc->displayHint);
 		} else if (nodePtr->syntax == ASN1_INTEGER) {
@@ -1489,11 +1489,11 @@
  *----------------------------------------------------------------------
  */
 
-char*
+const char*
 Tnm_MibScan(name, exact, value)
-    char *name;
+    const char *name;
     int exact;
-    char *value;
+    const char *value;
 {
     Tnm_MibNode *nodePtr = Tnm_MibFindNode(name, NULL, exact);
     
@@ -1518,7 +1518,7 @@
 	     */
 
             if (nodePtr->tc->displayHint) {
-		char *ret = NULL;
+	        const char *ret = NULL;
 		if (nodePtr->syntax == ASN1_OCTET_STRING) {
 		    ret = ScanOctetTC(value, nodePtr->tc->displayHint);
 		} else if (nodePtr->syntax == ASN1_INTEGER) {
@@ -1563,7 +1563,7 @@
 
 char*
 Tnm_MibGetTC(name, exact)
-    char *name;
+    const char *name;
     int exact;
 {
     Tnm_MibNode *nodePtr = Tnm_MibFindNode(name, NULL, exact);
@@ -1635,7 +1635,7 @@
 
 char*
 Tnm_MibGetFile(name, exact)
-    char *name;
+    const char *name;
     int exact;
 {
     Tnm_MibNode *nodePtr = Tnm_MibFindNode(name, NULL, exact);
@@ -1669,7 +1669,7 @@
 
 char*
 Tnm_MibGetIndex(name, exact)
-    char *name;
+    const char *name;
     int exact;
 {
     Tnm_MibNode *nodePtr;
@@ -1712,7 +1712,7 @@
 
 char*
 Tnm_MibGetParent(name, exact)
-    char *name;
+    const char *name;
     int exact;
 {
     Tnm_MibNode *nodePtr;
@@ -1755,7 +1755,7 @@
 
 char*
 Tnm_MibGetDefault(name, exact)
-    char *name;
+    const char *name;
     int exact;
 {
     Tnm_MibNode *nodePtr = Tnm_MibFindNode(name, NULL, exact);