From 57538472cb86d6b376f933e9e416eb769f7c00b7 Mon Sep 17 00:00:00 2001
From: Martin Szulecki
Date: Wed, 22 Oct 2014 20:52:02 +0200
Subject: common: Move string_toupper() helper to utils and use it in
 idevicebackup tools

---
 common/utils.c         | 10 ++++++++++
 common/utils.h         |  1 +
 tools/idevicebackup.c  | 12 +-----------
 tools/idevicebackup2.c | 12 +-----------
 4 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/common/utils.c b/common/utils.c
index fb6822f..f95ecfd 100644
--- a/common/utils.c
+++ b/common/utils.c
@@ -139,6 +139,16 @@ char *string_build_path(const char *elem, ...)
 	return out;
 }
 
+char *string_toupper(char* str)
+{
+	char *res = strdup(str);
+	unsigned int i;
+	for (i = 0; i < strlen(res); i++) {
+		res[i] = toupper(res[i]);
+	}
+	return res;
+}
+
 static int get_rand(int min, int max)
 {
 	int retval = (rand() % (max - min)) + min;
diff --git a/common/utils.h b/common/utils.h
index 96e6ba2..5cd4a53 100644
--- a/common/utils.h
+++ b/common/utils.h
@@ -38,6 +38,7 @@ char *stpcpy(char *s1, const char *s2);
 #endif
 char *string_concat(const char *str, ...);
 char *string_build_path(const char *elem, ...);
+char *string_toupper(char *str);
 char *generate_uuid();
 
 void buffer_read_from_filename(const char *filename, char **buffer, uint64_t *length);
diff --git a/tools/idevicebackup.c b/tools/idevicebackup.c
index 67d82fd..8260de6 100644
--- a/tools/idevicebackup.c
+++ b/tools/idevicebackup.c
@@ -224,16 +224,6 @@ static void notify_cb(const char *notification, void *userdata)
 	}
 }
 
-static char *str_toupper(char* str)
-{
-	char *res = strdup(str);
-	unsigned int i;
-	for (i = 0; i < strlen(res); i++) {
-		res[i] = toupper(res[i]);
-	}
-	return res;
-}
-
 static char* format_size_for_display(uint64_t size)
 {
 	char buf[32];
@@ -295,7 +285,7 @@ static plist_t mobilebackup_factory_info_plist_new(const char* udid)
 	plist_dict_set_item(ret, "Target Identifier", plist_new_string(udid));
 
 	/* uppercase */
-	udid_uppercase = str_toupper((char*)udid);
+	udid_uppercase = string_toupper((char*)udid);
 	plist_dict_set_item(ret, "Unique Identifier", plist_new_string(udid_uppercase));
 	free(udid_uppercase);
 
diff --git a/tools/idevicebackup2.c b/tools/idevicebackup2.c
index 209dfe6..4fe5751 100644
--- a/tools/idevicebackup2.c
+++ b/tools/idevicebackup2.c
@@ -157,16 +157,6 @@ static void mobilebackup_afc_get_file_contents(afc_client_t afc, const char *fil
 	afc_file_close(afc, f);
 }
 
-static char *str_toupper(char* str)
-{
-	char *res = strdup(str);
-	unsigned int i;
-	for (i = 0; i < strlen(res); i++) {
-		res[i] = toupper(res[i]);
-	}
-	return res;
-}
-
 static int __mkdir(const char* path, int mode)
 {
 #ifdef WIN32
@@ -273,7 +263,7 @@ static plist_t mobilebackup_factory_info_plist_new(const char* udid, lockdownd_c
 	plist_dict_set_item(ret, "Target Type", plist_new_string("Device"));
 
 	/* uppercase */
-	udid_uppercase = str_toupper((char*)udid);
+	udid_uppercase = string_toupper((char*)udid);
 	plist_dict_set_item(ret, "Unique Identifier", plist_new_string(udid_uppercase));
 	free(udid_uppercase);
 
-- 
cgit v1.1-32-gdbae