1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
|
diff --exclude='*~' --exclude='.*' -I '$Id:' -urN sysstat-6.0.0.orig/iostat.c sysstat-6.0.0/iostat.c
--- sysstat-6.0.0.orig/iostat.c 2005-05-16 16:20:24.000000000 -0400
+++ sysstat-6.0.0/iostat.c 2005-05-16 16:48:06.000000000 -0400
@@ -958,7 +958,7 @@
/* Print time stamp */
if (DISPLAY_TIMESTAMP(flags)) {
- strftime(timestamp, sizeof(timestamp), "%X", loc_time);
+ strftime((char *)timestamp, sizeof(timestamp), "%X", loc_time);
printf(_("Time: %s\n"), timestamp);
}
diff --exclude='*~' --exclude='.*' -I '$Id:' -urN sysstat-6.0.0.orig/sa_common.c sysstat-6.0.0/sa_common.c
--- sysstat-6.0.0.orig/sa_common.c 2005-05-16 16:20:24.000000000 -0400
+++ sysstat-6.0.0/sa_common.c 2005-05-16 16:42:31.000000000 -0400
@@ -380,7 +380,7 @@
mktime(loc_time);
}
else
- loc_time = localtime(&(file_hdr->sa_ust_time));
+ loc_time = localtime((time_t *)(&(file_hdr->sa_ust_time)));
if (!format)
/* No output format (we are not using sadf) */
@@ -406,7 +406,7 @@
while (index < file_hdr->sa_iface) {
st_net_dev_j = st_net_dev[ref] + index;
- if (!strcmp(st_net_dev_i->interface, st_net_dev_j->interface)) {
+ if (!strcmp((char *)st_net_dev_i->interface, (char *)st_net_dev_j->interface)) {
/*
* Network interface found.
* If a counter has decreased, then we may assume that the
@@ -465,7 +465,7 @@
if (!ovfw) {
/* OK: assume here that the device was actually unregistered */
memset(st_net_dev_j, 0, STATS_NET_DEV_SIZE);
- strcpy(st_net_dev_j->interface, st_net_dev_i->interface);
+ strcpy((char *)st_net_dev_j->interface, (char *)st_net_dev_i->interface);
}
}
return index;
@@ -476,9 +476,9 @@
/* Network interface not found: Look for the first free structure */
for (index = 0; index < file_hdr->sa_iface; index++) {
st_net_dev_j = st_net_dev[ref] + index;
- if (!strcmp(st_net_dev_j->interface, "?")) {
+ if (!strcmp((char *)st_net_dev_j->interface, "?")) {
memset(st_net_dev_j, 0, STATS_NET_DEV_SIZE);
- strcpy(st_net_dev_j->interface, st_net_dev_i->interface);
+ strcpy((char *)st_net_dev_j->interface, (char *)st_net_dev_i->interface);
break;
}
}
@@ -489,7 +489,7 @@
st_net_dev_j = st_net_dev[ref] + index;
/* Since the name is not the same, reset all the structure */
memset(st_net_dev_j, 0, STATS_NET_DEV_SIZE);
- strcpy(st_net_dev_j->interface, st_net_dev_i->interface);
+ strcpy((char *)st_net_dev_j->interface, (char *)st_net_dev_i->interface);
return index;
}
diff --exclude='*~' --exclude='.*' -I '$Id:' -urN sysstat-6.0.0.orig/sadc.c sysstat-6.0.0/sadc.c
--- sysstat-6.0.0.orig/sadc.c 2005-05-16 16:20:24.000000000 -0400
+++ sysstat-6.0.0/sadc.c 2005-05-16 16:33:19.000000000 -0400
@@ -1419,7 +1419,7 @@
* old file with more interfaces than are actually available now.
*/
st_net_dev_i = st_net_dev + dev++;
- strcpy(st_net_dev_i->interface, "?");
+ strcpy((char *)(st_net_dev_i->interface), "?");
}
}
}
diff --exclude='*~' --exclude='.*' -I '$Id:' -urN sysstat-6.0.0.orig/sadf.c sysstat-6.0.0/sadf.c
--- sysstat-6.0.0.orig/sadf.c 2005-05-16 16:20:24.000000000 -0400
+++ sysstat-6.0.0/sadf.c 2005-05-16 16:47:18.000000000 -0400
@@ -136,10 +136,10 @@
if (PRINT_TRUE_TIME(flags) &&
((format == S_O_DB_OPTION) || (format == S_O_XML_OPTION)))
/* '-d -t' or '-x -t' */
- ltm = localtime(&file_stats[curr].ust_time);
+ ltm = localtime((time_t *)(&file_stats[curr].ust_time));
else
/* '-p' or '-p -t' or '-d' or '-x' */
- ltm = gmtime(&file_stats[curr].ust_time);
+ ltm = gmtime((time_t *)(&file_stats[curr].ust_time));
loc_time = *ltm;
}
@@ -675,7 +675,7 @@
for (i = 0; i < file_hdr.sa_iface; i++, ++sndi) {
- if (!strcmp((ifc = sndi->interface), "?"))
+ if (!strcmp((ifc = (char *)sndi->interface), "?"))
continue;
j = check_iface_reg(&file_hdr, st_net_dev, curr, !curr, i);
@@ -722,7 +722,7 @@
for (i = 0; i < file_hdr.sa_iface; i++, ++sndi) {
- if (!strcmp((ifc = sndi->interface), "?"))
+ if (!strcmp((ifc = (char *)sndi->interface), "?"))
continue;
j = check_iface_reg(&file_hdr, st_net_dev, curr, !curr, i);
@@ -1231,7 +1231,7 @@
for (i = 0; i < file_hdr.sa_iface; i++, sndi++) {
- if (!strcmp(sndi->interface, "?"))
+ if (!strcmp((char *)sndi->interface, "?"))
continue;
j = check_iface_reg(&file_hdr, st_net_dev, curr, !curr, i);
sndj = st_net_dev[!curr] + j;
@@ -1411,7 +1411,7 @@
{
printf("File: %s (%#x)\n", dfile, file_hdr->sa_magic);
- print_gal_header(localtime(&(file_hdr->sa_ust_time)), file_hdr->sa_sysname,
+ print_gal_header(localtime((time_t *)(&(file_hdr->sa_ust_time))), file_hdr->sa_sysname,
file_hdr->sa_release, file_hdr->sa_nodename);
printf("Activity flag: %#x\n", file_hdr->sa_actflag);
diff --exclude='*~' --exclude='.*' -I '$Id:' -urN sysstat-6.0.0.orig/sar.c sysstat-6.0.0/sar.c
--- sysstat-6.0.0.orig/sar.c 2005-05-16 16:20:24.000000000 -0400
+++ sysstat-6.0.0/sar.c 2005-05-16 16:43:19.000000000 -0400
@@ -213,7 +213,7 @@
loc_time.tm_sec = file_stats[curr].second;
}
else {
- ltm = localtime(&file_stats[curr].ust_time);
+ ltm = localtime((time_t *)(&file_stats[curr].ust_time));
loc_time = *ltm;
}
}
@@ -577,7 +577,7 @@
for (i = 0; i < file_hdr.sa_iface; i++, sndi++) {
- if (!strcmp(sndi->interface, "?"))
+ if (!strcmp((char *)sndi->interface, "?"))
continue;
j = check_iface_reg(&file_hdr, st_net_dev, curr, prev, i);
sndj = st_net_dev[prev] + j;
@@ -608,7 +608,7 @@
for (i = 0; i < file_hdr.sa_iface; i++, sndi++) {
- if (!strcmp(sndi->interface, "?"))
+ if (!strcmp((char *)sndi->interface, "?"))
continue;
j = check_iface_reg(&file_hdr, st_net_dev, curr, prev, i);
sndj = st_net_dev[prev] + j;
|
GitWeb