Package: syrthes / 4.3.0-dfsg1-3

Wformat.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
Description: fix printf format warnings.
 These warnings generate false positives when grepping log files for 'ERROR'.
Author: Gilles Filippini <pini@debian.org>
Index: syrthes/src/syrthes-tools/convert2syrthes4/src/lecture_med.c
===================================================================
--- syrthes.orig/src/syrthes-tools/convert2syrthes4/src/lecture_med.c	2014-03-16 22:37:27.296768812 +0100
+++ syrthes/src/syrthes-tools/convert2syrthes4/src/lecture_med.c	2014-03-16 23:29:58.223883971 +0100
@@ -612,18 +612,18 @@
   /* allocations et verifications */
   ((*maillage).xcoord) = (double *) malloc (sizeof(double) * ((*maillage).nbnoeuds));
   if ((*maillage).xcoord == NULL) {
-    printf("ERROR : allocation error for the x coordinate, needed size : %i \n", sizeof(double) * ((*maillage).nbnoeuds));
+    printf("ERROR : allocation error for the x coordinate, needed size : %zu \n", sizeof(double) * ((*maillage).nbnoeuds));
     return 1;
   }
   ((*maillage).ycoord) = (double *) malloc (sizeof(double) * ((*maillage).nbnoeuds));
   if ((*maillage).ycoord == NULL) {
-    printf("ERROR : allocation error for the y coordinate, needed size : %i \n", sizeof(double) * ((*maillage).nbnoeuds));
+    printf("ERROR : allocation error for the y coordinate, needed size : %zu \n", sizeof(double) * ((*maillage).nbnoeuds));
     return 1;
   }   
   if ((*maillage).dimension == 3) {
     ((*maillage).zcoord) = (double *) malloc (sizeof(double) * ((*maillage).nbnoeuds));
     if ((*maillage).zcoord == NULL) {
-      printf("ERROR : allocation error for the z coordinate, needed size : %i \n", sizeof(double) * ((*maillage).nbnoeuds));
+      printf("ERROR : allocation error for the z coordinate, needed size : %zu \n", sizeof(double) * ((*maillage).nbnoeuds));
       return 1;
     }   
   }
@@ -691,7 +691,7 @@
   /* allocation */
   ((*maillage).coul_noeud) = (int *) malloc (sizeof(int) * ((*maillage).nbnoeuds));
   if ((*maillage).coul_noeud == NULL) {
-    printf("ERROR : allocation error for the nodes color, needed size : %i \n", sizeof(int) * ((*maillage).nbnoeuds));
+    printf("ERROR : allocation error for the nodes color, needed size : %zu \n", sizeof(int) * ((*maillage).nbnoeuds));
     return 1;
   }   
   /* initialisation a zero */
@@ -877,7 +877,7 @@
   /* allocation et verification */
   (*maillage).liste_elem = (int **) malloc (sizeof(int *) * ((*maillage).nbelem));
   if ((*maillage).liste_elem == NULL) {
-    printf("ERROR : allocation error for the connectivity, needed size : %i \n", sizeof(int *) * ((*maillage).nbelem));
+    printf("ERROR : allocation error for the connectivity, needed size : %zu \n", sizeof(int *) * ((*maillage).nbelem));
     return 1;
   }
   /* allocation du tableau de connectivite */
@@ -953,7 +953,7 @@
   /* allocation du tableau des couleurs d'elements et verification */
   (*maillage).coul_elem = (int *) malloc (sizeof(int) * ((*maillage).nbelem));
   if ((*maillage).liste_elem == NULL) {
-    printf("ERROR : allocation error for nodes color, needed size : %i \n", sizeof(int) * ((*maillage).nbelem));
+    printf("ERROR : allocation error for nodes color, needed size : %zu \n", sizeof(int) * ((*maillage).nbelem));
     return 1;
   }
   /* initialisation a 0 des couleurs d'elements */
@@ -1103,7 +1103,7 @@
      /* couleurs : allocation et initialisation */
      (*maillage).coul_elembord = (int *) malloc (sizeof(int) * (*maillage).nbelem_de_bord);
      if ((*maillage).coul_elembord == NULL) {
-       printf("ERROR : allocation error for the boundary connectivity, needed size : %i \n", sizeof(int) * (*maillage).nbelem_de_bord);
+       printf("ERROR : allocation error for the boundary connectivity, needed size : %zu \n", sizeof(int) * (*maillage).nbelem_de_bord);
        return 1;
      }
      for (i=0;i<(*maillage).nbelem_de_bord;i++)  (*maillage).coul_elembord[i] = 0;   
@@ -1180,7 +1180,7 @@
      /* allocation et verification */
      (*maillage).liste_elembord = (int **) malloc (sizeof(int *) * ((*maillage).nbelem_de_bord));
      if ((*maillage).liste_elembord == NULL) {
-       printf("ERROR : allocation error for the boundary connectivity, needed size : %i \n", sizeof(int *) * ((*maillage).nbelem_de_bord));
+       printf("ERROR : allocation error for the boundary connectivity, needed size : %zu \n", sizeof(int *) * ((*maillage).nbelem_de_bord));
        return 1;
      }
      /* allocation du tableau de connectivite */
@@ -1221,7 +1221,7 @@
         /* allocation du tableau des references des faces */
         (*maillage).liste_reffaces = (int **) malloc (sizeof(int *) * ((*maillage).nbelem));
         if ((*maillage).liste_reffaces == NULL) {
-              printf("ERROR : allocation error for face references, needed size : %i \n", sizeof(int *) * ((*maillage).nbelem));
+              printf("ERROR : allocation error for face references, needed size : %zu \n", sizeof(int *) * ((*maillage).nbelem));
           return 1;
         }
         for  (i=0;i<(*maillage).nbelem;i++) (*maillage).liste_reffaces[i] = (int *) malloc (sizeof(int) * nbfaces_par_elem);
Index: syrthes/src/syrthes-tools/convert2syrthes4/src/lecture_msh.c
===================================================================
--- syrthes.orig/src/syrthes-tools/convert2syrthes4/src/lecture_msh.c	2014-03-16 22:37:27.296768812 +0100
+++ syrthes/src/syrthes-tools/convert2syrthes4/src/lecture_msh.c	2014-03-16 23:30:05.000321023 +0100
@@ -108,12 +108,12 @@
     /* allocations et verifications */
     ((*maillage).xcoord) = (double *) malloc (sizeof(double) * ((*maillage).nbnoeuds));
     if ((*maillage).xcoord == NULL) {
-      printf("ERROR : allocation error for the x coordinate, needed size : %i \n", sizeof(double) * ((*maillage).nbnoeuds));
+      printf("ERROR : allocation error for the x coordinate, needed size : %zu \n", sizeof(double) * ((*maillage).nbnoeuds));
       return 1;
     }
     ((*maillage).ycoord) = (double *) malloc (sizeof(double) * ((*maillage).nbnoeuds));
     if ((*maillage).ycoord == NULL) {
-      printf("ERROR : allocation error for the y coordinate, needed size : %i \n", sizeof(double) * ((*maillage).nbnoeuds));
+      printf("ERROR : allocation error for the y coordinate, needed size : %zu \n", sizeof(double) * ((*maillage).nbnoeuds));
       return 1;
     }   
     numnoeud_moinsun = 0;
@@ -127,17 +127,17 @@
     /* allocations et verifications */
     ((*maillage).xcoord) = (double *) malloc (sizeof(double) * ((*maillage).nbnoeuds));
     if ((*maillage).xcoord == NULL) {
-      printf("ERROR : allocation error for the x coordinate, needed size : %i \n", sizeof(double) * ((*maillage).nbnoeuds));
+      printf("ERROR : allocation error for the x coordinate, needed size : %zu \n", sizeof(double) * ((*maillage).nbnoeuds));
       return 1;
     }
     ((*maillage).ycoord) = (double *) malloc (sizeof(double) * ((*maillage).nbnoeuds));
     if ((*maillage).ycoord == NULL) {
-      printf("ERROR : allocation error for the y coordinate, needed size : %i \n", sizeof(double) * ((*maillage).nbnoeuds));
+      printf("ERROR : allocation error for the y coordinate, needed size : %zu \n", sizeof(double) * ((*maillage).nbnoeuds));
       return 1;
     }   
     ((*maillage).zcoord) = (double *) malloc (sizeof(double) * ((*maillage).nbnoeuds));
     if ((*maillage).zcoord == NULL) {
-      printf("ERROR : allocation error for the z coordinate, needed size : %i \n", sizeof(double) * ((*maillage).nbnoeuds));
+      printf("ERROR : allocation error for the z coordinate, needed size : %zu \n", sizeof(double) * ((*maillage).nbnoeuds));
       return 1;
     }   
     for (numnoeud_moinsun = 0; numnoeud_moinsun < (*maillage).nbnoeuds ; numnoeud_moinsun++) {
@@ -171,7 +171,7 @@
   /* allocation */
   ((*maillage).coul_noeud) = (int *) malloc (sizeof(int) * ((*maillage).nbnoeuds));
   if ((*maillage).coul_noeud == NULL) {
-    printf("ERROR : allocation error for nodes color, needed size : %i \n", sizeof(int) * ((*maillage).nbnoeuds));
+    printf("ERROR : allocation error for nodes color, needed size : %zu \n", sizeof(int) * ((*maillage).nbnoeuds));
     return 1;
   }   
   /* initialisation a zero */
@@ -243,12 +243,12 @@
   coul_elem_triangle = (int *) malloc (sizeof(int ) * nbelemtotal);
   coul_elem_segment = (int *) malloc (sizeof(int ) * nbelemtotal);
   if (elem_tetraedre == NULL || elem_triangle == NULL || elem_segment == NULL) {
-    printf("ERROR : allocation error (lecture_msh), needed size for each elem_ : %i \n", sizeof(int *) * (nbelemtotal));
+    printf("ERROR : allocation error (lecture_msh), needed size for each elem_ : %zu \n", sizeof(int *) * (nbelemtotal));
     return 1;
   }
   /* les allocations plus basses de ces tableaux seront faites en fonction des elements trouves (elements de bord ou non) */
   if (coul_elem_tetraedre == NULL || coul_elem_triangle == NULL || coul_elem_segment == NULL) {
-    printf("ERROR : allocation error for the elements color, needed size : %i \n", sizeof(int) * (nbelemtotal));
+    printf("ERROR : allocation error for the elements color, needed size : %zu \n", sizeof(int) * (nbelemtotal));
     return 1;
   }
   
Index: syrthes/src/syrthes-tools/convert2syrthes4/src/lecture_neu.c
===================================================================
--- syrthes.orig/src/syrthes-tools/convert2syrthes4/src/lecture_neu.c	2014-03-16 22:37:27.296768812 +0100
+++ syrthes/src/syrthes-tools/convert2syrthes4/src/lecture_neu.c	2014-03-16 23:30:11.112715270 +0100
@@ -172,12 +172,12 @@
     /* allocations et verifications */
     ((*maillage).xcoord) = (double *) malloc (sizeof(double) * ((*maillage).nbnoeuds));
     if ((*maillage).xcoord == NULL) {
-      printf("ERROR : allocation error, x coordinate, needed size : %i \n", sizeof(double) * ((*maillage).nbnoeuds));
+      printf("ERROR : allocation error, x coordinate, needed size : %zu \n", sizeof(double) * ((*maillage).nbnoeuds));
       return 1;
     }
     ((*maillage).ycoord) = (double *) malloc (sizeof(double) * ((*maillage).nbnoeuds));
     if ((*maillage).ycoord == NULL) {
-      printf("ERROR : allocation error, y coordinate, needed size : %i \n", sizeof(double) * ((*maillage).nbnoeuds));
+      printf("ERROR : allocation error, y coordinate, needed size : %zu \n", sizeof(double) * ((*maillage).nbnoeuds));
       return 1;
     }   
     numnoeud_moinsun = 0;
@@ -191,17 +191,17 @@
     /* allocations et verifications */
     ((*maillage).xcoord) = (double *) malloc (sizeof(double) * ((*maillage).nbnoeuds));
     if ((*maillage).xcoord == NULL) {
-      printf("ERROR : allocation error, x coordinate, needed size : %i \n", sizeof(double) * ((*maillage).nbnoeuds));
+      printf("ERROR : allocation error, x coordinate, needed size : %zu \n", sizeof(double) * ((*maillage).nbnoeuds));
       return 1;
     }
     ((*maillage).ycoord) = (double *) malloc (sizeof(double) * ((*maillage).nbnoeuds));
     if ((*maillage).ycoord == NULL) {
-      printf("ERROR : allocation error, y coordinate, needed size : %i \n", sizeof(double) * ((*maillage).nbnoeuds));
+      printf("ERROR : allocation error, y coordinate, needed size : %zu \n", sizeof(double) * ((*maillage).nbnoeuds));
       return 1;
     }   
     ((*maillage).zcoord) = (double *) malloc (sizeof(double) * ((*maillage).nbnoeuds));
     if ((*maillage).zcoord == NULL) {
-      printf("ERROR : allocation error, z coordinate, needed size : %i \n", sizeof(double) * ((*maillage).nbnoeuds));
+      printf("ERROR : allocation error, z coordinate, needed size : %zu \n", sizeof(double) * ((*maillage).nbnoeuds));
       return 1;
     }   
     for (numnoeud_moinsun = 0; numnoeud_moinsun < (*maillage).nbnoeuds ; numnoeud_moinsun++) {
@@ -236,7 +236,7 @@
   /* allocation */
   ((*maillage).coul_noeud) = (int *) malloc (sizeof(int) * ((*maillage).nbnoeuds));
   if ((*maillage).coul_noeud == NULL) {
-    printf("ERROR : allocation error for the node color table, needed size : %i \n", sizeof(int) * ((*maillage).nbnoeuds));
+    printf("ERROR : allocation error for the node color table, needed size : %zu \n", sizeof(int) * ((*maillage).nbnoeuds));
     return 1;
   }   
   /* initialisation a zero */
@@ -283,7 +283,7 @@
   /* allocation et verification */
   (*maillage).liste_elem = (int **) malloc (sizeof(int *) * ((*maillage).nbelem));
   if ((*maillage).liste_elem == NULL) {
-    printf("ERROR : allocation error for the connectivity, needed size : %i \n", sizeof(int *) * ((*maillage).nbelem));
+    printf("ERROR : allocation error for the connectivity, needed size : %zu \n", sizeof(int *) * ((*maillage).nbelem));
     return 1;
   }
 
@@ -551,7 +551,7 @@
   /* allocation du tableau des couleurs d'elements et verification */
   (*maillage).coul_elem = (int *) malloc (sizeof(int) * ((*maillage).nbelem));
   if ((*maillage).liste_elem == NULL) {
-    printf("ERROR : allocation error for the elements color table, needed size : %i \n", sizeof(int) * ((*maillage).nbelem));
+    printf("ERROR : allocation error for the elements color table, needed size : %zu \n", sizeof(int) * ((*maillage).nbelem));
     return 1;
   }
   /* initialisation a 0 des couleurs d'elements */
@@ -678,7 +678,7 @@
     /* allocation du tableau du nombre d'elements par condition limite */
     nbelem_de_la_cl = (int *) malloc (sizeof(int) * ((*maillage).nbcl));
     if (nbelem_de_la_cl == NULL) {
-      printf("ERROR : allocation error for nbelem_de_la_cl, needed size : %i \n", sizeof(int) * ((*maillage).nbcl));
+      printf("ERROR : allocation error for nbelem_de_la_cl, needed size : %zu \n", sizeof(int) * ((*maillage).nbcl));
       return 1;
     }
     for (i=0;i<(*maillage).nbcl;i++) nbelem_de_la_cl[i] = 0;
@@ -687,7 +687,7 @@
     /* allocation du tableau des listes des elements de bord : une partie ne sert pas si parmi les conditions il y a des conditions noeuds */
     elembord = (int ***) malloc (sizeof(int **) * ((*maillage).nbcl));
     if (elembord == NULL) {
-      printf("ERROR : allocation error for the boundary elements, needed size : %i \n", sizeof(int **) * ((*maillage).nbcl));
+      printf("ERROR : allocation error for the boundary elements, needed size : %zu \n", sizeof(int **) * ((*maillage).nbcl));
       return 1;
     }
     
@@ -825,12 +825,12 @@
     (*maillage).nbelem_de_bord = numelembord;
     (*maillage).liste_elembord = (int **) malloc (sizeof(int *) * numelembord);
     if ((*maillage).liste_elembord == NULL) {
-      printf("ERROR : allocation error for the boundary elements list, needed size : %i \n", sizeof(int *) * numelembord);
+      printf("ERROR : allocation error for the boundary elements list, needed size : %zu \n", sizeof(int *) * numelembord);
       return 1;
     }
     (*maillage).coul_elembord = (int *) malloc (sizeof(int) * numelembord);
     if ((*maillage).coul_elembord == NULL) {
-      printf("ERROR : allocation error for the boundary elements color, needed size : %i \n", sizeof(int) * numelembord);
+      printf("ERROR : allocation error for the boundary elements color, needed size : %zu \n", sizeof(int) * numelembord);
       return 1;
     }