diff options
| author | Xin Li <delphij@google.com> | 2018-08-06 16:52:40 -0700 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2018-08-06 16:52:40 -0700 |
| commit | 07f8b62039189b9712882e7e215d227d62b0979c (patch) | |
| tree | a02a84f28530ec3b2c5041c125b2f22a3f77dec4 | |
| parent | 21b5f6fef124e14b612b506620ea5c8addde0536 (diff) | |
| parent | 7fabb508f94438bef8bd85041490d4d1a143fd39 (diff) | |
| download | sdk-07f8b62039189b9712882e7e215d227d62b0979c.tar.gz | |
Merge Android Pie into master
Bug: 112104996
Change-Id: Id14d159801662039153d76c10c99108d5d725e4d
| -rw-r--r-- | find_java/src/source/find_java_exe.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/find_java/src/source/find_java_exe.cpp b/find_java/src/source/find_java_exe.cpp index 50ca0247d..a8be377ef 100644 --- a/find_java/src/source/find_java_exe.cpp +++ b/find_java/src/source/find_java_exe.cpp @@ -63,9 +63,9 @@ static int showHelpMessage() { static void printError(const char *message) {
- CString error; - error.setLastWin32Error(message); - printf(error.cstr()); + CString error;
+ error.setLastWin32Error(message);
+ printf(error.cstr());
}
static void testFindJava(bool isJdk, int minVersion) {
@@ -182,9 +182,9 @@ int main(int argc, char* argv[]) { }
if (version == 0) {
- CString s; - s.setf("Failed to find Java %d.%d (or newer) on your system. ", JAVA_MAJOR(minVersion), - JAVA_MINOR(minVersion)); + CString s;
+ s.setf("Failed to find Java %d.%d (or newer) on your system. ", JAVA_MAJOR(minVersion),
+ JAVA_MINOR(minVersion));
if (gIsDebug) {
fprintf(stderr, s.cstr());
@@ -200,8 +200,8 @@ int main(int argc, char* argv[]) { if (doShortPath) {
if (!javaPath.toShortPath(&javaPath)) {
- CString s; - s.setf("Failed to convert path (%s) to a short DOS path. ", javaPath.cstr()); + CString s;
+ s.setf("Failed to convert path (%s) to a short DOS path. ", javaPath.cstr());
fprintf(stderr, s.cstr());
if (shouldPrintError) {
|