comparison: application/davcontroller.c
application/davcontroller.c
- changeset 24
- 12ad3393c151
- parent 22
- d7942163a2a3
- child 25
- 915131bc3233
equal
deleted
inserted
replaced
| 23:cdcb20412dd4 | 24:12ad3393c151 |
|---|---|
| 288 char *sz_uploaded_end = strchr(sz_uploaded, ' '); | 288 char *sz_uploaded_end = strchr(sz_uploaded, ' '); |
| 289 if (sz_uploaded_end) { | 289 if (sz_uploaded_end) { |
| 290 *sz_uploaded_end = 0; | 290 *sz_uploaded_end = 0; |
| 291 } | 291 } |
| 292 | 292 |
| 293 cxmutstr label1 = cx_asprintf( | 293 cxmutstr label1; |
| 294 "%s/%s %zu/%zu files", | 294 if (upload->total_files + upload->total_directories > 1) { |
| 295 sz_uploaded, | 295 label1 = cx_asprintf( |
| 296 sz_total, | 296 "%s/%s %zu/%zu files", |
| 297 upload->uploaded_files+upload->uploaded_directories, | 297 sz_uploaded, |
| 298 upload->total_files+upload->total_directories); | 298 sz_total, |
| 299 upload->uploaded_files+upload->uploaded_directories, | |
| 300 upload->total_files+upload->total_directories); | |
| 301 } else { | |
| 302 label1 = cx_asprintf( | |
| 303 "%s/%s", | |
| 304 sz_uploaded, | |
| 305 sz_total); | |
| 306 } | |
| 299 ui_set(upload->label_top_left, label1.ptr); | 307 ui_set(upload->label_top_left, label1.ptr); |
| 300 | 308 |
| 301 free(sz_total); | 309 free(sz_total); |
| 302 free(label1.ptr); | 310 free(label1.ptr); |
| 303 | 311 |
