Skip to content

Commit 3c88faf

Browse files
committed
tools/afcclient: Print human readable description of AFC error code on error
1 parent 0bdef85 commit 3c88faf

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

tools/afcclient.c

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ static void handle_devinfo(afc_client_t afc, int argc, char** argv)
319319
printf("%s: %s\n", info[i], info[i+1]);
320320
}
321321
} else {
322-
printf("Error: Failed to get device info: %d\n", err);
322+
printf("Error: Failed to get device info: %s (%d)\n", afc_strerror(err), err);
323323
}
324324
afc_dictionary_free(info);
325325
}
@@ -390,7 +390,7 @@ static void handle_file_info(afc_client_t afc, int argc, char** argv)
390390
printf("%s: %s\n", info[i], info[i+1]);
391391
}
392392
} else {
393-
printf("Error: Failed to get file info for %s: %d\n", argv[0], err);
393+
printf("Error: Failed to get file info for %s: %s (%d)\n", argv[0], afc_strerror(err), err);
394394
}
395395
afc_dictionary_free(info);
396396
free(abspath);
@@ -481,7 +481,7 @@ static void handle_list(afc_client_t afc, int argc, char** argv)
481481
print_file_info(afc, abspath, list_verbose);
482482
return;
483483
} else if (err != AFC_E_SUCCESS) {
484-
printf("Error: Failed to list '%s': %d\n", path, err);
484+
printf("Error: Failed to list '%s': %s (%d)\n", path, afc_strerror(err), err);
485485
free(abspath);
486486
return;
487487
}
@@ -526,7 +526,7 @@ static void handle_rename(afc_client_t afc, int argc, char** argv)
526526
}
527527
afc_error_t err = afc_rename_path(afc, srcpath, dstpath);
528528
if (err != AFC_E_SUCCESS) {
529-
printf("Error: Failed to rename '%s' -> '%s': %d\n", argv[0], argv[1], err);
529+
printf("Error: Failed to rename '%s' -> '%s': %s (%d)\n", argv[0], argv[1], afc_strerror(err), err);
530530
}
531531
free(srcpath);
532532
free(dstpath);
@@ -542,7 +542,7 @@ static void handle_mkdir(afc_client_t afc, int argc, char** argv)
542542
}
543543
afc_error_t err = afc_make_directory(afc, abspath);
544544
if (err != AFC_E_SUCCESS) {
545-
printf("Error: Failed to create directory '%s': %d\n", argv[i], err);
545+
printf("Error: Failed to create directory '%s': %s (%d)\n", argv[i], afc_strerror(err), err);
546546
}
547547
free(abspath);
548548
}
@@ -572,7 +572,7 @@ static void handle_link(afc_client_t afc, int argc, char** argv)
572572
}
573573
afc_error_t err = afc_make_link(afc, link_type, argv[0], link_name);
574574
if (err != AFC_E_SUCCESS) {
575-
printf("Error: Failed to create %s link for '%s' at '%s': %d\n", (link_type == AFC_HARDLINK) ? "hard" : "symbolic", argv[0], link_name, err);
575+
printf("Error: Failed to create %s link for '%s' at '%s': %s (%d)\n", (link_type == AFC_HARDLINK) ? "hard" : "symbolic", argv[0], link_name, afc_strerror(err), err);
576576
}
577577
}
578578

@@ -586,7 +586,7 @@ static void handle_remove(afc_client_t afc, int argc, char** argv)
586586
}
587587
afc_error_t err = afc_remove_path(afc, abspath);
588588
if (err != AFC_E_SUCCESS) {
589-
printf("Error: Failed to remove '%s': %d\n", argv[i], err);
589+
printf("Error: Failed to remove '%s': %s (%d)\n", argv[i], afc_strerror(err), err);
590590
}
591591
free(abspath);
592592
}
@@ -627,7 +627,7 @@ static void handle_get(afc_client_t afc, int argc, char** argv)
627627
if (err != AFC_E_SUCCESS) {
628628
free(srcpath);
629629
free(dstpath);
630-
printf("Error: Failed to open file '%s': %d\n", argv[0], err);
630+
printf("Error: Failed to open file '%s': %s (%d)\n", argv[0], afc_strerror(err), err);
631631
return;
632632
}
633633
FILE *f = fopen(dstpath, "wb");
@@ -687,7 +687,7 @@ static void handle_get(afc_client_t afc, int argc, char** argv)
687687
printf("\n");
688688
}
689689
if (err != AFC_E_SUCCESS) {
690-
printf("Error: Failed to read from file '%s': %d\n", argv[0], err);
690+
printf("Error: Failed to read from file '%s': %s (%d)\n", argv[0], afc_strerror(err), err);
691691
}
692692
free(buf);
693693
fclose(f);
@@ -727,7 +727,7 @@ static void handle_put(afc_client_t afc, int argc, char** argv)
727727
err = afc_file_open(afc, dstpath, AFC_FOPEN_RW, &fh);
728728
}
729729
if (err != AFC_E_SUCCESS) {
730-
printf("Error: Failed to open file '%s' on device: %d\n", argv[1], err);
730+
printf("Error: Failed to open file '%s' on device: %s (%d)\n", argv[1], afc_strerror(err), err);
731731
} else {
732732
struct timeval t1;
733733
struct timeval t2;
@@ -841,7 +841,7 @@ static void handle_cd(afc_client_t afc, int argc, char** argv)
841841
}
842842
afc_dictionary_free(info);
843843
} else {
844-
printf("Error: Failed to get file info for %s: %d\n", path, err);
844+
printf("Error: Failed to get file info for %s: %s (%d)\n", path, afc_strerror(err), err);
845845
free(path);
846846
return;
847847
}

0 commit comments

Comments
 (0)