remove sprintf

platform_tools/android/launcher/skia_launcher.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include <dlfcn.h>
 #include <stdio.h>
 
+#ifdef SK_BUILD_FOR_WIN
+    #define SNPRINTF _snprintf

[mtklein, 2014/04/09 20:49:40]

Or just, #define snprintf _snprintf, with no else?

[hal.canary, 2014/04/09 21:38:50]

Done.

+#else
+    #define SNPRINTF snprintf
+#endif
+
 void usage() {
     printf("[USAGE] skia_launcher program_name [options]\n");
     printf("  program_name: the skia program you want to launch (e.g. tests, bench)\n");
     printf("  options: options specific to the program you are launching\n");
 }
 
 bool file_exists(const char* fileName) {
     FILE* file = fopen(fileName, "r");
     if (file) {
         fclose(file);
         return true;
     }
     return false;
 }
 
 int launch_app(int (*app_main)(int, const char**), int argc,
         const char** argv) {
     return (*app_main)(argc, argv);
 }
 
 void* load_library(const char* appLocation, const char* libraryName)
 {
      // attempt to lookup the location of the shared libraries
     char libraryLocation[100];
-    sprintf(libraryLocation, "%s/lib%s.so", appLocation, libraryName);
+    SNPRINTF(libraryLocation, 100, "%s/lib%s.so", appLocation, libraryName);

[mtklein, 2014/04/09 20:49:40]

SK_ARRAY_COUNT(libraryLocation) instead of 100?

[hal.canary, 2014/04/09 21:38:50]

Done.

     if (!file_exists(libraryLocation)) {
         printf("ERROR: Unable to find the '%s' library in the Skia App.\n", libraryName);
         printf("ERROR: Did you provide the correct program_name?\n");
         usage();
         return NULL;
     }
 
     // load the appropriate library
     void* appLibrary = dlopen(libraryLocation, RTLD_LOCAL | RTLD_LAZY);
     if (!appLibrary) {
@@ skipping 59 matching lines @@
     if (app_SkDebugToStdOut) {
         (*app_SkDebugToStdOut)(true);
     } else {
         printf("WARNING: Unable to redirect output to the console.\n");
         printf("WARNING: %s\n", dlerror());
     }
 
     // pass all additional arguments to the main function
     return launch_app(app_main, argc - 1, ++argv);
 }