]> git.pld-linux.org Git - packages/net-snmp.git/blame - net-snmp-Remove-U64-typedef.patch
projects / packages / net-snmp.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
Bug 1314610 - snmpd complaining twice "Cannot statfs net:[********]#***: No such...
[packages/net-snmp.git] / net-snmp-Remove-U64-typedef.patch
CommitLineData
2a9017b5
JR		 1From 477b4307ef12ddce3b6a9205e0bdddbfb2e0e9b6 Mon Sep 17 00:00:00 2001
2From: Bart Van Assche <bvanassche@acm.org>
3Date: Sat, 20 Feb 2016 18:58:18 -0800
4Subject: [PATCH] Remove U64 typedef
5
6The U64 typedef conflicts with a typedef in a Perl header file. Hence
7remove the U64 typedef from the Net-SNMP header files. This patch does
8not modify the Net-SNMP ABI.
9---
10 agent/mibgroup/if-mib/ifXTable/ifXTable.c | 16 +-
11 agent/mibgroup/if-mib/ifXTable/ifXTable.h | 48 +-
12 .../mibgroup/if-mib/ifXTable/ifXTable_interface.c | 32 +-
13 .../ip-mib/data_access/systemstats_common.c | 2 +-
14 .../ipIfStatsTable/ipIfStatsTable_data_get.c | 28 +-
15 .../ipIfStatsTable/ipIfStatsTable_data_get.h | 28 +-
16 .../ipIfStatsTable/ipIfStatsTable_interface.c | 56 +-
17 .../ip-mib/ipSystemStatsTable/ipSystemStatsTable.c | 28 +-
18 .../ip-mib/ipSystemStatsTable/ipSystemStatsTable.h | 921 ++-------------------
19 .../ipSystemStatsTable_interface.c | 56 +-
20 include/net-snmp/data_access/ipstats.h | 42 +-
21 include/net-snmp/library/int64.h | 34 +-
22 snmplib/int64.c | 38 +-
23 snmplib/read_config.c | 6 +-
24 testing/fulltests/unit-tests/T015int64_clib.c | 10 +-
25 15 files changed, 274 insertions(+), 1071 deletions(-)
26
27diff --git a/agent/mibgroup/if-mib/ifXTable/ifXTable.c b/agent/mibgroup/if-mib/ifXTable/ifXTable.c
28index bb3e736..0c952ba 100644
29--- a/agent/mibgroup/if-mib/ifXTable/ifXTable.c
30+++ b/agent/mibgroup/if-mib/ifXTable/ifXTable.c
31@@ -722,7 +722,7 @@ The total number of octets received on the interface,
32 */
33 int
34 ifHCInOctets_get(ifXTable_rowreq_ctx * rowreq_ctx,
35- U64 * ifHCInOctets_val_ptr)
36+ struct counter64 *ifHCInOctets_val_ptr)
37 {
38 /** we should have a non-NULL pointer */
39 netsnmp_assert(NULL != ifHCInOctets_val_ptr);
40@@ -779,7 +779,7 @@ The number of packets, delivered by this sub-layer to a
41 */
42 int
43 ifHCInUcastPkts_get(ifXTable_rowreq_ctx * rowreq_ctx,
44- U64 * ifHCInUcastPkts_val_ptr)
45+ struct counter64 *ifHCInUcastPkts_val_ptr)
46 {
47 /** we should have a non-NULL pointer */
48 netsnmp_assert(NULL != ifHCInUcastPkts_val_ptr);
49@@ -838,7 +838,7 @@ The number of packets, delivered by this sub-layer to a
50 */
51 int
52 ifHCInMulticastPkts_get(ifXTable_rowreq_ctx * rowreq_ctx,
53- U64 * ifHCInMulticastPkts_val_ptr)
54+ struct counter64 *ifHCInMulticastPkts_val_ptr)
55 {
56 /** we should have a non-NULL pointer */
57 netsnmp_assert(NULL != ifHCInMulticastPkts_val_ptr);
58@@ -897,7 +897,7 @@ The number of packets, delivered by this sub-layer to a
59 */
60 int
61 ifHCInBroadcastPkts_get(ifXTable_rowreq_ctx * rowreq_ctx,
62- U64 * ifHCInBroadcastPkts_val_ptr)
63+ struct counter64 *ifHCInBroadcastPkts_val_ptr)
64 {
65 /** we should have a non-NULL pointer */
66 netsnmp_assert(NULL != ifHCInBroadcastPkts_val_ptr);
67@@ -955,7 +955,7 @@ The total number of octets transmitted out of the
68 */
69 int
70 ifHCOutOctets_get(ifXTable_rowreq_ctx * rowreq_ctx,
71- U64 * ifHCOutOctets_val_ptr)
72+ struct counter64 *ifHCOutOctets_val_ptr)
73 {
74 /** we should have a non-NULL pointer */
75 netsnmp_assert(NULL != ifHCOutOctets_val_ptr);
76@@ -1013,7 +1013,7 @@ The total number of packets that higher-level protocols
77 */
78 int
79 ifHCOutUcastPkts_get(ifXTable_rowreq_ctx * rowreq_ctx,
80- U64 * ifHCOutUcastPkts_val_ptr)
81+ struct counter64 *ifHCOutUcastPkts_val_ptr)
82 {
83 /** we should have a non-NULL pointer */
84 netsnmp_assert(NULL != ifHCOutUcastPkts_val_ptr);
85@@ -1074,7 +1074,7 @@ The total number of packets that higher-level protocols
86 */
87 int
88 ifHCOutMulticastPkts_get(ifXTable_rowreq_ctx * rowreq_ctx,
89- U64 * ifHCOutMulticastPkts_val_ptr)
90+ struct counter64 *ifHCOutMulticastPkts_val_ptr)
91 {
92 /** we should have a non-NULL pointer */
93 netsnmp_assert(NULL != ifHCOutMulticastPkts_val_ptr);
94@@ -1134,7 +1134,7 @@ The total number of packets that higher-level protocols
95 */
96 int
97 ifHCOutBroadcastPkts_get(ifXTable_rowreq_ctx * rowreq_ctx,
98- U64 * ifHCOutBroadcastPkts_val_ptr)
99+ struct counter64 *ifHCOutBroadcastPkts_val_ptr)
100 {
101 /** we should have a non-NULL pointer */
102 netsnmp_assert(NULL != ifHCOutBroadcastPkts_val_ptr);
103diff --git a/agent/mibgroup/if-mib/ifXTable/ifXTable.h b/agent/mibgroup/if-mib/ifXTable/ifXTable.h
104index ba22f97..925af13 100644
105--- a/agent/mibgroup/if-mib/ifXTable/ifXTable.h
106+++ b/agent/mibgroup/if-mib/ifXTable/ifXTable.h
107@@ -143,28 +143,28 @@ config_require(if-mib/ifXTable/ifXTable_data_access)
108 u_long *
109 ifOutBroadcastPkts_val_ptr);
110 int ifHCInOctets_get(ifXTable_rowreq_ctx * rowreq_ctx,
111- U64 * ifHCInOctets_val_ptr);
112+ struct counter64 *ifHCInOctets_val_ptr);
113 int ifHCInUcastPkts_get(ifXTable_rowreq_ctx * rowreq_ctx,
114- U64 * ifHCInUcastPkts_val_ptr);
115+ struct counter64 *ifHCInUcastPkts_val_ptr);
116 int ifHCInMulticastPkts_get(ifXTable_rowreq_ctx *
117 rowreq_ctx,
118- U64 *
119+ struct counter64 *
120 ifHCInMulticastPkts_val_ptr);
121 int ifHCInBroadcastPkts_get(ifXTable_rowreq_ctx *
122 rowreq_ctx,
123- U64 *
124+ struct counter64 *
125 ifHCInBroadcastPkts_val_ptr);
126 int ifHCOutOctets_get(ifXTable_rowreq_ctx * rowreq_ctx,
127- U64 * ifHCOutOctets_val_ptr);
128+ struct counter64 *ifHCOutOctets_val_ptr);
129 int ifHCOutUcastPkts_get(ifXTable_rowreq_ctx * rowreq_ctx,
130- U64 * ifHCOutUcastPkts_val_ptr);
131+ struct counter64 *ifHCOutUcastPkts_val_ptr);
132 int ifHCOutMulticastPkts_get(ifXTable_rowreq_ctx *
133 rowreq_ctx,
134- U64 *
135+ struct counter64 *
136 ifHCOutMulticastPkts_val_ptr);
137 int ifHCOutBroadcastPkts_get(ifXTable_rowreq_ctx *
138 rowreq_ctx,
139- U64 *
140+ struct counter64 *
141 ifHCOutBroadcastPkts_val_ptr);
142 int ifLinkUpDownTrapEnable_get(ifXTable_rowreq_ctx *
143 rowreq_ctx,
144@@ -284,86 +284,86 @@ config_require(if-mib/ifXTable/ifXTable_data_access)
145
146 int ifHCInOctets_check_value(ifXTable_rowreq_ctx *
147 rowreq_ctx,
148- U64 ifHCInOctets_val);
149+ struct counter64 ifHCInOctets_val);
150 int ifHCInOctets_undo_setup(ifXTable_rowreq_ctx *
151 rowreq_ctx);
152 int ifHCInOctets_set(ifXTable_rowreq_ctx * rowreq_ctx,
153- U64 ifHCInOctets_val);
154+ struct counter64 ifHCInOctets_val);
155 int ifHCInOctets_undo(ifXTable_rowreq_ctx * rowreq_ctx);
156
157 int ifHCInUcastPkts_check_value(ifXTable_rowreq_ctx *
158 rowreq_ctx,
159- U64 ifHCInUcastPkts_val);
160+ struct counter64 ifHCInUcastPkts_val);
161 int ifHCInUcastPkts_undo_setup(ifXTable_rowreq_ctx *
162 rowreq_ctx);
163 int ifHCInUcastPkts_set(ifXTable_rowreq_ctx * rowreq_ctx,
164- U64 ifHCInUcastPkts_val);
165+ struct counter64 ifHCInUcastPkts_val);
166 int ifHCInUcastPkts_undo(ifXTable_rowreq_ctx * rowreq_ctx);
167
168 int ifHCInMulticastPkts_check_value(ifXTable_rowreq_ctx *
169 rowreq_ctx,
170- U64
171+ struct counter64
172 ifHCInMulticastPkts_val);
173 int ifHCInMulticastPkts_undo_setup(ifXTable_rowreq_ctx *
174 rowreq_ctx);
175 int ifHCInMulticastPkts_set(ifXTable_rowreq_ctx *
176 rowreq_ctx,
177- U64 ifHCInMulticastPkts_val);
178+ struct counter64 ifHCInMulticastPkts_val);
179 int ifHCInMulticastPkts_undo(ifXTable_rowreq_ctx *
180 rowreq_ctx);
181
182 int ifHCInBroadcastPkts_check_value(ifXTable_rowreq_ctx *
183 rowreq_ctx,
184- U64
185+ struct counter64
186 ifHCInBroadcastPkts_val);
187 int ifHCInBroadcastPkts_undo_setup(ifXTable_rowreq_ctx *
188 rowreq_ctx);
189 int ifHCInBroadcastPkts_set(ifXTable_rowreq_ctx *
190 rowreq_ctx,
191- U64 ifHCInBroadcastPkts_val);
192+ struct counter64 ifHCInBroadcastPkts_val);
193 int ifHCInBroadcastPkts_undo(ifXTable_rowreq_ctx *
194 rowreq_ctx);
195
196 int ifHCOutOctets_check_value(ifXTable_rowreq_ctx *
197 rowreq_ctx,
198- U64 ifHCOutOctets_val);
199+ struct counter64 ifHCOutOctets_val);
200 int ifHCOutOctets_undo_setup(ifXTable_rowreq_ctx *
201 rowreq_ctx);
202 int ifHCOutOctets_set(ifXTable_rowreq_ctx * rowreq_ctx,
203- U64 ifHCOutOctets_val);
204+ struct counter64 ifHCOutOctets_val);
205 int ifHCOutOctets_undo(ifXTable_rowreq_ctx * rowreq_ctx);
206
207 int ifHCOutUcastPkts_check_value(ifXTable_rowreq_ctx *
208 rowreq_ctx,
209- U64 ifHCOutUcastPkts_val);
210+ struct counter64 ifHCOutUcastPkts_val);
211 int ifHCOutUcastPkts_undo_setup(ifXTable_rowreq_ctx *
212 rowreq_ctx);
213 int ifHCOutUcastPkts_set(ifXTable_rowreq_ctx * rowreq_ctx,
214- U64 ifHCOutUcastPkts_val);
215+ struct counter64 ifHCOutUcastPkts_val);
216 int ifHCOutUcastPkts_undo(ifXTable_rowreq_ctx *
217 rowreq_ctx);
218
219 int ifHCOutMulticastPkts_check_value(ifXTable_rowreq_ctx *
220 rowreq_ctx,
221- U64
222+ struct counter64
223 ifHCOutMulticastPkts_val);
224 int ifHCOutMulticastPkts_undo_setup(ifXTable_rowreq_ctx *
225 rowreq_ctx);
226 int ifHCOutMulticastPkts_set(ifXTable_rowreq_ctx *
227 rowreq_ctx,
228- U64 ifHCOutMulticastPkts_val);
229+ struct counter64 ifHCOutMulticastPkts_val);
230 int ifHCOutMulticastPkts_undo(ifXTable_rowreq_ctx *
231 rowreq_ctx);
232
233 int ifHCOutBroadcastPkts_check_value(ifXTable_rowreq_ctx *
234 rowreq_ctx,
235- U64
236+ struct counter64
237 ifHCOutBroadcastPkts_val);
238 int ifHCOutBroadcastPkts_undo_setup(ifXTable_rowreq_ctx *
239 rowreq_ctx);
240 int ifHCOutBroadcastPkts_set(ifXTable_rowreq_ctx *
241 rowreq_ctx,
242- U64 ifHCOutBroadcastPkts_val);
243+ struct counter64 ifHCOutBroadcastPkts_val);
244 int ifHCOutBroadcastPkts_undo(ifXTable_rowreq_ctx *
245 rowreq_ctx);
246
247diff --git a/agent/mibgroup/if-mib/ifXTable/ifXTable_interface.c b/agent/mibgroup/if-mib/ifXTable/ifXTable_interface.c
248index 23b50d0..e561842 100644
249--- a/agent/mibgroup/if-mib/ifXTable/ifXTable_interface.c
250+++ b/agent/mibgroup/if-mib/ifXTable/ifXTable_interface.c
251@@ -729,72 +729,72 @@ _ifXTable_get_column(ifXTable_rowreq_ctx * rowreq_ctx,
252 * ifHCInOctets(6)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h
253 */
254 case COLUMN_IFHCINOCTETS:
255- var->val_len = sizeof(U64);
256+ var->val_len = sizeof(struct counter64);
257 var->type = ASN_COUNTER64;
258- rc = ifHCInOctets_get(rowreq_ctx, (U64 *) var->val.string);
259+ rc = ifHCInOctets_get(rowreq_ctx, (struct counter64 *) var->val.string);
260 break;
261
262 /*
263 * ifHCInUcastPkts(7)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h
264 */
265 case COLUMN_IFHCINUCASTPKTS:
266- var->val_len = sizeof(U64);
267+ var->val_len = sizeof(struct counter64);
268 var->type = ASN_COUNTER64;
269- rc = ifHCInUcastPkts_get(rowreq_ctx, (U64 *) var->val.string);
270+ rc = ifHCInUcastPkts_get(rowreq_ctx, (struct counter64 *) var->val.string);
271 break;
272
273 /*
274 * ifHCInMulticastPkts(8)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h
275 */
276 case COLUMN_IFHCINMULTICASTPKTS:
277- var->val_len = sizeof(U64);
278+ var->val_len = sizeof(struct counter64);
279 var->type = ASN_COUNTER64;
280- rc = ifHCInMulticastPkts_get(rowreq_ctx, (U64 *) var->val.string);
281+ rc = ifHCInMulticastPkts_get(rowreq_ctx, (struct counter64 *) var->val.string);
282 break;
283
284 /*
285 * ifHCInBroadcastPkts(9)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h
286 */
287 case COLUMN_IFHCINBROADCASTPKTS:
288- var->val_len = sizeof(U64);
289+ var->val_len = sizeof(struct counter64);
290 var->type = ASN_COUNTER64;
291- rc = ifHCInBroadcastPkts_get(rowreq_ctx, (U64 *) var->val.string);
292+ rc = ifHCInBroadcastPkts_get(rowreq_ctx, (struct counter64 *) var->val.string);
293 break;
294
295 /*
296 * ifHCOutOctets(10)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h
297 */
298 case COLUMN_IFHCOUTOCTETS:
299- var->val_len = sizeof(U64);
300+ var->val_len = sizeof(struct counter64);
301 var->type = ASN_COUNTER64;
302- rc = ifHCOutOctets_get(rowreq_ctx, (U64 *) var->val.string);
303+ rc = ifHCOutOctets_get(rowreq_ctx, (struct counter64 *) var->val.string);
304 break;
305
306 /*
307 * ifHCOutUcastPkts(11)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h
308 */
309 case COLUMN_IFHCOUTUCASTPKTS:
310- var->val_len = sizeof(U64);
311+ var->val_len = sizeof(struct counter64);
312 var->type = ASN_COUNTER64;
313- rc = ifHCOutUcastPkts_get(rowreq_ctx, (U64 *) var->val.string);
314+ rc = ifHCOutUcastPkts_get(rowreq_ctx, (struct counter64 *) var->val.string);
315 break;
316
317 /*
318 * ifHCOutMulticastPkts(12)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h
319 */
320 case COLUMN_IFHCOUTMULTICASTPKTS:
321- var->val_len = sizeof(U64);
322+ var->val_len = sizeof(struct counter64);
323 var->type = ASN_COUNTER64;
324- rc = ifHCOutMulticastPkts_get(rowreq_ctx, (U64 *) var->val.string);
325+ rc = ifHCOutMulticastPkts_get(rowreq_ctx, (struct counter64 *) var->val.string);
326 break;
327
328 /*
329 * ifHCOutBroadcastPkts(13)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h
330 */
331 case COLUMN_IFHCOUTBROADCASTPKTS:
332- var->val_len = sizeof(U64);
333+ var->val_len = sizeof(struct counter64);
334 var->type = ASN_COUNTER64;
335- rc = ifHCOutBroadcastPkts_get(rowreq_ctx, (U64 *) var->val.string);
336+ rc = ifHCOutBroadcastPkts_get(rowreq_ctx, (struct counter64 *) var->val.string);
337 break;
338
339 /*
340diff --git a/agent/mibgroup/ip-mib/data_access/systemstats_common.c b/agent/mibgroup/ip-mib/data_access/systemstats_common.c
341index 29109bd..7434b3a 100644
342--- a/agent/mibgroup/ip-mib/data_access/systemstats_common.c
343+++ b/agent/mibgroup/ip-mib/data_access/systemstats_common.c
344@@ -264,7 +264,7 @@ _calculate_entries(netsnmp_systemstats_entry * entry)
345 && entry->stats.columnAvail[IPSYSTEMSTATSTABLE_HCOUTFRAGCREATES]
346 && entry->stats.columnAvail[IPSYSTEMSTATSTABLE_HCOUTDISCARDS]) {
347
348- U64 tmp, tmp2, tmp3;
349+ struct counter64 tmp, tmp2, tmp3;
350 tmp = entry->stats.HCOutRequests;
351 u64Incr(&tmp, &entry->stats.HCOutForwDatagrams);
352 u64Incr(&tmp, &entry->stats.HCOutFragCreates);
353diff --git a/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_data_get.c b/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_data_get.c
354index db673dc..fec36b2 100644
355--- a/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_data_get.c
356+++ b/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_data_get.c
357@@ -270,7 +270,7 @@ The total number of input IP datagrams received, including
358 */
359 int
360 ipIfStatsHCInReceives_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx,
361- U64 * ipIfStatsHCInReceives_val_ptr)
362+ struct counter64 *ipIfStatsHCInReceives_val_ptr)
363 {
364 /** we should have a non-NULL pointer */
365 netsnmp_assert(NULL != ipIfStatsHCInReceives_val_ptr);
366@@ -395,7 +395,7 @@ The total number of octets received in input IP datagrams,
367 */
368 int
369 ipIfStatsHCInOctets_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx,
370- U64 * ipIfStatsHCInOctets_val_ptr)
371+ struct counter64 *ipIfStatsHCInOctets_val_ptr)
372 {
373 /** we should have a non-NULL pointer */
374 netsnmp_assert(NULL != ipIfStatsHCInOctets_val_ptr);
375@@ -862,7 +862,7 @@ The number of input datagrams for which this entity was not
376 */
377 int
378 ipIfStatsHCInForwDatagrams_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx,
379- U64 * ipIfStatsHCInForwDatagrams_val_ptr)
380+ struct counter64 *ipIfStatsHCInForwDatagrams_val_ptr)
381 {
382 /** we should have a non-NULL pointer */
383 netsnmp_assert(NULL != ipIfStatsHCInForwDatagrams_val_ptr);
384@@ -1267,7 +1267,7 @@ The total number of datagrams successfully delivered to IP
385 */
386 int
387 ipIfStatsHCInDelivers_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx,
388- U64 * ipIfStatsHCInDelivers_val_ptr)
389+ struct counter64 *ipIfStatsHCInDelivers_val_ptr)
390 {
391 /** we should have a non-NULL pointer */
392 netsnmp_assert(NULL != ipIfStatsHCInDelivers_val_ptr);
393@@ -1396,7 +1396,7 @@ The total number of IP datagrams that local IP user-
394 */
395 int
396 ipIfStatsHCOutRequests_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx,
397- U64 * ipIfStatsHCOutRequests_val_ptr)
398+ struct counter64 *ipIfStatsHCOutRequests_val_ptr)
399 {
400 /** we should have a non-NULL pointer */
401 netsnmp_assert(NULL != ipIfStatsHCOutRequests_val_ptr);
402@@ -1532,7 +1532,7 @@ The number of datagrams for which this entity was not their
403 */
404 int
405 ipIfStatsHCOutForwDatagrams_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx,
406- U64 * ipIfStatsHCOutForwDatagrams_val_ptr)
407+ struct counter64 *ipIfStatsHCOutForwDatagrams_val_ptr)
408 {
409 /** we should have a non-NULL pointer */
410 netsnmp_assert(NULL != ipIfStatsHCOutForwDatagrams_val_ptr);
411@@ -1999,7 +1999,7 @@ The total number of IP datagrams that this entity supplied
412 */
413 int
414 ipIfStatsHCOutTransmits_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx,
415- U64 * ipIfStatsHCOutTransmits_val_ptr)
416+ struct counter64 *ipIfStatsHCOutTransmits_val_ptr)
417 {
418 /** we should have a non-NULL pointer */
419 netsnmp_assert(NULL != ipIfStatsHCOutTransmits_val_ptr);
420@@ -2123,7 +2123,7 @@ The total number of octets in IP datagrams delivered to the
421 */
422 int
423 ipIfStatsHCOutOctets_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx,
424- U64 * ipIfStatsHCOutOctets_val_ptr)
425+ struct counter64 *ipIfStatsHCOutOctets_val_ptr)
426 {
427 /** we should have a non-NULL pointer */
428 netsnmp_assert(NULL != ipIfStatsHCOutOctets_val_ptr);
429@@ -2245,7 +2245,7 @@ The number of IP multicast datagrams received. This object
430 */
431 int
432 ipIfStatsHCInMcastPkts_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx,
433- U64 * ipIfStatsHCInMcastPkts_val_ptr)
434+ struct counter64 *ipIfStatsHCInMcastPkts_val_ptr)
435 {
436 /** we should have a non-NULL pointer */
437 netsnmp_assert(NULL != ipIfStatsHCInMcastPkts_val_ptr);
438@@ -2372,7 +2372,7 @@ The total number of octets received in IP multicast
439 */
440 int
441 ipIfStatsHCInMcastOctets_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx,
442- U64 * ipIfStatsHCInMcastOctets_val_ptr)
443+ struct counter64 *ipIfStatsHCInMcastOctets_val_ptr)
444 {
445 /** we should have a non-NULL pointer */
446 netsnmp_assert(NULL != ipIfStatsHCInMcastOctets_val_ptr);
447@@ -2497,7 +2497,7 @@ The number of IP multicast datagrams transmitted. This
448 */
449 int
450 ipIfStatsHCOutMcastPkts_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx,
451- U64 * ipIfStatsHCOutMcastPkts_val_ptr)
452+ struct counter64 *ipIfStatsHCOutMcastPkts_val_ptr)
453 {
454 /** we should have a non-NULL pointer */
455 netsnmp_assert(NULL != ipIfStatsHCOutMcastPkts_val_ptr);
456@@ -2621,7 +2621,7 @@ The total number of octets transmitted in IP multicast
457 */
458 int
459 ipIfStatsHCOutMcastOctets_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx,
460- U64 * ipIfStatsHCOutMcastOctets_val_ptr)
461+ struct counter64 *ipIfStatsHCOutMcastOctets_val_ptr)
462 {
463 /** we should have a non-NULL pointer */
464 netsnmp_assert(NULL != ipIfStatsHCOutMcastOctets_val_ptr);
465@@ -2743,7 +2743,7 @@ The number of IP broadcast datagrams received. This object
466 */
467 int
468 ipIfStatsHCInBcastPkts_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx,
469- U64 * ipIfStatsHCInBcastPkts_val_ptr)
470+ struct counter64 *ipIfStatsHCInBcastPkts_val_ptr)
471 {
472 /** we should have a non-NULL pointer */
473 netsnmp_assert(NULL != ipIfStatsHCInBcastPkts_val_ptr);
474@@ -2865,7 +2865,7 @@ The number of IP broadcast datagrams transmitted. This
475 */
476 int
477 ipIfStatsHCOutBcastPkts_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx,
478- U64 * ipIfStatsHCOutBcastPkts_val_ptr)
479+ struct counter64 *ipIfStatsHCOutBcastPkts_val_ptr)
480 {
481 /** we should have a non-NULL pointer */
482 netsnmp_assert(NULL != ipIfStatsHCOutBcastPkts_val_ptr);
483diff --git a/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_data_get.h b/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_data_get.h
484index 0cc7e47..ad5d8a0 100644
485--- a/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_data_get.h
486+++ b/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_data_get.h
487@@ -50,7 +50,7 @@ extern "C" {
488 ipIfStatsInReceives_val_ptr);
489 int ipIfStatsHCInReceives_get(ipIfStatsTable_rowreq_ctx *
490 rowreq_ctx,
491- U64 *
492+ struct counter64 *
493 ipIfStatsHCInReceives_val_ptr);
494 int ipIfStatsInOctets_get(ipIfStatsTable_rowreq_ctx *
495 rowreq_ctx,
496@@ -58,7 +58,7 @@ extern "C" {
497 ipIfStatsInOctets_val_ptr);
498 int ipIfStatsHCInOctets_get(ipIfStatsTable_rowreq_ctx *
499 rowreq_ctx,
500- U64 *
501+ struct counter64 *
502 ipIfStatsHCInOctets_val_ptr);
503 int ipIfStatsInHdrErrors_get(ipIfStatsTable_rowreq_ctx *
504 rowreq_ctx,
505@@ -87,7 +87,7 @@ extern "C" {
506 int
507 ipIfStatsHCInForwDatagrams_get(ipIfStatsTable_rowreq_ctx *
508 rowreq_ctx,
509- U64 *
510+ struct counter64 *
511 ipIfStatsHCInForwDatagrams_val_ptr);
512 int ipIfStatsReasmReqds_get(ipIfStatsTable_rowreq_ctx *
513 rowreq_ctx,
514@@ -111,7 +111,7 @@ extern "C" {
515 ipIfStatsInDelivers_val_ptr);
516 int ipIfStatsHCInDelivers_get(ipIfStatsTable_rowreq_ctx *
517 rowreq_ctx,
518- U64 *
519+ struct counter64 *
520 ipIfStatsHCInDelivers_val_ptr);
521 int ipIfStatsOutRequests_get(ipIfStatsTable_rowreq_ctx *
522 rowreq_ctx,
523@@ -119,7 +119,7 @@ extern "C" {
524 ipIfStatsOutRequests_val_ptr);
525 int ipIfStatsHCOutRequests_get(ipIfStatsTable_rowreq_ctx *
526 rowreq_ctx,
527- U64 *
528+ struct counter64 *
529 ipIfStatsHCOutRequests_val_ptr);
530 int ipIfStatsOutForwDatagrams_get(ipIfStatsTable_rowreq_ctx
531 * rowreq_ctx,
532@@ -128,7 +128,7 @@ extern "C" {
533 int
534 ipIfStatsHCOutForwDatagrams_get(ipIfStatsTable_rowreq_ctx *
535 rowreq_ctx,
536- U64 *
537+ struct counter64 *
538 ipIfStatsHCOutForwDatagrams_val_ptr);
539 int ipIfStatsOutDiscards_get(ipIfStatsTable_rowreq_ctx *
540 rowreq_ctx,
541@@ -156,7 +156,7 @@ extern "C" {
542 ipIfStatsOutTransmits_val_ptr);
543 int ipIfStatsHCOutTransmits_get(ipIfStatsTable_rowreq_ctx *
544 rowreq_ctx,
545- U64 *
546+ struct counter64 *
547 ipIfStatsHCOutTransmits_val_ptr);
548 int ipIfStatsOutOctets_get(ipIfStatsTable_rowreq_ctx *
549 rowreq_ctx,
550@@ -164,7 +164,7 @@ extern "C" {
551 ipIfStatsOutOctets_val_ptr);
552 int ipIfStatsHCOutOctets_get(ipIfStatsTable_rowreq_ctx *
553 rowreq_ctx,
554- U64 *
555+ struct counter64 *
556 ipIfStatsHCOutOctets_val_ptr);
557 int ipIfStatsInMcastPkts_get(ipIfStatsTable_rowreq_ctx *
558 rowreq_ctx,
559@@ -172,7 +172,7 @@ extern "C" {
560 ipIfStatsInMcastPkts_val_ptr);
561 int ipIfStatsHCInMcastPkts_get(ipIfStatsTable_rowreq_ctx *
562 rowreq_ctx,
563- U64 *
564+ struct counter64 *
565 ipIfStatsHCInMcastPkts_val_ptr);
566 int ipIfStatsInMcastOctets_get(ipIfStatsTable_rowreq_ctx *
567 rowreq_ctx,
568@@ -180,7 +180,7 @@ extern "C" {
569 ipIfStatsInMcastOctets_val_ptr);
570 int ipIfStatsHCInMcastOctets_get(ipIfStatsTable_rowreq_ctx
571 * rowreq_ctx,
572- U64 *
573+ struct counter64 *
574 ipIfStatsHCInMcastOctets_val_ptr);
575 int ipIfStatsOutMcastPkts_get(ipIfStatsTable_rowreq_ctx *
576 rowreq_ctx,
577@@ -188,7 +188,7 @@ extern "C" {
578 ipIfStatsOutMcastPkts_val_ptr);
579 int ipIfStatsHCOutMcastPkts_get(ipIfStatsTable_rowreq_ctx *
580 rowreq_ctx,
581- U64 *
582+ struct counter64 *
583 ipIfStatsHCOutMcastPkts_val_ptr);
584 int ipIfStatsOutMcastOctets_get(ipIfStatsTable_rowreq_ctx *
585 rowreq_ctx,
586@@ -196,7 +196,7 @@ extern "C" {
587 ipIfStatsOutMcastOctets_val_ptr);
588 int ipIfStatsHCOutMcastOctets_get(ipIfStatsTable_rowreq_ctx
589 * rowreq_ctx,
590- U64 *
591+ struct counter64 *
592 ipIfStatsHCOutMcastOctets_val_ptr);
593 int ipIfStatsInBcastPkts_get(ipIfStatsTable_rowreq_ctx *
594 rowreq_ctx,
595@@ -204,7 +204,7 @@ extern "C" {
596 ipIfStatsInBcastPkts_val_ptr);
597 int ipIfStatsHCInBcastPkts_get(ipIfStatsTable_rowreq_ctx *
598 rowreq_ctx,
599- U64 *
600+ struct counter64 *
601 ipIfStatsHCInBcastPkts_val_ptr);
602 int ipIfStatsOutBcastPkts_get(ipIfStatsTable_rowreq_ctx *
603 rowreq_ctx,
604@@ -212,7 +212,7 @@ extern "C" {
605 ipIfStatsOutBcastPkts_val_ptr);
606 int ipIfStatsHCOutBcastPkts_get(ipIfStatsTable_rowreq_ctx *
607 rowreq_ctx,
608- U64 *
609+ struct counter64 *
610 ipIfStatsHCOutBcastPkts_val_ptr);
611 int
612 ipIfStatsDiscontinuityTime_get(ipIfStatsTable_rowreq_ctx *
613diff --git a/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_interface.c b/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_interface.c
614index 559d1c1..4955a8b 100644
615--- a/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_interface.c
616+++ b/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_interface.c
617@@ -722,10 +722,10 @@ _ipIfStatsTable_get_column(ipIfStatsTable_rowreq_ctx * rowreq_ctx,
618 * ipIfStatsHCInReceives(4)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h
619 */
620 case COLUMN_IPIFSTATSHCINRECEIVES:
621- var->val_len = sizeof(U64);
622+ var->val_len = sizeof(struct counter64);
623 var->type = ASN_COUNTER64;
624 rc = ipIfStatsHCInReceives_get(rowreq_ctx,
625- (U64 *) var->val.string);
626+ (struct counter64 *) var->val.string);
627 break;
628
629 /*
630@@ -741,9 +741,9 @@ _ipIfStatsTable_get_column(ipIfStatsTable_rowreq_ctx * rowreq_ctx,
631 * ipIfStatsHCInOctets(6)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h
632 */
633 case COLUMN_IPIFSTATSHCINOCTETS:
634- var->val_len = sizeof(U64);
635+ var->val_len = sizeof(struct counter64);
636 var->type = ASN_COUNTER64;
637- rc = ipIfStatsHCInOctets_get(rowreq_ctx, (U64 *) var->val.string);
638+ rc = ipIfStatsHCInOctets_get(rowreq_ctx, (struct counter64 *) var->val.string);
639 break;
640
641 /*
642@@ -810,10 +810,10 @@ _ipIfStatsTable_get_column(ipIfStatsTable_rowreq_ctx * rowreq_ctx,
643 * ipIfStatsHCInForwDatagrams(13)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h
644 */
645 case COLUMN_IPIFSTATSHCINFORWDATAGRAMS:
646- var->val_len = sizeof(U64);
647+ var->val_len = sizeof(struct counter64);
648 var->type = ASN_COUNTER64;
649 rc = ipIfStatsHCInForwDatagrams_get(rowreq_ctx,
650- (U64 *) var->val.string);
651+ (struct counter64 *) var->val.string);
652 break;
653
654 /*
655@@ -869,10 +869,10 @@ _ipIfStatsTable_get_column(ipIfStatsTable_rowreq_ctx * rowreq_ctx,
656 * ipIfStatsHCInDelivers(19)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h
657 */
658 case COLUMN_IPIFSTATSHCINDELIVERS:
659- var->val_len = sizeof(U64);
660+ var->val_len = sizeof(struct counter64);
661 var->type = ASN_COUNTER64;
662 rc = ipIfStatsHCInDelivers_get(rowreq_ctx,
663- (U64 *) var->val.string);
664+ (struct counter64 *) var->val.string);
665 break;
666
667 /*
668@@ -889,10 +889,10 @@ _ipIfStatsTable_get_column(ipIfStatsTable_rowreq_ctx * rowreq_ctx,
669 * ipIfStatsHCOutRequests(21)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h
670 */
671 case COLUMN_IPIFSTATSHCOUTREQUESTS:
672- var->val_len = sizeof(U64);
673+ var->val_len = sizeof(struct counter64);
674 var->type = ASN_COUNTER64;
675 rc = ipIfStatsHCOutRequests_get(rowreq_ctx,
676- (U64 *) var->val.string);
677+ (struct counter64 *) var->val.string);
678 break;
679
680 /*
681@@ -909,10 +909,10 @@ _ipIfStatsTable_get_column(ipIfStatsTable_rowreq_ctx * rowreq_ctx,
682 * ipIfStatsHCOutForwDatagrams(24)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h
683 */
684 case COLUMN_IPIFSTATSHCOUTFORWDATAGRAMS:
685- var->val_len = sizeof(U64);
686+ var->val_len = sizeof(struct counter64);
687 var->type = ASN_COUNTER64;
688 rc = ipIfStatsHCOutForwDatagrams_get(rowreq_ctx,
689- (U64 *) var->val.string);
690+ (struct counter64 *) var->val.string);
691 break;
692
693 /*
694@@ -979,10 +979,10 @@ _ipIfStatsTable_get_column(ipIfStatsTable_rowreq_ctx * rowreq_ctx,
695 * ipIfStatsHCOutTransmits(31)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h
696 */
697 case COLUMN_IPIFSTATSHCOUTTRANSMITS:
698- var->val_len = sizeof(U64);
699+ var->val_len = sizeof(struct counter64);
700 var->type = ASN_COUNTER64;
701 rc = ipIfStatsHCOutTransmits_get(rowreq_ctx,
702- (U64 *) var->val.string);
703+ (struct counter64 *) var->val.string);
704 break;
705
706 /*
707@@ -999,9 +999,9 @@ _ipIfStatsTable_get_column(ipIfStatsTable_rowreq_ctx * rowreq_ctx,
708 * ipIfStatsHCOutOctets(33)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h
709 */
710 case COLUMN_IPIFSTATSHCOUTOCTETS:
711- var->val_len = sizeof(U64);
712+ var->val_len = sizeof(struct counter64);
713 var->type = ASN_COUNTER64;
714- rc = ipIfStatsHCOutOctets_get(rowreq_ctx, (U64 *) var->val.string);
715+ rc = ipIfStatsHCOutOctets_get(rowreq_ctx, (struct counter64 *) var->val.string);
716 break;
717
718 /*
719@@ -1018,10 +1018,10 @@ _ipIfStatsTable_get_column(ipIfStatsTable_rowreq_ctx * rowreq_ctx,
720 * ipIfStatsHCInMcastPkts(35)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h
721 */
722 case COLUMN_IPIFSTATSHCINMCASTPKTS:
723- var->val_len = sizeof(U64);
724+ var->val_len = sizeof(struct counter64);
725 var->type = ASN_COUNTER64;
726 rc = ipIfStatsHCInMcastPkts_get(rowreq_ctx,
727- (U64 *) var->val.string);
728+ (struct counter64 *) var->val.string);
729 break;
730
731 /*
732@@ -1038,10 +1038,10 @@ _ipIfStatsTable_get_column(ipIfStatsTable_rowreq_ctx * rowreq_ctx,
733 * ipIfStatsHCInMcastOctets(37)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h
734 */
735 case COLUMN_IPIFSTATSHCINMCASTOCTETS:
736- var->val_len = sizeof(U64);
737+ var->val_len = sizeof(struct counter64);
738 var->type = ASN_COUNTER64;
739 rc = ipIfStatsHCInMcastOctets_get(rowreq_ctx,
740- (U64 *) var->val.string);
741+ (struct counter64 *) var->val.string);
742 break;
743
744 /*
745@@ -1058,10 +1058,10 @@ _ipIfStatsTable_get_column(ipIfStatsTable_rowreq_ctx * rowreq_ctx,
746 * ipIfStatsHCOutMcastPkts(39)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h
747 */
748 case COLUMN_IPIFSTATSHCOUTMCASTPKTS:
749- var->val_len = sizeof(U64);
750+ var->val_len = sizeof(struct counter64);
751 var->type = ASN_COUNTER64;
752 rc = ipIfStatsHCOutMcastPkts_get(rowreq_ctx,
753- (U64 *) var->val.string);
754+ (struct counter64 *) var->val.string);
755 break;
756
757 /*
758@@ -1078,10 +1078,10 @@ _ipIfStatsTable_get_column(ipIfStatsTable_rowreq_ctx * rowreq_ctx,
759 * ipIfStatsHCOutMcastOctets(41)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h
760 */
761 case COLUMN_IPIFSTATSHCOUTMCASTOCTETS:
762- var->val_len = sizeof(U64);
763+ var->val_len = sizeof(struct counter64);
764 var->type = ASN_COUNTER64;
765 rc = ipIfStatsHCOutMcastOctets_get(rowreq_ctx,
766- (U64 *) var->val.string);
767+ (struct counter64 *) var->val.string);
768 break;
769
770 /*
771@@ -1098,10 +1098,10 @@ _ipIfStatsTable_get_column(ipIfStatsTable_rowreq_ctx * rowreq_ctx,
772 * ipIfStatsHCInBcastPkts(43)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h
773 */
774 case COLUMN_IPIFSTATSHCINBCASTPKTS:
775- var->val_len = sizeof(U64);
776+ var->val_len = sizeof(struct counter64);
777 var->type = ASN_COUNTER64;
778 rc = ipIfStatsHCInBcastPkts_get(rowreq_ctx,
779- (U64 *) var->val.string);
780+ (struct counter64 *) var->val.string);
781 break;
782
783 /*
784@@ -1118,10 +1118,10 @@ _ipIfStatsTable_get_column(ipIfStatsTable_rowreq_ctx * rowreq_ctx,
785 * ipIfStatsHCOutBcastPkts(45)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h
786 */
787 case COLUMN_IPIFSTATSHCOUTBCASTPKTS:
788- var->val_len = sizeof(U64);
789+ var->val_len = sizeof(struct counter64);
790 var->type = ASN_COUNTER64;
791 rc = ipIfStatsHCOutBcastPkts_get(rowreq_ctx,
792- (U64 *) var->val.string);
793+ (struct counter64 *) var->val.string);
794 break;
795
796 /*
797diff --git a/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable.c b/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable.c
798index 10587e2..5a9323f 100644
799--- a/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable.c
800+++ b/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable.c
801@@ -452,7 +452,7 @@ The total number of input IP datagrams received, including
802 */
803 int
804 ipSystemStatsHCInReceives_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx,
805- U64 * ipSystemStatsHCInReceives_val_ptr)
806+ struct counter64 *ipSystemStatsHCInReceives_val_ptr)
807 {
808 /** we should have a non-NULL pointer */
809 netsnmp_assert(NULL != ipSystemStatsHCInReceives_val_ptr);
810@@ -579,7 +579,7 @@ The total number of octets received in input IP datagrams,
811 */
812 int
813 ipSystemStatsHCInOctets_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx,
814- U64 * ipSystemStatsHCInOctets_val_ptr)
815+ struct counter64 *ipSystemStatsHCInOctets_val_ptr)
816 {
817 /** we should have a non-NULL pointer */
818 netsnmp_assert(NULL != ipSystemStatsHCInOctets_val_ptr);
819@@ -1058,7 +1058,7 @@ The number of input datagrams for which this entity was not
820 int
821 ipSystemStatsHCInForwDatagrams_get(ipSystemStatsTable_rowreq_ctx *
822 rowreq_ctx,
823- U64 *
824+ struct counter64 *
825 ipSystemStatsHCInForwDatagrams_val_ptr)
826 {
827 /** we should have a non-NULL pointer */
828@@ -1474,7 +1474,7 @@ The total number of datagrams successfully delivered to IP
829 */
830 int
831 ipSystemStatsHCInDelivers_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx,
832- U64 * ipSystemStatsHCInDelivers_val_ptr)
833+ struct counter64 *ipSystemStatsHCInDelivers_val_ptr)
834 {
835 /** we should have a non-NULL pointer */
836 netsnmp_assert(NULL != ipSystemStatsHCInDelivers_val_ptr);
837@@ -1602,7 +1602,7 @@ The total number of IP datagrams which local IP user-
838 */
839 int
840 ipSystemStatsHCOutRequests_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx,
841- U64 * ipSystemStatsHCOutRequests_val_ptr)
842+ struct counter64 *ipSystemStatsHCOutRequests_val_ptr)
843 {
844 /** we should have a non-NULL pointer */
845 netsnmp_assert(NULL != ipSystemStatsHCOutRequests_val_ptr);
846@@ -1809,7 +1809,7 @@ The number of datagrams for which this entity was not their
847 int
848 ipSystemStatsHCOutForwDatagrams_get(ipSystemStatsTable_rowreq_ctx *
849 rowreq_ctx,
850- U64 *
851+ struct counter64 *
852 ipSystemStatsHCOutForwDatagrams_val_ptr)
853 {
854 /** we should have a non-NULL pointer */
855@@ -2288,7 +2288,7 @@ The total number of IP datagrams that this entity supplied
856 */
857 int
858 ipSystemStatsHCOutTransmits_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx,
859- U64 * ipSystemStatsHCOutTransmits_val_ptr)
860+ struct counter64 *ipSystemStatsHCOutTransmits_val_ptr)
861 {
862 /** we should have a non-NULL pointer */
863 netsnmp_assert(NULL != ipSystemStatsHCOutTransmits_val_ptr);
864@@ -2415,7 +2415,7 @@ The total number of octets in IP datagrams delivered to the
865 */
866 int
867 ipSystemStatsHCOutOctets_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx,
868- U64 * ipSystemStatsHCOutOctets_val_ptr)
869+ struct counter64 *ipSystemStatsHCOutOctets_val_ptr)
870 {
871 /** we should have a non-NULL pointer */
872 netsnmp_assert(NULL != ipSystemStatsHCOutOctets_val_ptr);
873@@ -2539,7 +2539,7 @@ The number of IP multicast datagrams received. This object
874 */
875 int
876 ipSystemStatsHCInMcastPkts_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx,
877- U64 * ipSystemStatsHCInMcastPkts_val_ptr)
878+ struct counter64 *ipSystemStatsHCInMcastPkts_val_ptr)
879 {
880 /** we should have a non-NULL pointer */
881 netsnmp_assert(NULL != ipSystemStatsHCInMcastPkts_val_ptr);
882@@ -2665,7 +2665,7 @@ The total number of octets received in IP multicast
883 int
884 ipSystemStatsHCInMcastOctets_get(ipSystemStatsTable_rowreq_ctx *
885 rowreq_ctx,
886- U64 *
887+ struct counter64 *
888 ipSystemStatsHCInMcastOctets_val_ptr)
889 {
890 /** we should have a non-NULL pointer */
891@@ -2790,7 +2790,7 @@ The number of IP multicast datagrams transmitted. This
892 */
893 int
894 ipSystemStatsHCOutMcastPkts_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx,
895- U64 * ipSystemStatsHCOutMcastPkts_val_ptr)
896+ struct counter64 *ipSystemStatsHCOutMcastPkts_val_ptr)
897 {
898 /** we should have a non-NULL pointer */
899 netsnmp_assert(NULL != ipSystemStatsHCOutMcastPkts_val_ptr);
900@@ -2921,7 +2921,7 @@ The total number of octets transmitted in IP multicast
901 int
902 ipSystemStatsHCOutMcastOctets_get(ipSystemStatsTable_rowreq_ctx *
903 rowreq_ctx,
904- U64 *
905+ struct counter64 *
906 ipSystemStatsHCOutMcastOctets_val_ptr)
907 {
908 /** we should have a non-NULL pointer */
909@@ -3046,7 +3046,7 @@ The number of IP broadcast datagrams received. This object
910 */
911 int
912 ipSystemStatsHCInBcastPkts_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx,
913- U64 * ipSystemStatsHCInBcastPkts_val_ptr)
914+ struct counter64 *ipSystemStatsHCInBcastPkts_val_ptr)
915 {
916 /** we should have a non-NULL pointer */
917 netsnmp_assert(NULL != ipSystemStatsHCInBcastPkts_val_ptr);
918@@ -3170,7 +3170,7 @@ The number of IP broadcast datagrams transmitted. This
919 */
920 int
921 ipSystemStatsHCOutBcastPkts_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx,
922- U64 * ipSystemStatsHCOutBcastPkts_val_ptr)
923+ struct counter64 *ipSystemStatsHCOutBcastPkts_val_ptr)
924 {
925 /** we should have a non-NULL pointer */
926 netsnmp_assert(NULL != ipSystemStatsHCOutBcastPkts_val_ptr);
927diff --git a/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable.h b/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable.h
928index ca1e1f3..5c3823e 100644
929--- a/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable.h
930+++ b/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable.h
931@@ -144,93 +144,22 @@ config_require(ip-mib/ipSystemStatsTable/ipSystemStatsTable_data_access)
932 *********************************************************************
933 * function prototypes
934 */
935- int
936-
937-
938-
939-
940-
941-
942-
943-
944-
945-
946-
947-
948-
949-
950-
951- ipSystemStatsTable_pre_request(ipSystemStatsTable_registration *
952+ int ipSystemStatsTable_pre_request(ipSystemStatsTable_registration *
953 user_context);
954- int
955-
956-
957-
958-
959-
960-
961-
962-
963-
964-
965-
966-
967-
968-
969-
970- ipSystemStatsTable_post_request(ipSystemStatsTable_registration *
971+ int ipSystemStatsTable_post_request(ipSystemStatsTable_registration *
972 user_context, int rc);
973
974- int
975-
976-
977-
978-
979-
980-
981-
982-
983-
984-
985-
986-
987-
988-
989-
990- ipSystemStatsTable_rowreq_ctx_init(ipSystemStatsTable_rowreq_ctx *
991+ int ipSystemStatsTable_rowreq_ctx_init(ipSystemStatsTable_rowreq_ctx *
992 rowreq_ctx,
993 void *user_init_ctx);
994 void
995-
996-
997-
998-
999-
1000-
1001-
1002-
1003-
1004-
1005-
1006-
1007-
1008-
1009-
1010 ipSystemStatsTable_rowreq_ctx_cleanup(ipSystemStatsTable_rowreq_ctx
1011 * rowreq_ctx);
1012
1013 ipSystemStatsTable_data *ipSystemStatsTable_allocate_data(void);
1014 void ipSystemStatsTable_release_data(ipSystemStatsTable_data
1015 * data);
1016-
1017-
1018-
1019-
1020-
1021-
1022-
1023-
1024- ipSystemStatsTable_rowreq_ctx
1025+ ipSystemStatsTable_rowreq_ctx
1026 * ipSystemStatsTable_row_find_by_mib_index
1027 (ipSystemStatsTable_mib_index * mib_idx);
1028
1029@@ -265,226 +194,50 @@ config_require(ip-mib/ipSystemStatsTable/ipSystemStatsTable_data_access)
1030 * indexes
1031 */
1032
1033- int
1034-
1035-
1036-
1037-
1038-
1039-
1040-
1041-
1042-
1043-
1044-
1045-
1046-
1047-
1048-
1049- ipSystemStatsInReceives_get(ipSystemStatsTable_rowreq_ctx *
1050+ int ipSystemStatsInReceives_get(ipSystemStatsTable_rowreq_ctx *
1051 rowreq_ctx,
1052 u_long *
1053 ipSystemStatsInReceives_val_ptr);
1054- int
1055-
1056-
1057-
1058-
1059-
1060-
1061-
1062-
1063-
1064-
1065-
1066-
1067-
1068-
1069-
1070- ipSystemStatsHCInReceives_get(ipSystemStatsTable_rowreq_ctx *
1071+ int ipSystemStatsHCInReceives_get(ipSystemStatsTable_rowreq_ctx *
1072 rowreq_ctx,
1073- U64 *
1074+ struct counter64 *
1075 ipSystemStatsHCInReceives_val_ptr);
1076 int ipSystemStatsInOctets_get(ipSystemStatsTable_rowreq_ctx
1077 * rowreq_ctx,
1078 u_long *
1079 ipSystemStatsInOctets_val_ptr);
1080- int
1081-
1082-
1083-
1084-
1085-
1086-
1087-
1088-
1089-
1090-
1091-
1092-
1093-
1094-
1095-
1096- ipSystemStatsHCInOctets_get(ipSystemStatsTable_rowreq_ctx *
1097+ int ipSystemStatsHCInOctets_get(ipSystemStatsTable_rowreq_ctx *
1098 rowreq_ctx,
1099- U64 * ipSystemStatsHCInOctets_val_ptr);
1100- int
1101-
1102-
1103-
1104-
1105-
1106-
1107-
1108-
1109-
1110-
1111-
1112-
1113-
1114-
1115-
1116- ipSystemStatsInHdrErrors_get(ipSystemStatsTable_rowreq_ctx *
1117+ struct counter64 *ipSystemStatsHCInOctets_val_ptr);
1118+ int ipSystemStatsInHdrErrors_get(ipSystemStatsTable_rowreq_ctx *
1119 rowreq_ctx,
1120 u_long *
1121 ipSystemStatsInHdrErrors_val_ptr);
1122- int
1123-
1124-
1125-
1126-
1127-
1128-
1129-
1130-
1131-
1132-
1133-
1134-
1135-
1136-
1137-
1138- ipSystemStatsInNoRoutes_get(ipSystemStatsTable_rowreq_ctx *
1139+ int ipSystemStatsInNoRoutes_get(ipSystemStatsTable_rowreq_ctx *
1140 rowreq_ctx,
1141 u_long *
1142 ipSystemStatsInNoRoutes_val_ptr);
1143- int
1144-
1145-
1146-
1147-
1148-
1149-
1150-
1151-
1152-
1153-
1154-
1155-
1156-
1157-
1158-
1159- ipSystemStatsInAddrErrors_get(ipSystemStatsTable_rowreq_ctx *
1160+ int ipSystemStatsInAddrErrors_get(ipSystemStatsTable_rowreq_ctx *
1161 rowreq_ctx,
1162 u_long *
1163 ipSystemStatsInAddrErrors_val_ptr);
1164- int
1165-
1166-
1167-
1168-
1169-
1170-
1171-
1172-
1173-
1174-
1175-
1176-
1177-
1178-
1179-
1180- ipSystemStatsInUnknownProtos_get(ipSystemStatsTable_rowreq_ctx *
1181+ int ipSystemStatsInUnknownProtos_get(ipSystemStatsTable_rowreq_ctx *
1182 rowreq_ctx,
1183 u_long *
1184 ipSystemStatsInUnknownProtos_val_ptr);
1185- int
1186-
1187-
1188-
1189-
1190-
1191-
1192-
1193-
1194-
1195-
1196-
1197-
1198-
1199-
1200-
1201- ipSystemStatsInTruncatedPkts_get(ipSystemStatsTable_rowreq_ctx *
1202+ int ipSystemStatsInTruncatedPkts_get(ipSystemStatsTable_rowreq_ctx *
1203 rowreq_ctx,
1204 u_long *
1205 ipSystemStatsInTruncatedPkts_val_ptr);
1206- int
1207-
1208-
1209-
1210-
1211-
1212-
1213-
1214-
1215-
1216-
1217-
1218-
1219-
1220-
1221-
1222- ipSystemStatsInForwDatagrams_get(ipSystemStatsTable_rowreq_ctx *
1223+ int ipSystemStatsInForwDatagrams_get(ipSystemStatsTable_rowreq_ctx *
1224 rowreq_ctx,
1225 u_long *
1226 ipSystemStatsInForwDatagrams_val_ptr);
1227- int
1228-
1229-
1230-
1231-
1232-
1233-
1234-
1235-
1236-
1237-
1238-
1239-
1240-
1241-
1242-
1243- ipSystemStatsHCInForwDatagrams_get(ipSystemStatsTable_rowreq_ctx *
1244+ int ipSystemStatsHCInForwDatagrams_get(ipSystemStatsTable_rowreq_ctx *
1245 rowreq_ctx,
1246- U64 *
1247+ struct counter64 *
1248 ipSystemStatsHCInForwDatagrams_val_ptr);
1249- int
1250-
1251-
1252-
1253-
1254-
1255-
1256-
1257-
1258-
1259-
1260-
1261-
1262-
1263-
1264-
1265- ipSystemStatsReasmReqds_get(ipSystemStatsTable_rowreq_ctx *
1266+ int ipSystemStatsReasmReqds_get(ipSystemStatsTable_rowreq_ctx *
1267 rowreq_ctx,
1268 u_long *
1269 ipSystemStatsReasmReqds_val_ptr);
1270@@ -492,690 +245,142 @@ config_require(ip-mib/ipSystemStatsTable/ipSystemStatsTable_data_access)
1271 * rowreq_ctx,
1272 u_long *
1273 ipSystemStatsReasmOKs_val_ptr);
1274- int
1275-
1276-
1277-
1278-
1279-
1280-
1281-
1282-
1283-
1284-
1285-
1286-
1287-
1288-
1289-
1290- ipSystemStatsReasmFails_get(ipSystemStatsTable_rowreq_ctx *
1291+ int ipSystemStatsReasmFails_get(ipSystemStatsTable_rowreq_ctx *
1292 rowreq_ctx,
1293 u_long *
1294 ipSystemStatsReasmFails_val_ptr);
1295- int
1296-
1297-
1298-
1299-
1300-
1301-
1302-
1303-
1304-
1305-
1306-
1307-
1308-
1309-
1310-
1311- ipSystemStatsInDiscards_get(ipSystemStatsTable_rowreq_ctx *
1312+ int ipSystemStatsInDiscards_get(ipSystemStatsTable_rowreq_ctx *
1313 rowreq_ctx,
1314 u_long *
1315 ipSystemStatsInDiscards_val_ptr);
1316- int
1317-
1318-
1319-
1320-
1321-
1322-
1323-
1324-
1325-
1326-
1327-
1328-
1329-
1330-
1331-
1332- ipSystemStatsInDelivers_get(ipSystemStatsTable_rowreq_ctx *
1333+ int ipSystemStatsInDelivers_get(ipSystemStatsTable_rowreq_ctx *
1334 rowreq_ctx,
1335 u_long *
1336 ipSystemStatsInDelivers_val_ptr);
1337- int
1338-
1339-
1340-
1341-
1342-
1343-
1344-
1345-
1346-
1347-
1348-
1349-
1350-
1351-
1352-
1353- ipSystemStatsHCInDelivers_get(ipSystemStatsTable_rowreq_ctx *
1354+ int ipSystemStatsHCInDelivers_get(ipSystemStatsTable_rowreq_ctx *
1355 rowreq_ctx,
1356- U64 *
1357+ struct counter64 *
1358 ipSystemStatsHCInDelivers_val_ptr);
1359- int
1360-
1361-
1362-
1363-
1364-
1365-
1366-
1367-
1368-
1369-
1370-
1371-
1372-
1373-
1374-
1375- ipSystemStatsOutRequests_get(ipSystemStatsTable_rowreq_ctx *
1376+ int ipSystemStatsOutRequests_get(ipSystemStatsTable_rowreq_ctx *
1377 rowreq_ctx,
1378 u_long *
1379 ipSystemStatsOutRequests_val_ptr);
1380- int
1381-
1382-
1383-
1384-
1385-
1386-
1387-
1388-
1389-
1390-
1391-
1392-
1393-
1394-
1395-
1396- ipSystemStatsHCOutRequests_get(ipSystemStatsTable_rowreq_ctx *
1397+ int ipSystemStatsHCOutRequests_get(ipSystemStatsTable_rowreq_ctx *
1398 rowreq_ctx,
1399- U64 *
1400+ struct counter64 *
1401 ipSystemStatsHCOutRequests_val_ptr);
1402- int
1403-
1404-
1405-
1406-
1407-
1408-
1409-
1410-
1411-
1412-
1413-
1414-
1415-
1416-
1417-
1418- ipSystemStatsOutNoRoutes_get(ipSystemStatsTable_rowreq_ctx *
1419+ int ipSystemStatsOutNoRoutes_get(ipSystemStatsTable_rowreq_ctx *
1420 rowreq_ctx,
1421 u_long *
1422 ipSystemStatsOutNoRoutes_val_ptr);
1423- int
1424-
1425-
1426-
1427-
1428-
1429-
1430-
1431-
1432-
1433-
1434-
1435-
1436-
1437-
1438-
1439- ipSystemStatsOutForwDatagrams_get(ipSystemStatsTable_rowreq_ctx *
1440+ int ipSystemStatsOutForwDatagrams_get(ipSystemStatsTable_rowreq_ctx *
1441 rowreq_ctx,
1442 u_long *
1443 ipSystemStatsOutForwDatagrams_val_ptr);
1444- int
1445-
1446-
1447-
1448-
1449-
1450-
1451-
1452-
1453-
1454-
1455-
1456-
1457-
1458-
1459-
1460- ipSystemStatsHCOutForwDatagrams_get(ipSystemStatsTable_rowreq_ctx *
1461+ int ipSystemStatsHCOutForwDatagrams_get(ipSystemStatsTable_rowreq_ctx *
1462 rowreq_ctx,
1463- U64 *
1464+ struct counter64 *
1465 ipSystemStatsHCOutForwDatagrams_val_ptr);
1466- int
1467-
1468-
1469-
1470-
1471-
1472-
1473-
1474-
1475-
1476-
1477-
1478-
1479-
1480-
1481-
1482- ipSystemStatsOutDiscards_get(ipSystemStatsTable_rowreq_ctx *
1483+ int ipSystemStatsOutDiscards_get(ipSystemStatsTable_rowreq_ctx *
1484 rowreq_ctx,
1485 u_long *
1486 ipSystemStatsOutDiscards_val_ptr);
1487- int
1488-
1489-
1490-
1491-
1492-
1493-
1494-
1495-
1496-
1497-
1498-
1499-
1500-
1501-
1502-
1503- ipSystemStatsOutFragReqds_get(ipSystemStatsTable_rowreq_ctx *
1504+ int ipSystemStatsOutFragReqds_get(ipSystemStatsTable_rowreq_ctx *
1505 rowreq_ctx,
1506 u_long *
1507 ipSystemStatsOutFragReqds_val_ptr);
1508- int
1509-
1510-
1511-
1512-
1513-
1514-
1515-
1516-
1517-
1518-
1519-
1520-
1521-
1522-
1523-
1524- ipSystemStatsOutFragOKs_get(ipSystemStatsTable_rowreq_ctx *
1525+ int ipSystemStatsOutFragOKs_get(ipSystemStatsTable_rowreq_ctx *
1526 rowreq_ctx,
1527 u_long *
1528 ipSystemStatsOutFragOKs_val_ptr);
1529- int
1530-
1531-
1532-
1533-
1534-
1535-
1536-
1537-
1538-
1539-
1540-
1541-
1542-
1543-
1544-
1545- ipSystemStatsOutFragFails_get(ipSystemStatsTable_rowreq_ctx *
1546+ int ipSystemStatsOutFragFails_get(ipSystemStatsTable_rowreq_ctx *
1547 rowreq_ctx,
1548 u_long *
1549 ipSystemStatsOutFragFails_val_ptr);
1550- int
1551-
1552-
1553-
1554-
1555-
1556-
1557-
1558-
1559-
1560-
1561-
1562-
1563-
1564-
1565-
1566- ipSystemStatsOutFragCreates_get(ipSystemStatsTable_rowreq_ctx *
1567+ int ipSystemStatsOutFragCreates_get(ipSystemStatsTable_rowreq_ctx *
1568 rowreq_ctx,
1569 u_long *
1570 ipSystemStatsOutFragCreates_val_ptr);
1571- int
1572-
1573-
1574-
1575-
1576-
1577-
1578-
1579-
1580-
1581-
1582-
1583-
1584-
1585-
1586-
1587- ipSystemStatsOutTransmits_get(ipSystemStatsTable_rowreq_ctx *
1588+ int ipSystemStatsOutTransmits_get(ipSystemStatsTable_rowreq_ctx *
1589 rowreq_ctx,
1590 u_long *
1591 ipSystemStatsOutTransmits_val_ptr);
1592- int
1593-
1594-
1595-
1596-
1597-
1598-
1599-
1600-
1601-
1602-
1603-
1604-
1605-
1606-
1607-
1608- ipSystemStatsHCOutTransmits_get(ipSystemStatsTable_rowreq_ctx *
1609+ int ipSystemStatsHCOutTransmits_get(ipSystemStatsTable_rowreq_ctx *
1610 rowreq_ctx,
1611- U64 *
1612+ struct counter64 *
1613 ipSystemStatsHCOutTransmits_val_ptr);
1614- int
1615-
1616-
1617-
1618-
1619-
1620-
1621-
1622-
1623-
1624-
1625-
1626-
1627-
1628-
1629-
1630- ipSystemStatsOutOctets_get(ipSystemStatsTable_rowreq_ctx *
1631+ int ipSystemStatsOutOctets_get(ipSystemStatsTable_rowreq_ctx *
1632 rowreq_ctx,
1633 u_long *
1634 ipSystemStatsOutOctets_val_ptr);
1635- int
1636-
1637-
1638-
1639-
1640-
1641-
1642-
1643-
1644-
1645-
1646-
1647-
1648-
1649-
1650-
1651- ipSystemStatsHCOutOctets_get(ipSystemStatsTable_rowreq_ctx *
1652+ int ipSystemStatsHCOutOctets_get(ipSystemStatsTable_rowreq_ctx *
1653 rowreq_ctx,
1654- U64 *
1655+ struct counter64 *
1656 ipSystemStatsHCOutOctets_val_ptr);
1657- int
1658-
1659-
1660-
1661-
1662-
1663-
1664-
1665-
1666-
1667-
1668-
1669-
1670-
1671-
1672-
1673- ipSystemStatsInMcastPkts_get(ipSystemStatsTable_rowreq_ctx *
1674+ int ipSystemStatsInMcastPkts_get(ipSystemStatsTable_rowreq_ctx *
1675 rowreq_ctx,
1676 u_long *
1677 ipSystemStatsInMcastPkts_val_ptr);
1678- int
1679-
1680-
1681-
1682-
1683-
1684-
1685-
1686-
1687-
1688-
1689-
1690-
1691-
1692-
1693-
1694- ipSystemStatsHCInMcastPkts_get(ipSystemStatsTable_rowreq_ctx *
1695+ int ipSystemStatsHCInMcastPkts_get(ipSystemStatsTable_rowreq_ctx *
1696 rowreq_ctx,
1697- U64 *
1698+ struct counter64 *
1699 ipSystemStatsHCInMcastPkts_val_ptr);
1700- int
1701-
1702-
1703-
1704-
1705-
1706-
1707-
1708-
1709-
1710-
1711-
1712-
1713-
1714-
1715-
1716- ipSystemStatsInMcastOctets_get(ipSystemStatsTable_rowreq_ctx *
1717+ int ipSystemStatsInMcastOctets_get(ipSystemStatsTable_rowreq_ctx *
1718 rowreq_ctx,
1719 u_long *
1720 ipSystemStatsInMcastOctets_val_ptr);
1721- int
1722-
1723-
1724-
1725-
1726-
1727-
1728-
1729-
1730-
1731-
1732-
1733-
1734-
1735-
1736-
1737- ipSystemStatsHCInMcastOctets_get(ipSystemStatsTable_rowreq_ctx *
1738+ int ipSystemStatsHCInMcastOctets_get(ipSystemStatsTable_rowreq_ctx *
1739 rowreq_ctx,
1740- U64 *
1741+ struct counter64 *
1742 ipSystemStatsHCInMcastOctets_val_ptr);
1743- int
1744-
1745-
1746-
1747-
1748-
1749-
1750-
1751-
1752-
1753-
1754-
1755-
1756-
1757-
1758-
1759- ipSystemStatsOutMcastPkts_get(ipSystemStatsTable_rowreq_ctx *
1760+ int ipSystemStatsOutMcastPkts_get(ipSystemStatsTable_rowreq_ctx *
1761 rowreq_ctx,
1762 u_long *
1763 ipSystemStatsOutMcastPkts_val_ptr);
1764- int
1765-
1766-
1767-
1768-
1769-
1770-
1771-
1772-
1773-
1774-
1775-
1776-
1777-
1778-
1779-
1780- ipSystemStatsHCOutMcastPkts_get(ipSystemStatsTable_rowreq_ctx *
1781+ int ipSystemStatsHCOutMcastPkts_get(ipSystemStatsTable_rowreq_ctx *
1782 rowreq_ctx,
1783- U64 *
1784+ struct counter64 *
1785 ipSystemStatsHCOutMcastPkts_val_ptr);
1786- int
1787-
1788-
1789-
1790-
1791-
1792-
1793-
1794-
1795-
1796-
1797-
1798-
1799-
1800-
1801-
1802- ipSystemStatsOutMcastOctets_get(ipSystemStatsTable_rowreq_ctx *
1803+ int ipSystemStatsOutMcastOctets_get(ipSystemStatsTable_rowreq_ctx *
1804 rowreq_ctx,
1805 u_long *
1806 ipSystemStatsOutMcastOctets_val_ptr);
1807- int
1808-
1809-
1810-
1811-
1812-
1813-
1814-
1815-
1816-
1817-
1818-
1819-
1820-
1821-
1822-
1823- ipSystemStatsHCOutMcastOctets_get(ipSystemStatsTable_rowreq_ctx *
1824+ int ipSystemStatsHCOutMcastOctets_get(ipSystemStatsTable_rowreq_ctx *
1825 rowreq_ctx,
1826- U64 *
1827+ struct counter64 *
1828 ipSystemStatsHCOutMcastOctets_val_ptr);
1829- int
1830-
1831-
1832-
1833-
1834-
1835-
1836-
1837-
1838-
1839-
1840-
1841-
1842-
1843-
1844-
1845- ipSystemStatsInBcastPkts_get(ipSystemStatsTable_rowreq_ctx *
1846+ int ipSystemStatsInBcastPkts_get(ipSystemStatsTable_rowreq_ctx *
1847 rowreq_ctx,
1848 u_long *
1849 ipSystemStatsInBcastPkts_val_ptr);
1850- int
1851-
1852-
1853-
1854-
1855-
1856-
1857-
1858-
1859-
1860-
1861-
1862-
1863-
1864-
1865-
1866- ipSystemStatsHCInBcastPkts_get(ipSystemStatsTable_rowreq_ctx *
1867+ int ipSystemStatsHCInBcastPkts_get(ipSystemStatsTable_rowreq_ctx *
1868 rowreq_ctx,
1869- U64 *
1870+ struct counter64 *
1871 ipSystemStatsHCInBcastPkts_val_ptr);
1872- int
1873-
1874-
1875-
1876-
1877-
1878-
1879-
1880-
1881-
1882-
1883-
1884-
1885-
1886-
1887-
1888- ipSystemStatsOutBcastPkts_get(ipSystemStatsTable_rowreq_ctx *
1889+ int ipSystemStatsOutBcastPkts_get(ipSystemStatsTable_rowreq_ctx *
1890 rowreq_ctx,
1891 u_long *
1892 ipSystemStatsOutBcastPkts_val_ptr);
1893- int
1894-
1895-
1896-
1897-
1898-
1899-
1900-
1901-
1902-
1903-
1904-
1905-
1906-
1907-
1908-
1909- ipSystemStatsHCOutBcastPkts_get(ipSystemStatsTable_rowreq_ctx *
1910+ int ipSystemStatsHCOutBcastPkts_get(ipSystemStatsTable_rowreq_ctx *
1911 rowreq_ctx,
1912- U64 *
1913+ struct counter64 *
1914 ipSystemStatsHCOutBcastPkts_val_ptr);
1915- int
1916-
1917-
1918-
1919-
1920-
1921-
1922-
1923-
1924-
1925-
1926-
1927-
1928-
1929-
1930-
1931- ipSystemStatsDiscontinuityTime_get(ipSystemStatsTable_rowreq_ctx *
1932+ int ipSystemStatsDiscontinuityTime_get(ipSystemStatsTable_rowreq_ctx *
1933 rowreq_ctx,
1934 u_long *
1935 ipSystemStatsDiscontinuityTime_val_ptr);
1936- int
1937-
1938-
1939-
1940-
1941-
1942-
1943-
1944-
1945-
1946-
1947-
1948-
1949-
1950-
1951-
1952- ipSystemStatsRefreshRate_get(ipSystemStatsTable_rowreq_ctx *
1953+ int ipSystemStatsRefreshRate_get(ipSystemStatsTable_rowreq_ctx *
1954 rowreq_ctx,
1955 u_long *
1956 ipSystemStatsRefreshRate_val_ptr);
1957-
1958-
1959- int
1960-
1961-
1962-
1963-
1964-
1965-
1966-
1967-
1968-
1969-
1970-
1971-
1972-
1973-
1974-
1975- ipSystemStatsTable_indexes_set_tbl_idx(ipSystemStatsTable_mib_index
1976+ int ipSystemStatsTable_indexes_set_tbl_idx(ipSystemStatsTable_mib_index
1977 * tbl_idx,
1978 u_long
1979 ipSystemStatsIPVersion_val);
1980- int
1981-
1982-
1983-
1984-
1985-
1986-
1987-
1988-
1989-
1990-
1991-
1992-
1993-
1994-
1995-
1996- ipSystemStatsTable_indexes_set(ipSystemStatsTable_rowreq_ctx *
1997+ int ipSystemStatsTable_indexes_set(ipSystemStatsTable_rowreq_ctx *
1998 rowreq_ctx,
1999 u_long ipSystemStatsIPVersion_val);
2000
2001-
2002-
2003 /*
2004 *********************************************************************
2005 * SET function declarations
2006diff --git a/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable_interface.c b/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable_interface.c
2007index e1ca2cb..09c061f 100644
2008--- a/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable_interface.c
2009+++ b/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable_interface.c
2010@@ -674,10 +674,10 @@ _ipSystemStatsTable_get_column(ipSystemStatsTable_rowreq_ctx * rowreq_ctx,
2011 * ipSystemStatsHCInReceives(4)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h
2012 */
2013 case COLUMN_IPSYSTEMSTATSHCINRECEIVES:
2014- var->val_len = sizeof(U64);
2015+ var->val_len = sizeof(struct counter64);
2016 var->type = ASN_COUNTER64;
2017 rc = ipSystemStatsHCInReceives_get(rowreq_ctx,
2018- (U64 *) var->val.string);
2019+ (struct counter64 *) var->val.string);
2020 break;
2021
2022 /*
2023@@ -694,10 +694,10 @@ _ipSystemStatsTable_get_column(ipSystemStatsTable_rowreq_ctx * rowreq_ctx,
2024 * ipSystemStatsHCInOctets(6)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h
2025 */
2026 case COLUMN_IPSYSTEMSTATSHCINOCTETS:
2027- var->val_len = sizeof(U64);
2028+ var->val_len = sizeof(struct counter64);
2029 var->type = ASN_COUNTER64;
2030 rc = ipSystemStatsHCInOctets_get(rowreq_ctx,
2031- (U64 *) var->val.string);
2032+ (struct counter64 *) var->val.string);
2033 break;
2034
2035 /*
2036@@ -764,10 +764,10 @@ _ipSystemStatsTable_get_column(ipSystemStatsTable_rowreq_ctx * rowreq_ctx,
2037 * ipSystemStatsHCInForwDatagrams(13)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h
2038 */
2039 case COLUMN_IPSYSTEMSTATSHCINFORWDATAGRAMS:
2040- var->val_len = sizeof(U64);
2041+ var->val_len = sizeof(struct counter64);
2042 var->type = ASN_COUNTER64;
2043 rc = ipSystemStatsHCInForwDatagrams_get(rowreq_ctx,
2044- (U64 *) var->val.string);
2045+ (struct counter64 *) var->val.string);
2046 break;
2047
2048 /*
2049@@ -824,10 +824,10 @@ _ipSystemStatsTable_get_column(ipSystemStatsTable_rowreq_ctx * rowreq_ctx,
2050 * ipSystemStatsHCInDelivers(19)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h
2051 */
2052 case COLUMN_IPSYSTEMSTATSHCINDELIVERS:
2053- var->val_len = sizeof(U64);
2054+ var->val_len = sizeof(struct counter64);
2055 var->type = ASN_COUNTER64;
2056 rc = ipSystemStatsHCInDelivers_get(rowreq_ctx,
2057- (U64 *) var->val.string);
2058+ (struct counter64 *) var->val.string);
2059 break;
2060
2061 /*
2062@@ -844,10 +844,10 @@ _ipSystemStatsTable_get_column(ipSystemStatsTable_rowreq_ctx * rowreq_ctx,
2063 * ipSystemStatsHCOutRequests(21)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h
2064 */
2065 case COLUMN_IPSYSTEMSTATSHCOUTREQUESTS:
2066- var->val_len = sizeof(U64);
2067+ var->val_len = sizeof(struct counter64);
2068 var->type = ASN_COUNTER64;
2069 rc = ipSystemStatsHCOutRequests_get(rowreq_ctx,
2070- (U64 *) var->val.string);
2071+ (struct counter64 *) var->val.string);
2072 break;
2073
2074 /*
2075@@ -874,10 +874,10 @@ _ipSystemStatsTable_get_column(ipSystemStatsTable_rowreq_ctx * rowreq_ctx,
2076 * ipSystemStatsHCOutForwDatagrams(24)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h
2077 */
2078 case COLUMN_IPSYSTEMSTATSHCOUTFORWDATAGRAMS:
2079- var->val_len = sizeof(U64);
2080+ var->val_len = sizeof(struct counter64);
2081 var->type = ASN_COUNTER64;
2082 rc = ipSystemStatsHCOutForwDatagrams_get(rowreq_ctx,
2083- (U64 *) var->val.string);
2084+ (struct counter64 *) var->val.string);
2085 break;
2086
2087 /*
2088@@ -944,10 +944,10 @@ _ipSystemStatsTable_get_column(ipSystemStatsTable_rowreq_ctx * rowreq_ctx,
2089 * ipSystemStatsHCOutTransmits(31)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h
2090 */
2091 case COLUMN_IPSYSTEMSTATSHCOUTTRANSMITS:
2092- var->val_len = sizeof(U64);
2093+ var->val_len = sizeof(struct counter64);
2094 var->type = ASN_COUNTER64;
2095 rc = ipSystemStatsHCOutTransmits_get(rowreq_ctx,
2096- (U64 *) var->val.string);
2097+ (struct counter64 *) var->val.string);
2098 break;
2099
2100 /*
2101@@ -964,10 +964,10 @@ _ipSystemStatsTable_get_column(ipSystemStatsTable_rowreq_ctx * rowreq_ctx,
2102 * ipSystemStatsHCOutOctets(33)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h
2103 */
2104 case COLUMN_IPSYSTEMSTATSHCOUTOCTETS:
2105- var->val_len = sizeof(U64);
2106+ var->val_len = sizeof(struct counter64);
2107 var->type = ASN_COUNTER64;
2108 rc = ipSystemStatsHCOutOctets_get(rowreq_ctx,
2109- (U64 *) var->val.string);
2110+ (struct counter64 *) var->val.string);
2111 break;
2112
2113 /*
2114@@ -984,10 +984,10 @@ _ipSystemStatsTable_get_column(ipSystemStatsTable_rowreq_ctx * rowreq_ctx,
2115 * ipSystemStatsHCInMcastPkts(35)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h
2116 */
2117 case COLUMN_IPSYSTEMSTATSHCINMCASTPKTS:
2118- var->val_len = sizeof(U64);
2119+ var->val_len = sizeof(struct counter64);
2120 var->type = ASN_COUNTER64;
2121 rc = ipSystemStatsHCInMcastPkts_get(rowreq_ctx,
2122- (U64 *) var->val.string);
2123+ (struct counter64 *) var->val.string);
2124 break;
2125
2126 /*
2127@@ -1004,10 +1004,10 @@ _ipSystemStatsTable_get_column(ipSystemStatsTable_rowreq_ctx * rowreq_ctx,
2128 * ipSystemStatsHCInMcastOctets(37)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h
2129 */
2130 case COLUMN_IPSYSTEMSTATSHCINMCASTOCTETS:
2131- var->val_len = sizeof(U64);
2132+ var->val_len = sizeof(struct counter64);
2133 var->type = ASN_COUNTER64;
2134 rc = ipSystemStatsHCInMcastOctets_get(rowreq_ctx,
2135- (U64 *) var->val.string);
2136+ (struct counter64 *) var->val.string);
2137 break;
2138
2139 /*
2140@@ -1024,10 +1024,10 @@ _ipSystemStatsTable_get_column(ipSystemStatsTable_rowreq_ctx * rowreq_ctx,
2141 * ipSystemStatsHCOutMcastPkts(39)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h
2142 */
2143 case COLUMN_IPSYSTEMSTATSHCOUTMCASTPKTS:
2144- var->val_len = sizeof(U64);
2145+ var->val_len = sizeof(struct counter64);
2146 var->type = ASN_COUNTER64;
2147 rc = ipSystemStatsHCOutMcastPkts_get(rowreq_ctx,
2148- (U64 *) var->val.string);
2149+ (struct counter64 *) var->val.string);
2150 break;
2151
2152 /*
2153@@ -1044,10 +1044,10 @@ _ipSystemStatsTable_get_column(ipSystemStatsTable_rowreq_ctx * rowreq_ctx,
2154 * ipSystemStatsHCOutMcastOctets(41)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h
2155 */
2156 case COLUMN_IPSYSTEMSTATSHCOUTMCASTOCTETS:
2157- var->val_len = sizeof(U64);
2158+ var->val_len = sizeof(struct counter64);
2159 var->type = ASN_COUNTER64;
2160 rc = ipSystemStatsHCOutMcastOctets_get(rowreq_ctx,
2161- (U64 *) var->val.string);
2162+ (struct counter64 *) var->val.string);
2163 break;
2164
2165 /*
2166@@ -1064,10 +1064,10 @@ _ipSystemStatsTable_get_column(ipSystemStatsTable_rowreq_ctx * rowreq_ctx,
2167 * ipSystemStatsHCInBcastPkts(43)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h
2168 */
2169 case COLUMN_IPSYSTEMSTATSHCINBCASTPKTS:
2170- var->val_len = sizeof(U64);
2171+ var->val_len = sizeof(struct counter64);
2172 var->type = ASN_COUNTER64;
2173 rc = ipSystemStatsHCInBcastPkts_get(rowreq_ctx,
2174- (U64 *) var->val.string);
2175+ (struct counter64 *) var->val.string);
2176 break;
2177
2178 /*
2179@@ -1084,10 +1084,10 @@ _ipSystemStatsTable_get_column(ipSystemStatsTable_rowreq_ctx * rowreq_ctx,
2180 * ipSystemStatsHCOutBcastPkts(45)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h
2181 */
2182 case COLUMN_IPSYSTEMSTATSHCOUTBCASTPKTS:
2183- var->val_len = sizeof(U64);
2184+ var->val_len = sizeof(struct counter64);
2185 var->type = ASN_COUNTER64;
2186 rc = ipSystemStatsHCOutBcastPkts_get(rowreq_ctx,
2187- (U64 *) var->val.string);
2188+ (struct counter64 *) var->val.string);
2189 break;
2190
2191 /*
2192diff --git a/include/net-snmp/data_access/ipstats.h b/include/net-snmp/data_access/ipstats.h
2193index f782459..f0df46b 100644
2194--- a/include/net-snmp/data_access/ipstats.h
2195+++ b/include/net-snmp/data_access/ipstats.h
2196@@ -58,45 +58,45 @@ typedef struct netsnmp_ipstats_s {
2197 * other columns, when underlying OS does not provide them.
2198 * Always fill at least 32 bits, the table is periodically polled -> 32 bit
2199 * overflow shall be detected and 64 bit value should be computed automatically. */
2200- U64 HCInReceives;
2201- U64 HCInOctets;
2202+ struct counter64 HCInReceives;
2203+ struct counter64 HCInOctets;
2204 u_long InHdrErrors;
2205- U64 HCInNoRoutes;
2206+ struct counter64 HCInNoRoutes;
2207 u_long InAddrErrors;
2208 u_long InUnknownProtos;
2209 u_long InTruncatedPkts;
2210
2211 /* optional, can be computed from HCInNoRoutes and HCOutForwDatagrams */
2212- U64 HCInForwDatagrams;
2213+ struct counter64 HCInForwDatagrams;
2214
2215 u_long ReasmReqds;
2216 u_long ReasmOKs;
2217 u_long ReasmFails;
2218 u_long InDiscards;
2219- U64 HCInDelivers;
2220- U64 HCOutRequests;
2221- U64 HCOutNoRoutes;
2222- U64 HCOutForwDatagrams;
2223- U64 HCOutDiscards;
2224+ struct counter64 HCInDelivers;
2225+ struct counter64 HCOutRequests;
2226+ struct counter64 HCOutNoRoutes;
2227+ struct counter64 HCOutForwDatagrams;
2228+ struct counter64 HCOutDiscards;
2229
2230 /* optional, can be computed from HCOutFragOKs + HCOutFragFails*/
2231- U64 HCOutFragReqds;
2232- U64 HCOutFragOKs;
2233- U64 HCOutFragFails;
2234- U64 HCOutFragCreates;
2235+ struct counter64 HCOutFragReqds;
2236+ struct counter64 HCOutFragOKs;
2237+ struct counter64 HCOutFragFails;
2238+ struct counter64 HCOutFragCreates;
2239
2240 /* optional, can be computed from
2241 * HCOutRequests +HCOutForwDatagrams + HCOutFragCreates
2242 * - HCOutFragReqds - HCOutNoRoutes - HCOutDiscards */
2243- U64 HCOutTransmits;
2244+ struct counter64 HCOutTransmits;
2245
2246- U64 HCOutOctets;
2247- U64 HCInMcastPkts;
2248- U64 HCInMcastOctets;
2249- U64 HCOutMcastPkts;
2250- U64 HCOutMcastOctets;
2251- U64 HCInBcastPkts;
2252- U64 HCOutBcastPkts;
2253+ struct counter64 HCOutOctets;
2254+ struct counter64 HCInMcastPkts;
2255+ struct counter64 HCInMcastOctets;
2256+ struct counter64 HCOutMcastPkts;
2257+ struct counter64 HCOutMcastOctets;
2258+ struct counter64 HCInBcastPkts;
2259+ struct counter64 HCOutBcastPkts;
2260
2261 /* Array of available columns.*/
2262 int columnAvail[IPSYSTEMSTATSTABLE_LAST+1];
2263diff --git a/include/net-snmp/library/int64.h b/include/net-snmp/library/int64.h
2264index 9c7c894..3a85213 100644
2265--- a/include/net-snmp/library/int64.h
2266+++ b/include/net-snmp/library/int64.h
2267@@ -5,31 +5,29 @@
2268 extern "C" {
2269 #endif
2270
2271- typedef struct counter64 U64;
2272-
2273 #define I64CHARSZ 21
2274
2275- void divBy10(U64, U64 *, unsigned int *);
2276- void multBy10(U64, U64 *);
2277- void incrByU16(U64 *, unsigned int);
2278- void incrByU32(U64 *, unsigned int);
2279+ void divBy10(struct counter64, struct counter64 *, unsigned int *);
2280+ void multBy10(struct counter64, struct counter64 *);
2281+ void incrByU16(struct counter64 *, unsigned int);
2282+ void incrByU32(struct counter64 *, unsigned int);
2283 NETSNMP_IMPORT
2284- void zeroU64(U64 *);
2285- int isZeroU64(const U64 *);
2286+ void zeroU64(struct counter64 *);
2287+ int isZeroU64(const struct counter64 *);
2288 NETSNMP_IMPORT
2289- void printU64(char *, const U64 *);
2290+ void printU64(char *, const struct counter64 *);
2291 NETSNMP_IMPORT
2292- void printI64(char *, const U64 *);
2293- int read64(U64 *, const char *);
2294+ void printI64(char *, const struct counter64 *);
2295+ int read64(struct counter64 *, const char *);
2296 NETSNMP_IMPORT
2297- void u64Subtract(const U64 * pu64one, const U64 * pu64two,
2298- U64 * pu64out);
2299- void u64Incr(U64 * pu64out, const U64 * pu64one);
2300- void u64UpdateCounter(U64 * pu64out, const U64 * pu64one,
2301- const U64 * pu64two);
2302- void u64Copy(U64 * pu64one, const U64 * pu64two);
2303+ void u64Subtract(const struct counter64 *pu64one, const struct counter64 *pu64two,
2304+ struct counter64 *pu64out);
2305+ void u64Incr(struct counter64 *pu64out, const struct counter64 *pu64one);
2306+ void u64UpdateCounter(struct counter64 *pu64out, const struct counter64 *pu64one,
2307+ const struct counter64 *pu64two);
2308+ void u64Copy(struct counter64 *pu64one, const struct counter64 *pu64two);
2309
2310- int netsnmp_c64_check_for_32bit_wrap(U64 *old_val, U64 *new_val,
2311+ int netsnmp_c64_check_for_32bit_wrap(struct counter64 *old_val, struct counter64 *new_val,
2312 int adjust);
2313 NETSNMP_IMPORT
2314 int netsnmp_c64_check32_and_update(struct counter64 *prev_val,
2315diff --git a/snmplib/int64.c b/snmplib/int64.c
2316index 51f1f32..951f813 100644
2317--- a/snmplib/int64.c
2318+++ b/snmplib/int64.c
2319@@ -33,7 +33,7 @@
2320 * @param[out] puR Remainder.
2321 */
2322 void
2323-divBy10(U64 u64, U64 * pu64Q, unsigned int *puR)
2324+divBy10(struct counter64 u64, struct counter64 *pu64Q, unsigned int *puR)
2325 {
2326 unsigned long ulT;
2327 unsigned long ulQ;
2328@@ -83,7 +83,7 @@ divBy10(U64 u64, U64 * pu64Q, unsigned int *puR)
2329 * @param[out] pu64P Product.
2330 */
2331 void
2332-multBy10(U64 u64, U64 * pu64P)
2333+multBy10(struct counter64 u64, struct counter64 *pu64P)
2334 {
2335 unsigned long ulT;
2336 unsigned long ulP;
2337@@ -130,7 +130,7 @@ multBy10(U64 u64, U64 * pu64P)
2338 *
2339 */
2340 void
2341-incrByU16(U64 * pu64, unsigned int u16)
2342+incrByU16(struct counter64 *pu64, unsigned int u16)
2343 {
2344 incrByU32(pu64, u16);
2345 }
2346@@ -143,7 +143,7 @@ incrByU16(U64 * pu64, unsigned int u16)
2347 *
2348 */
2349 void
2350-incrByU32(U64 * pu64, unsigned int u32)
2351+incrByU32(struct counter64 *pu64, unsigned int u32)
2352 {
2353 uint32_t tmp;
2354
2355@@ -161,7 +161,7 @@ incrByU32(U64 * pu64, unsigned int u32)
2356 * @param[out] pu64out pu64one - pu64two.
2357 */
2358 void
2359-u64Subtract(const U64 * pu64one, const U64 * pu64two, U64 * pu64out)
2360+u64Subtract(const struct counter64 *pu64one, const struct counter64 *pu64two, struct counter64 *pu64out)
2361 {
2362 int carry;
2363
2364@@ -177,7 +177,7 @@ u64Subtract(const U64 * pu64one, const U64 * pu64two, U64 * pu64out)
2365 * @param[in,out] pu64out pu64out += pu64one.
2366 */
2367 void
2368-u64Incr(U64 * pu64out, const U64 * pu64one)
2369+u64Incr(struct counter64 *pu64out, const struct counter64 *pu64one)
2370 {
2371 pu64out->high = (uint32_t)(pu64out->high + pu64one->high);
2372 incrByU32(pu64out, pu64one->low);
2373@@ -191,9 +191,9 @@ u64Incr(U64 * pu64out, const U64 * pu64one)
2374 * @param[out] pu64out pu64out += (pu64one - pu64two)
2375 */
2376 void
2377-u64UpdateCounter(U64 * pu64out, const U64 * pu64one, const U64 * pu64two)
2378+u64UpdateCounter(struct counter64 *pu64out, const struct counter64 *pu64one, const struct counter64 *pu64two)
2379 {
2380- U64 tmp;
2381+ struct counter64 tmp;
2382
2383 u64Subtract(pu64one, pu64two, &tmp);
2384 u64Incr(pu64out, &tmp);
2385@@ -208,7 +208,7 @@ netsnmp_feature_child_of(u64copy, netsnmp_unused)
2386 * @param[out] pu64one Where to store the copy - *pu64one = *pu64two.
2387 */
2388 void
2389-u64Copy(U64 * pu64one, const U64 * pu64two)
2390+u64Copy(struct counter64 *pu64one, const struct counter64 *pu64two)
2391 {
2392 *pu64one = *pu64two;
2393 }
2394@@ -220,7 +220,7 @@ u64Copy(U64 * pu64one, const U64 * pu64two)
2395 * @param[in] pu64 Number to be zeroed.
2396 */
2397 void
2398-zeroU64(U64 * pu64)
2399+zeroU64(struct counter64 *pu64)
2400 {
2401 pu64->low = 0;
2402 pu64->high = 0;
2403@@ -232,7 +232,7 @@ zeroU64(U64 * pu64)
2404 * @param[in] pu64 Number to be checked.
2405 */
2406 int
2407-isZeroU64(const U64 * pu64)
2408+isZeroU64(const struct counter64 *pu64)
2409 {
2410 return pu64->low == 0 && pu64->high == 0;
2411 }
2412@@ -390,10 +390,10 @@ netsnmp_c64_check32_and_update(struct counter64 *prev_val, struct counter64 *new
2413 /** Convert an unsigned 64-bit number to ASCII. */
2414 void
2415 printU64(char *buf, /* char [I64CHARSZ+1]; */
2416- const U64 * pu64)
2417+ const struct counter64 *pu64)
2418 {
2419- U64 u64a;
2420- U64 u64b;
2421+ struct counter64 u64a;
2422+ struct counter64 u64b;
2423
2424 char aRes[I64CHARSZ + 1];
2425 unsigned int u;
2426@@ -414,9 +414,9 @@ printU64(char *buf, /* char [I64CHARSZ+1]; */
2427 /** Convert a signed 64-bit number to ASCII. */
2428 void
2429 printI64(char *buf, /* char [I64CHARSZ+1]; */
2430- const U64 * pu64)
2431+ const struct counter64 *pu64)
2432 {
2433- U64 u64a;
2434+ struct counter64 u64a;
2435
2436 if (pu64->high & 0x80000000) {
2437 u64a.high = (uint32_t) ~pu64->high;
2438@@ -429,11 +429,11 @@ printI64(char *buf, /* char [I64CHARSZ+1]; */
2439 }
2440 }
2441
2442-/** Convert a signed 64-bit integer from ASCII to U64. */
2443+/** Convert a signed 64-bit integer from ASCII to struct counter64. */
2444 int
2445-read64(U64 * i64, const char *str)
2446+read64(struct counter64 *i64, const char *str)
2447 {
2448- U64 i64p;
2449+ struct counter64 i64p;
2450 unsigned int u;
2451 int sign = 0;
2452 int ok = 0;
2453diff --git a/snmplib/read_config.c b/snmplib/read_config.c
2454index e159c27..ab5b6a3 100644
2455--- a/snmplib/read_config.c
2456+++ b/snmplib/read_config.c
2457@@ -2279,10 +2279,10 @@ read_config_read_memory(int type, char *readfrom,
2458 return readfrom;
2459
2460 case ASN_COUNTER64:
2461- if (*len < sizeof(U64))
2462+ if (*len < sizeof(struct counter64))
2463 return NULL;
2464- *len = sizeof(U64);
2465- read64((U64 *) dataptr, readfrom);
2466+ *len = sizeof(struct counter64);
2467+ read64((struct counter64 *) dataptr, readfrom);
2468 readfrom = skip_token(readfrom);
2469 return readfrom;
2470 }
2471diff --git a/testing/fulltests/unit-tests/T015int64_clib.c b/testing/fulltests/unit-tests/T015int64_clib.c
2472index 5f5f4b6..66f66b7 100644
2473--- a/testing/fulltests/unit-tests/T015int64_clib.c
2474+++ b/testing/fulltests/unit-tests/T015int64_clib.c
2475@@ -1,4 +1,4 @@
2476-/* HEADER Testing 64-bit integer operations (U64). */
2477+/* HEADER Testing 64-bit integer operations (struct counter64). */
2478
2479 int i, j;
2480 char buf[22];
2481@@ -15,7 +15,7 @@ static const int64_t intval[] = {
2482 };
2483
2484 for (i = 0; i < sizeof(intval)/sizeof(intval[0]); ++i) {
2485- U64 a, b;
2486+ struct counter64 a, b;
2487 a.low = (uint32_t)intval[i];
2488 a.high = (uint32_t)(intval[i] >> 32);
2489 printI64(buf, &a);
2490@@ -27,7 +27,7 @@ for (i = 0; i < sizeof(intval)/sizeof(intval[0]); ++i) {
2491
2492 for (i = 0; i < sizeof(intval)/sizeof(intval[0]); ++i) {
2493 for (j = i; j < sizeof(intval)/sizeof(intval[0]); ++j) {
2494- U64 a, b;
2495+ struct counter64 a, b;
2496 uint64_t d;
2497 a.low = (uint32_t)intval[i];
2498 a.high = (uint32_t)(intval[i] >> 32);
2499@@ -43,7 +43,7 @@ for (i = 0; i < sizeof(intval)/sizeof(intval[0]); ++i) {
2500
2501 for (i = 0; i < sizeof(intval)/sizeof(intval[0]); ++i) {
2502 for (j = i; j < sizeof(intval)/sizeof(intval[0]); ++j) {
2503- U64 a, b, c;
2504+ struct counter64 a, b, c;
2505 uint64_t d;
2506 a.low = (uint32_t)intval[i];
2507 a.high = (uint32_t)(intval[i] >> 32);
2508@@ -58,7 +58,7 @@ for (i = 0; i < sizeof(intval)/sizeof(intval[0]); ++i) {
2509 }
2510
2511 {
2512- U64 old_val, new_val;
2513+ struct counter64 old_val, new_val;
2514 old_val.low = 7;
2515 old_val.high = 0;
2516 new_val = old_val;
2517--
25182.5.5
2519
A collection of SNMP protocol tools
This page took 0.536976 seconds and 4 git commands to generate.