summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorGravatar Rosen Penev2019-12-08 15:45:19 -0800
committerGravatar Rosen Penev2020-04-12 16:38:17 -0700
commitc0576790378daa45d43335d44c5caff04c270c94 (patch)
treee7e917751cb6f8e373a0e244184a152daf1d8409 /tools
parente6a4ab68cb860878b06f51a40cfde44e3971d55e (diff)
downloadlibimobiledevice-c0576790378daa45d43335d44c5caff04c270c94.tar.gz
libimobiledevice-c0576790378daa45d43335d44c5caff04c270c94.tar.bz2
idevicedate: Fix -Wformat=2 warning
Format functions expect a constant expression, not a variable. Simplified the code slightly.
Diffstat (limited to 'tools')
-rw-r--r--tools/idevicedate.c17
1 files changed, 4 insertions, 13 deletions
diff --git a/tools/idevicedate.c b/tools/idevicedate.c
index 4de90b6..6dddc18 100644
--- a/tools/idevicedate.c
+++ b/tools/idevicedate.c
@@ -38,9 +38,9 @@
#include <libimobiledevice/lockdown.h>
#ifdef _DATE_FMT
-#define DATE_FMT_LANGINFO() nl_langinfo (_DATE_FMT)
+#define DATE_FMT_LANGINFO nl_langinfo (_DATE_FMT)
#else
-#define DATE_FMT_LANGINFO() ""
+#define DATE_FMT_LANGINFO "%a %b %e %H:%M:%S %Z %Y"
#endif
static void print_usage(int argc, char **argv)
@@ -75,7 +75,6 @@ int main(int argc, char *argv[])
uint64_t datetime = 0;
time_t rawtime;
struct tm * tmp;
- char const *format = NULL;
char buffer[80];
int result = 0;
@@ -131,14 +130,6 @@ int main(int argc, char *argv[])
}
}
- /* determine a date format */
- if (!format) {
- format = DATE_FMT_LANGINFO ();
- if (!*format) {
- format = "%a %b %e %H:%M:%S %Z %Y";
- }
- }
-
ret = idevice_new(&device, udid);
if (ret != IDEVICE_E_SUCCESS) {
if (udid) {
@@ -195,7 +186,7 @@ int main(int argc, char *argv[])
tmp = localtime(&rawtime);
/* finally we format and print the current date */
- strftime(buffer, 80, format, tmp);
+ strftime(buffer, 80, DATE_FMT_LANGINFO, tmp);
puts(buffer);
} else {
datetime = setdate;
@@ -217,7 +208,7 @@ int main(int argc, char *argv[])
if(lockdownd_set_value(client, NULL, "TimeIntervalSince1970", node) == LOCKDOWN_E_SUCCESS) {
tmp = localtime(&setdate);
- strftime(buffer, 80, format, tmp);
+ strftime(buffer, 80, DATE_FMT_LANGINFO, tmp);
puts(buffer);
} else {
printf("ERROR: Failed to set date on device.\n");