summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorGravatar Martin Szulecki2014-10-22 21:28:04 +0200
committerGravatar Martin Szulecki2014-10-22 22:21:06 +0200
commit2f32ff99f90689b364b86d4c12f3a1b8b318991e (patch)
tree16df4749e950bce8fd57a88997af342f6e81bddc /tools
parent57538472cb86d6b376f933e9e416eb769f7c00b7 (diff)
downloadlibimobiledevice-2f32ff99f90689b364b86d4c12f3a1b8b318991e.tar.gz
libimobiledevice-2f32ff99f90689b364b86d4c12f3a1b8b318991e.tar.bz2
common: Move size format helper to utils and use it in idevicebackup tools
Diffstat (limited to 'tools')
-rw-r--r--tools/idevicebackup.c27
-rw-r--r--tools/idevicebackup2.c25
2 files changed, 7 insertions, 45 deletions
diff --git a/tools/idevicebackup.c b/tools/idevicebackup.c
index 8260de6..195f837 100644
--- a/tools/idevicebackup.c
+++ b/tools/idevicebackup.c
@@ -224,25 +224,6 @@ static void notify_cb(const char *notification, void *userdata)
}
}
-static char* format_size_for_display(uint64_t size)
-{
- char buf[32];
- double sz;
- if (size >= 1000000000LL) {
- sz = ((double)size / 1000000000.0f);
- sprintf(buf, "%0.1f GB", sz);
- } else if (size >= 1000000LL) {
- sz = ((double)size / 1000000.0f);
- sprintf(buf, "%0.1f MB", sz);
- } else if (size >= 1000LL) {
- sz = ((double)size / 1000.0f);
- sprintf(buf, "%0.1f kB", sz);
- } else {
- sprintf(buf, "%d Bytes", (int)size);
- }
- return strdup(buf);
-}
-
static plist_t mobilebackup_factory_info_plist_new(const char* udid)
{
/* gather data from lockdown */
@@ -1037,7 +1018,7 @@ int main(int argc, char *argv[])
node = plist_dict_get_item(node_tmp, "BackupTotalSizeKey");
if (node) {
plist_get_uint_val(node, &backup_total_size);
- format_size = format_size_for_display(backup_total_size);
+ format_size = string_format_size(backup_total_size);
printf("Backup data requires %s on the disk.\n", format_size);
free(format_size);
}
@@ -1067,15 +1048,15 @@ int main(int argc, char *argv[])
plist_get_uint_val(node, &file_size);
backup_real_size += file_size;
- format_size = format_size_for_display(backup_real_size);
+ format_size = string_format_size(backup_real_size);
printf("(%s", format_size);
free(format_size);
- format_size = format_size_for_display(backup_total_size);
+ format_size = string_format_size(backup_total_size);
printf("/%s): ", format_size);
free(format_size);
- format_size = format_size_for_display(file_size);
+ format_size = string_format_size(file_size);
printf("Receiving file %s (%s)... \n", filename_source, format_size);
free(format_size);
diff --git a/tools/idevicebackup2.c b/tools/idevicebackup2.c
index 4fe5751..a43cbda 100644
--- a/tools/idevicebackup2.c
+++ b/tools/idevicebackup2.c
@@ -189,25 +189,6 @@ static int mkdir_with_parents(const char *dir, int mode)
return res;
}
-static char* format_size_for_display(uint64_t size)
-{
- char buf[32];
- double sz;
- if (size >= 1000000000LL) {
- sz = ((double)size / 1000000000.0f);
- sprintf(buf, "%0.1f GB", sz);
- } else if (size >= 1000000LL) {
- sz = ((double)size / 1000000.0f);
- sprintf(buf, "%0.1f MB", sz);
- } else if (size >= 1000LL) {
- sz = ((double)size / 1000.0f);
- sprintf(buf, "%0.1f kB", sz);
- } else {
- sprintf(buf, "%d Bytes", (int)size);
- }
- return strdup(buf);
-}
-
static plist_t mobilebackup_factory_info_plist_new(const char* udid, lockdownd_client_t lockdown, afc_client_t afc)
{
/* gather data from lockdown */
@@ -404,10 +385,10 @@ static void print_progress(uint64_t current, uint64_t total)
print_progress_real((double)progress, 0);
- format_size = format_size_for_display(current);
+ format_size = string_format_size(current);
PRINT_VERBOSE(1, " (%s", format_size);
free(format_size);
- format_size = format_size_for_display(total);
+ format_size = string_format_size(total);
PRINT_VERBOSE(1, "/%s) ", format_size);
free(format_size);
@@ -543,7 +524,7 @@ static int mb2_handle_send_file(mobilebackup2_client_t mobilebackup2, const char
total = fst.st_size;
- char *format_size = format_size_for_display(total);
+ char *format_size = string_format_size(total);
PRINT_VERBOSE(1, "Sending '%s' (%s)\n", path, format_size);
free(format_size);