commit 42a9cedd9d2aa55a9ed71e50cb4a7199a926a4e9
author Raphael <raphael@google.com> Thu Jan 26 19:15:43 2012 -0800
committer Raphael <raphael@google.com> Fri Jan 27 15:02:31 2012 -0800
tree f4a997a2a31f1b30d13826bf955d4b30b17b2ab0
parent 7abf0861af9f6afe854bafa6d43d9d1feba8b552

SDK: update find_java lib

Change-Id: I6a139630a325f3537961cc5be2726816a060bb65

find_java/utils.cpp

diff --git a/find_java/utils.cpp b/find_java/utils.cpp
index bb679b8..e2ce58f 100755
--- a/find_java/utils.cpp
+++ b/find_java/utils.cpp
@@ -46,7 +46,7 @@
     va_end(ap);

 

     CString error;

-    error.setLastWin32Error();

+    error.setLastWin32Error(NULL);

     formatted.add("\r\n");

     formatted.add(error.cstr());

 

find_java/utils.h

diff --git a/find_java/utils.h b/find_java/utils.h
index a2260b6..dc9031d 100755
--- a/find_java/utils.h
+++ b/find_java/utils.h
@@ -201,7 +201,8 @@
     }

 

     // Sets the string to the message matching Win32 GetLastError.

-    CString& setLastWin32Error() {

+    // If message is non-null, it is prepended to the last error string.

+    CString& setLastWin32Error(const char *message) {

         DWORD err = GetLastError();

         LPSTR errStr;

         if (FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | /* dwFlags */

@@ -212,7 +213,11 @@
                           (LPSTR)&errStr,                   /* lpBuffer */

                           0,                                /* nSize */

                           NULL) != 0) {                     /* va_list args */

-            setf("[%d] %s", err, errStr);

+            if (message == NULL) {

+                setf("[%d] %s", err, errStr);

+            } else {

+                setf("%s[%d] %s", message, err, errStr);

+            }

             LocalFree(errStr);

         }

         return *this;