?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
zlib: fix mapfile
[oi-userland.git] / components / sysutils / sysstat / patches / 02-PRIx64-format.patch
blob37e32e58456dacfc252458f6274d84af409a6559
1 diff -Naur sysstat-20151012.orig/fsstats.c sysstat-20151012/fsstats.c
2 --- sysstat-20151012.orig/fsstats.c 2015-10-12 21:30:47.000000000 +0200
3 +++ sysstat-20151012/fsstats.c 2016-12-07 17:11:27.194303530 +0100
4 @@ -101,7 +101,7 @@
5 while (f && (strcmp(dev,f->dev) || strcmp(typ,f->typ)))
6 f = f->next;
7 if (f == 0) {
8 - dbug("add_fs(%s,%s,%s,%llu,%llu,%lx)\n",dev,mnt,typ,blocks,free,id);
9 + dbug("add_fs(%s,%s,%s,%" PRIu64 ",%" PRIu64 ",%lx)\n",dev,mnt,typ,blocks,free,id);
10 f = malloc(sizeof(fsstat_t));
11 bzero(f,sizeof(fsstat_t));
12 f->next = Fs;
13 @@ -112,7 +112,7 @@
14 f->ops_rate = -1;
15 Fs = f;
16 } else
17 - dbug("update_fs(%s,%s,%s,%llu,%llu,%lx)\n",dev,mnt,typ,blocks,free,id);
18 + dbug("update_fs(%s,%s,%s,%" PRIu64 ",%" PRIu64 ",%lx)\n",dev,mnt,typ,blocks,free,id);
19 f->blocks = blocks;
20 f->free = free;
21 return f;
22 @@ -125,7 +125,7 @@
23 {
24 fsstat_t *f = Fs;
25 while (f) {
26 - printf("%s@%s (%s): %llu\n",f->dev,f->mnt,f->typ,(long long unsigned) f->blocks);
27 + printf("%s@%s (%s): %" PRIu64 "\n",f->dev,f->mnt,f->typ,(long long unsigned) f->blocks);
28 f = f->next;
29 }
30 }
31 @@ -262,7 +262,7 @@
32 f = Fs;
33 dbug("sort_fs(): sorted file systems\n");
34 while (f) {
35 - dbug("%s:%lld\n",f->dev,f->free>>20);
36 + dbug("%s:%" PRIi64 "\n",f->dev,f->free>>20);
37 ++n;
38 f = f->next;
39 }
40 @@ -324,7 +324,7 @@
41 if (-1 == statvfs(mnt_pnt,&vst))
42 continue;
43 size = ((uint64_t) vst.f_blocks * vst.f_frsize) >> 10;
44 - dbug("%s @ %s : %llu/%llu\n",
45 + dbug("%s @ %s : %" PRIu64 "/%" PRIu64 "\n",
46 fstyp,
47 mnt_pnt,
48 (uint64_t)vst.f_bfree,
49 @@ -345,7 +345,7 @@
50 continue;
51 }
52 if (-1 != statvfs(f->mnt,&vst)) {
53 - dbug("updated %s@%s: %llu/%llu\n",
54 + dbug("updated %s@%s: %" PRIu64 "/%" PRIu64 "\n",
55 f->typ,
56 f->mnt,
57 (uint64_t)vst.f_bfree,
58 diff -Naur sysstat-20151012.orig/localstats.c sysstat-20151012/localstats.c
59 --- sysstat-20151012.orig/localstats.c 2015-10-12 21:30:47.000000000 +0200
60 +++ sysstat-20151012/localstats.c 2016-12-07 17:10:47.538894435 +0100
61 @@ -572,7 +572,7 @@
62 c->rates.nread = (double) ((data->nread - c->iodata.nread) >> 10) * td;
63 c->rates.nwritten = (double)((data->nwritten - c->iodata.nwritten) >> 10) * td;
64 c->rates.rbusy = (data->rtime - c->iodata.rtime) / (double)(s->ks_snaptime - c->timestamp) * 100.0;
65 - dbug("rbusy: (%lld - %lld) == %lld / (%lld - %lld ) == %lld = %g\n",data->rtime,c->iodata.rtime,data->rtime-c->iodata.rtime,s->ks_snaptime,c->timestamp,s->ks_snaptime-c->timestamp,c->rates.rbusy);
66 + dbug("rbusy: (%" PRIi64 " - %" PRIi64 ") == %" PRIi64 " / (%" PRIi64 " - %" PRIi64 " ) == %" PRIi64 " = %g\n",data->rtime,c->iodata.rtime,data->rtime-c->iodata.rtime,s->ks_snaptime,c->timestamp,s->ks_snaptime-c->timestamp,c->rates.rbusy);
67 if (c->rates.rbusy < 0)
68 c->rates.wbusy = 0;
69 c->rates.wbusy = (data->wtime - c->iodata.wtime) / (double)(s->ks_snaptime - c->timestamp) * 100.0;
70 @@ -1417,19 +1417,19 @@
71 data = fsks.read_bytes;
72 assert(data && (data->data_type == KSTAT_DATA_UINT64));
73 f->read_rate = (float)((data->value.ui64 - f->numread) >> 10) * td;
74 - dbug("read: %llu-%llu/%llu-%llu, %g\n",data->value.ui64,f->numread,s->ks_snaptime,f->rate_ts,f->read_rate);
75 + dbug("read: %" PRIu64 "-%" PRIu64 "/%" PRIu64 "-%" PRIu64 ", %g\n",data->value.ui64,f->numread,s->ks_snaptime,f->rate_ts,f->read_rate);
76 f->numread = data->value.ui64;
77
78 data = fsks.readdir_bytes;
79 assert(data && (data->data_type == KSTAT_DATA_UINT64));
80 f->read_rate += (float)((data->value.ui64 - f->numreaddir) >> 10) * td;
81 - //dbug("readdir: %llu-%llu/%llu-%llu, %g\n",data->value.ui64,f->numread,s->ks_snaptime,f->rate_ts,f->read_rate);
82 + //dbug("readdir: %" PRIu64 "-%" PRIu64 "/%" PRIu64 "-%" PRIu64 ", %g\n",data->value.ui64,f->numread,s->ks_snaptime,f->rate_ts,f->read_rate);
83 f->numreaddir = data->value.ui64;
84
85 data = fsks.write_bytes;
86 assert(data && (data->data_type == KSTAT_DATA_UINT64));
87 f->write_rate = (float)((data->value.ui64 - f->numwrite) >> 10) * td;
88 - dbug("write: %llu-%llu, %g\n",data->value.ui64,f->numwrite,f->write_rate);
89 + dbug("write: %" PRIu64 "-%" PRIu64 ", %g\n",data->value.ui64,f->numwrite,f->write_rate);
90 f->numwrite = data->value.ui64;
91
92 data = fsks.naccess;
93 @@ -1437,7 +1437,7 @@
94 if (data->value.ui64 < f->naccess)
95 f->naccess = data->value.ui64;
96 ops += data->value.ui64 - f->naccess;
97 - //dbug("naccess = %llu\n",data->value.ui64-f->naccess);
98 + //dbug("naccess = %" PRIu64 "\n",data->value.ui64-f->naccess);
99 f->naccess = data->value.ui64;
100
101 data = fsks.naddmap;
102 @@ -1445,7 +1445,7 @@
103 if (data->value.ui64 < f->naddmap)
104 f->naddmap = data->value.ui64;
105 ops += data->value.ui64 - f->naddmap;
106 - //dbug("naddmap = %llu\n",data->value.ui64-f->naddmap);
107 + //dbug("naddmap = %" PRIu64 "\n",data->value.ui64-f->naddmap);
108 f->naddmap = data->value.ui64;
109
110 data = fsks.nclose;
111 @@ -1453,73 +1453,73 @@
112 if (data->value.ui64 < f->nclose)
113 f->nclose = data->value.ui64;
114 ops += data->value.ui64 - f->nclose;
115 - //dbug("nclose = %llu\n",data->value.ui64-f->nclose);
116 + //dbug("nclose = %" PRIu64 "\n",data->value.ui64-f->nclose);
117 f->nclose = data->value.ui64;
118
119 data = fsks.ncmp;
120 assert(data && (data->data_type == KSTAT_DATA_UINT64));
121 ops += data->value.ui64 - f->ncmp;
122 - //dbug("ncmp = %llu\n",data->value.ui64-f->ncmp);
123 + //dbug("ncmp = %" PRIu64 "\n",data->value.ui64-f->ncmp);
124 f->ncmp = data->value.ui64;
125
126 data = fsks.ncreate;
127 assert(data && (data->data_type == KSTAT_DATA_UINT64));
128 ops += data->value.ui64 - f->ncreate;
129 - //dbug("ncreate = %llu\n",data->value.ui64-f->ncreate);
130 + //dbug("ncreate = %" PRIu64 "\n",data->value.ui64-f->ncreate);
131 f->ncreate = data->value.ui64;
132
133 data = fsks.ndelmap;
134 assert(data && (data->data_type == KSTAT_DATA_UINT64));
135 ops += data->value.ui64 - f->ndelmap;
136 - //dbug("ndelmap = %llu\n",data->value.ui64-f->ndelmap);
137 + //dbug("ndelmap = %" PRIu64 "\n",data->value.ui64-f->ndelmap);
138 f->ndelmap = data->value.ui64;
139
140 data = fsks.ndispose;
141 assert(data && (data->data_type == KSTAT_DATA_UINT64));
142 ops += data->value.ui64 - f->ndispose;
143 - //dbug("ndispose = %llu\n",data->value.ui64-f->ndispose);
144 + //dbug("ndispose = %" PRIu64 "\n",data->value.ui64-f->ndispose);
145 f->ndispose = data->value.ui64;
146
147 data = fsks.ndump;
148 assert(data && (data->data_type == KSTAT_DATA_UINT64));
149 ops += data->value.ui64 - f->ndump;
150 - //dbug("ndump = %llu\n",data->value.ui64-f->ndump);
151 + //dbug("ndump = %" PRIu64 "\n",data->value.ui64-f->ndump);
152 f->ndump = data->value.ui64;
153
154 data = fsks.ndumpctl;
155 assert(data && (data->data_type == KSTAT_DATA_UINT64));
156 ops += data->value.ui64 - f->ndumpctl;
157 - //dbug("ndumpctl = %llu\n",data->value.ui64-f->ndumpctl);
158 + //dbug("ndumpctl = %" PRIu64 "\n",data->value.ui64-f->ndumpctl);
159 f->ndumpctl = data->value.ui64;
160
161 data = fsks.nfid;
162 assert(data && (data->data_type == KSTAT_DATA_UINT64));
163 ops += data->value.ui64 - f->nfid;
164 - //dbug("nfid = %llu\n",data->value.ui64-f->nfid);
165 + //dbug("nfid = %" PRIu64 "\n",data->value.ui64-f->nfid);
166 f->nfid = data->value.ui64;
167
168 data = fsks.nfrlock;
169 assert(data && (data->data_type == KSTAT_DATA_UINT64));
170 ops += data->value.ui64 - f->nfrlock;
171 - //dbug("nfrlock = %llu\n",data->value.ui64-f->nfrlock);
172 + //dbug("nfrlock = %" PRIu64 "\n",data->value.ui64-f->nfrlock);
173 f->nfrlock = data->value.ui64;
174
175 data = fsks.nfsync;
176 assert(data && (data->data_type == KSTAT_DATA_UINT64));
177 ops += data->value.ui64 - f->nfsync;
178 - //dbug("nfsync = %llu\n",data->value.ui64-f->nfsync);
179 + //dbug("nfsync = %" PRIu64 "\n",data->value.ui64-f->nfsync);
180 f->nfsync = data->value.ui64;
181
182 data = fsks.ngetattr;
183 assert(data && (data->data_type == KSTAT_DATA_UINT64));
184 ops += data->value.ui64 - f->ngetattr;
185 - //dbug("ngetattr = %llu\n",data->value.ui64-f->ngetattr);
186 + //dbug("ngetattr = %" PRIu64 "\n",data->value.ui64-f->ngetattr);
187 f->ngetattr = data->value.ui64;
188
189 data = fsks.ngetpage;
190 assert(data && (data->data_type == KSTAT_DATA_UINT64));
191 ops += data->value.ui64 - f->ngetpage;
192 - //dbug("ngetpage = %llu\n",data->value.ui64-f->ngetpage);
193 + //dbug("ngetpage = %" PRIu64 "\n",data->value.ui64-f->ngetpage);
194 f->ngetpage = data->value.ui64;
195
196 data = fsks.ngetsecattr;
197 @@ -1527,7 +1527,7 @@
198 if (data->value.ui64 < f->ngetsecattr)
199 f->ngetsecattr = data->value.ui64;
200 ops += data->value.ui64 - f->ngetsecattr;
201 - //dbug("ngetsecattr = %llu\n",data->value.ui64-f->ngetsecattr);
202 + //dbug("ngetsecattr = %" PRIu64 "\n",data->value.ui64-f->ngetsecattr);
203 f->ngetsecattr = data->value.ui64;
204
205 data = fsks.ninactive;
206 @@ -1535,7 +1535,7 @@
207 if (data->value.ui64 < f->ninactive)
208 f->ninactive = data->value.ui64;
209 ops += data->value.ui64 - f->ninactive;
210 - //dbug("ninactive = %llu\n",data->value.ui64-f->ninactive);
211 + //dbug("ninactive = %" PRIu64 "\n",data->value.ui64-f->ninactive);
212 f->ninactive = data->value.ui64;
213
214 data = fsks.nioctl;
215 @@ -1543,7 +1543,7 @@
216 if (data->value.ui64 < f->nioctl)
217 f->nioctl = data->value.ui64;
218 ops += data->value.ui64 - f->nioctl;
219 - //dbug("nioctl = %llu\n",data->value.ui64-f->nioctl);
220 + //dbug("nioctl = %" PRIu64 "\n",data->value.ui64-f->nioctl);
221 f->nioctl = data->value.ui64;
222
223 data = fsks.nlink;
224 @@ -1551,7 +1551,7 @@
225 if (data->value.ui64 < f->nlink)
226 f->nlink = data->value.ui64;
227 ops += data->value.ui64 - f->nlink;
228 - //dbug("nlink = %llu\n",data->value.ui64-f->nlink);
229 + //dbug("nlink = %" PRIu64 "\n",data->value.ui64-f->nlink);
230 f->nlink = data->value.ui64;
231
232 data = fsks.nlookup;
233 @@ -1559,7 +1559,7 @@
234 if (data->value.ui64 < f->nlookup)
235 f->nlookup = data->value.ui64;
236 ops += data->value.ui64 - f->nlookup;
237 - //dbug("nlookup = %llu\n",data->value.ui64-f->nlookup);
238 + //dbug("nlookup = %" PRIu64 "\n",data->value.ui64-f->nlookup);
239 f->nlookup = data->value.ui64;
240
241 data = fsks.nmap;
242 @@ -1567,7 +1567,7 @@
243 if (data->value.ui64 < f->nmap)
244 f->nmap = data->value.ui64;
245 ops += data->value.ui64 - f->nmap;
246 - //dbug("nmap = %llu\n",data->value.ui64-f->nmap);
247 + //dbug("nmap = %" PRIu64 "\n",data->value.ui64-f->nmap);
248 f->nmap = data->value.ui64;
249
250 data = fsks.nmkdir;
251 @@ -1575,7 +1575,7 @@
252 if (data->value.ui64 < f->nmkdir)
253 f->nmkdir = data->value.ui64;
254 ops += data->value.ui64 - f->nmkdir;
255 - //dbug("nmkdir = %llu\n",data->value.ui64-f->nmkdir);
256 + //dbug("nmkdir = %" PRIu64 "\n",data->value.ui64-f->nmkdir);
257 f->nmkdir = data->value.ui64;
258
259 data = fsks.nopen;
260 @@ -1583,7 +1583,7 @@
261 if (data->value.ui64 < f->nopen)
262 f->nopen = data->value.ui64;
263 ops += data->value.ui64 - f->nopen;
264 - //dbug("nopen = %llu\n",data->value.ui64-f->nopen);
265 + //dbug("nopen = %" PRIu64 "\n",data->value.ui64-f->nopen);
266 f->nopen = data->value.ui64;
267
268 data = fsks.npageio;
269 @@ -1591,7 +1591,7 @@
270 if (data->value.ui64 < f->npageio)
271 f->npageio = data->value.ui64;
272 ops += data->value.ui64 - f->npageio;
273 - //dbug("npageio = %llu\n",data->value.ui64-f->npageio);
274 + //dbug("npageio = %" PRIu64 "\n",data->value.ui64-f->npageio);
275 f->npageio = data->value.ui64;
276
277 data = fsks.npathconf;
278 @@ -1599,7 +1599,7 @@
279 if (data->value.ui64 < f->npathconf)
280 f->npathconf = data->value.ui64;
281 ops += data->value.ui64 - f->npathconf;
282 - //dbug("npathconf = %llu\n",data->value.ui64-f->npathconf);
283 + //dbug("npathconf = %" PRIu64 "\n",data->value.ui64-f->npathconf);
284 f->npathconf = data->value.ui64;
285
286 data = fsks.npoll;
287 @@ -1607,7 +1607,7 @@
288 if (data->value.ui64 < f->npoll)
289 f->npoll = data->value.ui64;
290 ops += data->value.ui64 - f->npoll;
291 - //dbug("npoll = %llu\n",data->value.ui64-f->npoll);
292 + //dbug("npoll = %" PRIu64 "\n",data->value.ui64-f->npoll);
293 f->npoll = data->value.ui64;
294
295 data = fsks.nputpage;
296 @@ -1615,7 +1615,7 @@
297 if (data->value.ui64 < f->nputpage)
298 f->nputpage = data->value.ui64;
299 ops += data->value.ui64 - f->nputpage;
300 - //dbug("nputpage = %llu\n",data->value.ui64-f->nputpage);
301 + //dbug("nputpage = %" PRIu64 "\n",data->value.ui64-f->nputpage);
302 f->nputpage = data->value.ui64;
303
304 data = fsks.nread;
305 @@ -1623,7 +1623,7 @@
306 if (data->value.ui64 < f->nread)
307 f->nread = data->value.ui64;
308 ops += data->value.ui64 - f->nread;
309 - //dbug("nread = %llu\n",data->value.ui64-f->nread);
310 + //dbug("nread = %" PRIu64 "\n",data->value.ui64-f->nread);
311 f->nread = data->value.ui64;
312
313 data = fsks.nreaddir;
314 @@ -1631,7 +1631,7 @@
315 if (data->value.ui64 < f->nreaddir)
316 f->nreaddir = data->value.ui64;
317 ops += data->value.ui64 - f->nreaddir;
318 - //dbug("nreaddir = %llu\n",data->value.ui64-f->nreaddir);
319 + //dbug("nreaddir = %" PRIu64 "\n",data->value.ui64-f->nreaddir);
320 f->nreaddir = data->value.ui64;
321
322 data = fsks.nreadlink;
323 @@ -1639,7 +1639,7 @@
324 if (data->value.ui64 < f->nreadlink)
325 f->nreadlink = data->value.ui64;
326 ops += data->value.ui64 - f->nreadlink;
327 - //dbug("nreadlink = %llu\n",data->value.ui64-f->nreadlink);
328 + //dbug("nreadlink = %" PRIu64 "\n",data->value.ui64-f->nreadlink);
329 f->nreadlink = data->value.ui64;
330
331 data = fsks.nrealvp;
332 @@ -1647,7 +1647,7 @@
333 if (data->value.ui64 < f->nrealvp)
334 f->nrealvp = data->value.ui64;
335 ops += data->value.ui64 - f->nrealvp;
336 - //dbug("nrealvp = %llu\n",data->value.ui64-f->nrealvp);
337 + //dbug("nrealvp = %" PRIu64 "\n",data->value.ui64-f->nrealvp);
338 f->nrealvp = data->value.ui64;
339
340 data = fsks.nremove;
341 @@ -1655,7 +1655,7 @@
342 if (data->value.ui64 < f->nremove)
343 f->nremove = data->value.ui64;
344 ops += data->value.ui64 - f->nremove;
345 - //dbug("nremove = %llu\n",data->value.ui64-f->nremove);
346 + //dbug("nremove = %" PRIu64 "\n",data->value.ui64-f->nremove);
347 f->nremove = data->value.ui64;
348
349 data = fsks.nrename;
350 @@ -1663,7 +1663,7 @@
351 if (data->value.ui64 < f->nrename)
352 f->nrename = data->value.ui64;
353 ops += data->value.ui64 - f->nrename;
354 - //dbug("nrename = %llu\n",data->value.ui64-f->nrename);
355 + //dbug("nrename = %" PRIu64 "\n",data->value.ui64-f->nrename);
356 f->nrename = data->value.ui64;
357
358 data = fsks.nrmdir;
359 @@ -1671,7 +1671,7 @@
360 if (data->value.ui64 < f->nrmdir)
361 f->nrmdir = data->value.ui64;
362 ops += data->value.ui64 - f->nrmdir;
363 - //dbug("nrmdir = %llu\n",data->value.ui64-f->nrmdir);
364 + //dbug("nrmdir = %" PRIu64 "\n",data->value.ui64-f->nrmdir);
365 f->nrmdir = data->value.ui64;
366
367 data = fsks.nrwlock;
368 @@ -1679,7 +1679,7 @@
369 if (data->value.ui64 < f->nrwlock)
370 f->nrwlock = data->value.ui64;
371 ops += data->value.ui64 - f->nrwlock;
372 - //dbug("nrwlock = %llu\n",data->value.ui64-f->nrwlock);
373 + //dbug("nrwlock = %" PRIu64 "\n",data->value.ui64-f->nrwlock);
374 f->nrwlock = data->value.ui64;
375
376 data = fsks.nrwunlock;
377 @@ -1687,7 +1687,7 @@
378 if (data->value.ui64 < f->nrwunlock)
379 f->nrwunlock = data->value.ui64;
380 ops += data->value.ui64 - f->nrwunlock;
381 - //dbug("nrwunlock = %llu\n",data->value.ui64-f->nrwunlock);
382 + //dbug("nrwunlock = %" PRIu64 "\n",data->value.ui64-f->nrwunlock);
383 f->nrwunlock = data->value.ui64;
384
385 data = fsks.nseek;
386 @@ -1695,7 +1695,7 @@
387 if (data->value.ui64 < f->nseek)
388 f->nseek = data->value.ui64;
389 ops += data->value.ui64 - f->nseek;
390 - //dbug("nseek = %llu\n",data->value.ui64-f->nseek);
391 + //dbug("nseek = %" PRIu64 "\n",data->value.ui64-f->nseek);
392 f->nseek = data->value.ui64;
393
394 data = fsks.nsetattr;
395 @@ -1703,7 +1703,7 @@
396 if (data->value.ui64 < f->nsetattr)
397 f->nsetattr = data->value.ui64;
398 ops += data->value.ui64 - f->nsetattr;
399 - //dbug("nsetattr = %llu\n",data->value.ui64-f->nsetattr);
400 + //dbug("nsetattr = %" PRIu64 "\n",data->value.ui64-f->nsetattr);
401 f->nsetattr = data->value.ui64;
402
403 data = fsks.nsetfl;
404 @@ -1711,7 +1711,7 @@
405 if (data->value.ui64 < f->nsetfl)
406 f->nsetfl = data->value.ui64;
407 ops += data->value.ui64 - f->nsetfl;
408 - //dbug("nsetfl = %llu\n",data->value.ui64-f->nsetfl);
409 + //dbug("nsetfl = %" PRIu64 "\n",data->value.ui64-f->nsetfl);
410 f->nsetfl = data->value.ui64;
411
412 data = fsks.nsetsecattr;
413 @@ -1719,7 +1719,7 @@
414 if (data->value.ui64 < f->nsetsecattr)
415 f->nsetsecattr = data->value.ui64;
416 ops += data->value.ui64 - f->nsetsecattr;
417 - //dbug("nsetsecattr = %llu\n",data->value.ui64-f->nsetsecattr);
418 + //dbug("nsetsecattr = %" PRIu64 "\n",data->value.ui64-f->nsetsecattr);
419 f->nsetsecattr = data->value.ui64;
420
421 data = fsks.nshrlock;
422 @@ -1727,7 +1727,7 @@
423 if (data->value.ui64 < f->nshrlock)
424 f->nshrlock = data->value.ui64;
425 ops += data->value.ui64 - f->nshrlock;
426 - //dbug("nshrlock = %llu\n",data->value.ui64-f->nsetsecattr);
427 + //dbug("nshrlock = %" PRIu64 "\n",data->value.ui64-f->nsetsecattr);
428 f->nshrlock = data->value.ui64;
429
430 data = fsks.nspace;
431 @@ -1735,7 +1735,7 @@
432 if (data->value.ui64 < f->nspace)
433 f->nspace = data->value.ui64;
434 ops += data->value.ui64 - f->nspace;
435 - //dbug("nspace = %llu\n",data->value.ui64-f->nsetsecattr);
436 + //dbug("nspace = %" PRIu64 "\n",data->value.ui64-f->nsetsecattr);
437 f->nspace = data->value.ui64;
438
439 data = fsks.nsymlink;
440 @@ -1743,7 +1743,7 @@
441 if (data->value.ui64 < f->nsymlink)
442 f->nsymlink = data->value.ui64;
443 ops += data->value.ui64 - f->nsymlink;
444 - //dbug("nsymlink = %llu\n",data->value.ui64-f->nsymlink);
445 + //dbug("nsymlink = %" PRIu64 "\n",data->value.ui64-f->nsymlink);
446 f->nsymlink = data->value.ui64;
447
448 data = fsks.nvnevent;
449 @@ -1751,7 +1751,7 @@
450 if (data->value.ui64 < f->nvnevent)
451 f->nvnevent = data->value.ui64;
452 ops += data->value.ui64 - f->nvnevent;
453 - //dbug("nvnevent = %llu\n",data->value.ui64-f->nvnevent);
454 + //dbug("nvnevent = %" PRIu64 "\n",data->value.ui64-f->nvnevent);
455 f->nvnevent = data->value.ui64;
456
457 data = fsks.nwrite;
458 @@ -1759,16 +1759,16 @@
459 if (data->value.ui64 < f->nwrite)
460 f->nwrite = data->value.ui64;
461 ops += data->value.ui64 - f->nwrite;
462 - //dbug("nwrite = %llu\n",data->value.ui64-f->nwrite);
463 + //dbug("nwrite = %" PRIu64 "\n",data->value.ui64-f->nwrite);
464 f->nwrite = data->value.ui64;
465
466 f->ops_rate = (float)(ops) * td;
467 - dbug("%s: oprate %g, ntotal %llu, ops %llu, dt %lld\n",f->dev,f->ops_rate,f->ntotal,ops,s->ks_snaptime-f->rate_ts);
468 + dbug("%s: oprate %g, ntotal %" PRIu64 ", ops %" PRIu64 ", dt %" PRIi64 "\n",f->dev,f->ops_rate,f->ntotal,ops,s->ks_snaptime-f->rate_ts);
469 f->ntotal = ops;
470
471 f->rate_ts = s->ks_snaptime;
472 c->iteration = Iteration;
473 - dbug("%s: I/O(%g/%g), %lld %lld\n",f->dev,f->read_rate,f->write_rate,c->value[0],c->value[1]);
474 + dbug("%s: I/O(%g/%g), %" PRIi64 " %" PRIi64 "\n",f->dev,f->read_rate,f->write_rate,c->value[0],c->value[1]);
475 c = c->next;
476 }
477 while (fs) {
478 diff -Naur sysstat-20151012.orig/network.c sysstat-20151012/network.c
479 --- sysstat-20151012.orig/network.c 2015-10-12 21:30:47.000000000 +0200
480 +++ sysstat-20151012/network.c 2016-12-07 17:11:38.387770462 +0100
481 @@ -126,7 +126,7 @@
482 S -= l + 1;
483 m += l;
484 *m++ = '\t';
485 - /* c1 = snprintf(m,S,"%lld",v); {*/
486 + /* c1 = snprintf(m,S,"%" PRIi64 "",v); {*/
487 {
488 long long d = 10;
489 while (d <= v) {
490 @@ -143,7 +143,7 @@
491 }
492 }
493 --S;
494 - /* c1 = snprintf(m,S,"%lld",v); } */
495 + /* c1 = snprintf(m,S,"%" PRIi64 "",v); } */
496 *m++ = c;
497 M = m;
498 }
499 diff -Naur sysstat-20151012.orig/terminal.c sysstat-20151012/terminal.c
500 --- sysstat-20151012.orig/terminal.c 2015-10-12 21:30:47.000000000 +0200
501 +++ sysstat-20151012/terminal.c 2016-12-07 17:11:54.772223283 +0100
502 @@ -758,16 +758,16 @@
503 }
504 dl = sprintf(l,"%s",fs->dev);
505 if (fs->numzfs) {
506 - zl = snprintf(l+dl,Numcol,"(%llu)",fs->numzfs);
507 + zl = snprintf(l+dl,Numcol,"(%" PRIu64 ")",fs->numzfs);
508 assert(zl >= 0);
509 if (dl + zl > 21) {
510 if (zl)
511 - (void) sprintf(l+21-3-zl,"...(%llu) ",fs->numzfs);
512 + (void) sprintf(l+21-3-zl,"...(%" PRIu64 ") ",fs->numzfs);
513 else
514 (void) sprintf(l+21-3,"... ");
515 dl += zl;
516 } else if (zl) {
517 - (void) sprintf(l+dl,"(%llu) ",fs->numzfs);
518 + (void) sprintf(l+dl,"(%" PRIu64 ") ",fs->numzfs);
519 dl += zl;
520 }
521 }