forked frompostgres/postgres
- Notifications
You must be signed in to change notification settings - Fork6
Commit088c065
committed
pg_upgrade: Fix exec_prog API to be less flaky
The previous signature made it very easy to pass something other thanthe printf-format specifier in the corresponding position, without anywarning from the compiler.While at it, move some of the escaping, redirecting and quotingresponsibilities from the callers into exec_prog() itself. This makesthe callsites cleaner.1 parent34c0204 commit088c065
File tree
6 files changed
+96
-113
lines changed- contrib/pg_upgrade
6 files changed
+96
-113
lines changedLines changed: 3 additions & 6 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
183 | 183 |
| |
184 | 184 |
| |
185 | 185 |
| |
186 |
| - | |
187 |
| - | |
188 |
| - | |
189 |
| - | |
190 |
| - | |
| 186 | + | |
| 187 | + | |
191 | 188 |
| |
192 |
| - | |
| 189 | + | |
193 | 190 |
| |
194 | 191 |
| |
195 | 192 |
| |
|
Lines changed: 4 additions & 5 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
23 | 23 |
| |
24 | 24 |
| |
25 | 25 |
| |
26 |
| - | |
27 |
| - | |
28 |
| - | |
29 |
| - | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
30 | 29 |
| |
31 |
| - | |
| 30 | + | |
32 | 31 |
| |
33 | 32 |
| |
34 | 33 |
| |
|
Lines changed: 42 additions & 38 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
26 | 26 |
| |
27 | 27 |
| |
28 | 28 |
| |
| 29 | + | |
| 30 | + | |
29 | 31 |
| |
30 |
| - | |
31 |
| - | |
32 |
| - | |
33 |
| - | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
34 | 35 |
| |
35 |
| - | |
36 |
| - | |
37 |
| - | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
38 | 40 |
| |
39 |
| - | |
40 |
| - | |
41 |
| - | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
42 | 44 |
| |
43 |
| - | |
44 | 45 |
| |
45 |
| - | |
46 |
| - | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
47 | 49 |
| |
48 | 50 |
| |
| 51 | + | |
49 | 52 |
| |
50 |
| - | |
51 |
| - | |
| 53 | + | |
52 | 54 |
| |
53 |
| - | |
54 |
| - | |
55 |
| - | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
56 | 65 |
| |
57 | 66 |
| |
58 | 67 |
| |
59 | 68 |
| |
60 | 69 |
| |
| 70 | + | |
61 | 71 |
| |
62 |
| - | |
63 |
| - | |
| 72 | + | |
| 73 | + | |
64 | 74 |
| |
65 | 75 |
| |
66 | 76 |
| |
67 | 77 |
| |
68 | 78 |
| |
69 |
| - | |
70 |
| - | |
| 79 | + | |
71 | 80 |
| |
72 | 81 |
| |
73 | 82 |
| |
74 |
| - | |
75 |
| - | |
76 |
| - | |
77 |
| - | |
78 |
| - | |
79 |
| - | |
80 |
| - | |
81 |
| - | |
82 | 83 |
| |
83 | 84 |
| |
84 | 85 |
| |
85 |
| - | |
86 |
| - | |
87 |
| - | |
88 |
| - | |
89 |
| - | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
90 | 96 |
| |
91 |
| - | |
92 |
| - | |
93 | 97 |
| |
94 | 98 |
| |
95 | 99 |
| |
96 | 100 |
| |
97 | 101 |
| |
98 | 102 |
| |
99 |
| - | |
| 103 | + | |
100 | 104 |
| |
101 | 105 |
| |
102 | 106 |
| |
|
Lines changed: 26 additions & 42 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
140 | 140 |
| |
141 | 141 |
| |
142 | 142 |
| |
143 |
| - | |
144 |
| - | |
145 |
| - | |
| 143 | + | |
| 144 | + | |
146 | 145 |
| |
147 |
| - | |
| 146 | + | |
148 | 147 |
| |
149 | 148 |
| |
150 | 149 |
| |
| |||
211 | 210 |
| |
212 | 211 |
| |
213 | 212 |
| |
214 |
| - | |
215 |
| - | |
216 |
| - | |
| 213 | + | |
| 214 | + | |
217 | 215 |
| |
218 |
| - | |
| 216 | + | |
219 | 217 |
| |
220 | 218 |
| |
221 | 219 |
| |
| |||
225 | 223 |
| |
226 | 224 |
| |
227 | 225 |
| |
228 |
| - | |
229 |
| - | |
230 |
| - | |
| 226 | + | |
| 227 | + | |
231 | 228 |
| |
232 |
| - | |
| 229 | + | |
233 | 230 |
| |
234 | 231 |
| |
235 | 232 |
| |
| |||
263 | 260 |
| |
264 | 261 |
| |
265 | 262 |
| |
266 |
| - | |
267 |
| - | |
268 |
| - | |
269 |
| - | |
270 |
| - | |
271 |
| - | |
| 263 | + | |
| 264 | + | |
272 | 265 |
| |
273 |
| - | |
| 266 | + | |
274 | 267 |
| |
275 | 268 |
| |
276 | 269 |
| |
| |||
296 | 289 |
| |
297 | 290 |
| |
298 | 291 |
| |
299 |
| - | |
300 |
| - | |
301 |
| - | |
302 |
| - | |
303 |
| - | |
| 292 | + | |
| 293 | + | |
304 | 294 |
| |
305 |
| - | |
| 295 | + | |
306 | 296 |
| |
307 | 297 |
| |
308 | 298 |
| |
| |||
331 | 321 |
| |
332 | 322 |
| |
333 | 323 |
| |
334 |
| - | |
| 324 | + | |
335 | 325 |
| |
336 |
| - | |
337 |
| - | |
| 326 | + | |
338 | 327 |
| |
339 | 328 |
| |
340 |
| - | |
341 |
| - | |
| 329 | + | |
342 | 330 |
| |
343 |
| - | |
| 331 | + | |
344 | 332 |
| |
345 | 333 |
| |
346 | 334 |
| |
| |||
353 | 341 |
| |
354 | 342 |
| |
355 | 343 |
| |
356 |
| - | |
357 |
| - | |
358 |
| - | |
359 |
| - | |
360 |
| - | |
361 |
| - | |
| 344 | + | |
| 345 | + | |
| 346 | + | |
| 347 | + | |
362 | 348 |
| |
363 | 349 |
| |
364 | 350 |
| |
365 | 351 |
| |
366 |
| - | |
367 |
| - | |
368 |
| - | |
369 |
| - | |
| 352 | + | |
| 353 | + | |
370 | 354 |
| |
371 |
| - | |
| 355 | + | |
372 | 356 |
| |
373 | 357 |
| |
374 | 358 |
| |
|
Lines changed: 5 additions & 4 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
316 | 316 |
| |
317 | 317 |
| |
318 | 318 |
| |
319 |
| - | |
320 |
| - | |
321 |
| - | |
322 |
| - | |
| 319 | + | |
| 320 | + | |
| 321 | + | |
| 322 | + | |
| 323 | + | |
323 | 324 |
| |
324 | 325 |
| |
325 | 326 |
| |
|
Lines changed: 16 additions & 18 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
143 | 143 |
| |
144 | 144 |
| |
145 | 145 |
| |
146 |
| - | |
| 146 | + | |
147 | 147 |
| |
148 | 148 |
| |
149 | 149 |
| |
| |||
159 | 159 |
| |
160 | 160 |
| |
161 | 161 |
| |
162 |
| - | |
163 |
| - | |
| 162 | + | |
164 | 163 |
| |
165 | 164 |
| |
166 | 165 |
| |
167 | 166 |
| |
168 |
| - | |
| 167 | + | |
169 | 168 |
| |
170 | 169 |
| |
171 | 170 |
| |
172 | 171 |
| |
173 | 172 |
| |
174 |
| - | |
175 |
| - | |
176 |
| - | |
| 173 | + | |
| 174 | + | |
| 175 | + | |
| 176 | + | |
177 | 177 |
| |
| 178 | + | |
178 | 179 |
| |
179 | 180 |
| |
180 | 181 |
| |
| |||
185 | 186 |
| |
186 | 187 |
| |
187 | 188 |
| |
188 |
| - | |
| 189 | + | |
| 190 | + | |
189 | 191 |
| |
190 | 192 |
| |
191 | 193 |
| |
192 | 194 |
| |
193 | 195 |
| |
194 |
| - | |
| 196 | + | |
195 | 197 |
| |
196 | 198 |
| |
197 | 199 |
| |
| |||
202 | 204 |
| |
203 | 205 |
| |
204 | 206 |
| |
205 |
| - | |
206 | 207 |
| |
207 | 208 |
| |
208 | 209 |
| |
| |||
212 | 213 |
| |
213 | 214 |
| |
214 | 215 |
| |
215 |
| - | |
216 |
| - | |
217 |
| - | |
218 |
| - | |
219 |
| - | |
220 |
| - | |
221 |
| - | |
222 |
| - | |
| 216 | + | |
| 217 | + | |
| 218 | + | |
| 219 | + | |
| 220 | + | |
223 | 221 |
| |
224 | 222 |
| |
225 | 223 |
| |
|
0 commit comments
Comments
(0)