commit 286bb6ddbd52584af0c6c76fbe0498f3dea4b944
author Dan Albert <danalbert@google.com> Thu Jul 09 20:35:09 2015 +0000
committer Dan Albert <danalbert@google.com> Thu Jul 09 20:35:09 2015 +0000
tree 9ff5f696bce0ec0efa9164a1080211a74f8354c7
parent 459df8f3a14d4c614f0211049800cf7cad6d30ad

Revert "Turn on -Wformat-nonliteral."

One of my build aliases doesn't play nice with USE_MINGW=1, so my build lied to me. Will revert until I fix it up.

This reverts commit 459df8f3a14d4c614f0211049800cf7cad6d30ad.

Change-Id: I7905c5ae5ee85fb2d228ce63d81c79f140998c18

adb/commandline.cpp

diff --git a/adb/commandline.cpp b/adb/commandline.cpp
index 59e0807..4adac37 100644
--- a/adb/commandline.cpp
+++ b/adb/commandline.cpp
@@ -1447,8 +1447,7 @@
     return pm_command(transport, serial, argc, argv);
 }
 
-static int delete_file(TransportType transport, const char* serial,
-                       const char* filename) {
+static int delete_file(TransportType transport, const char* serial, char* filename) {
     std::string cmd = "shell:rm -f " + escape_arg(filename);
     return send_shell_command(transport, serial, cmd);
 }
@@ -1465,8 +1464,8 @@
 }
 
 static int install_app(TransportType transport, const char* serial, int argc, const char** argv) {
-    static const char *const DATA_DEST = "/data/local/tmp";
-    static const char *const SD_DEST = "/sdcard/tmp";
+    static const char *const DATA_DEST = "/data/local/tmp/%s";
+    static const char *const SD_DEST = "/sdcard/tmp/%s";
     const char* where = DATA_DEST;
     int i;
     struct stat sb;
@@ -1500,20 +1499,19 @@
     }
 
     const char* apk_file = argv[last_apk];
-    const std::string apk_dest =
-        android::base::StringPrintf("%s/%s", where, get_basename(apk_file));
-    int err = do_sync_push(apk_file, apk_dest.c_str(), /* show_progress = */ 0);
+    char apk_dest[PATH_MAX];
+    snprintf(apk_dest, sizeof apk_dest, where, get_basename(apk_file));
+    int err = do_sync_push(apk_file, apk_dest, 0 /* no show progress */);
     if (err) {
         goto cleanup_apk;
     } else {
-        // Destination name, not source location.
-        argv[last_apk] = apk_dest.c_str();
+        argv[last_apk] = apk_dest; /* destination name, not source location */
     }
 
     err = pm_command(transport, serial, argc, argv);
 
 cleanup_apk:
-    delete_file(transport, serial, apk_dest.c_str());
+    delete_file(transport, serial, apk_dest);
     return err;
 }