Chromium Code Reviews| Index: platform_tools/android/launcher/skia_launcher.cpp |
| diff --git a/platform_tools/android/launcher/skia_launcher.cpp b/platform_tools/android/launcher/skia_launcher.cpp |
| index 746d470a3c2dcaad8d38bc0b1671d75daddc0e62..7f06f708cb6111ddad49d131e62c881fc2874de0 100644 |
| --- a/platform_tools/android/launcher/skia_launcher.cpp |
| +++ b/platform_tools/android/launcher/skia_launcher.cpp |
| @@ -8,6 +8,12 @@ |
| #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"); |
| @@ -32,7 +38,7 @@ 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"); |