From 7fde9a879dbf38aa6adcf7691139dc32cd567089 Mon Sep 17 00:00:00 2001 From: "erikwright@chromium.org" Date: Wed, 15 Sep 2010 17:38:03 +0000 Subject: Revert revision 658 ('Add glog style logging to symupload'). R=nealsid at http://breakpad.appspot.com/190001 git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@685 4c0a9323-5329-0410-9bdc-e9ce6186880e --- src/tools/windows/symupload/symupload.cc | 31 +--------- src/tools/windows/symupload/symupload.vcproj | 84 +--------------------------- 2 files changed, 5 insertions(+), 110 deletions(-) (limited to 'src/tools/windows') diff --git a/src/tools/windows/symupload/symupload.cc b/src/tools/windows/symupload/symupload.cc index 0b2f366a..b858a63d 100644 --- a/src/tools/windows/symupload/symupload.cc +++ b/src/tools/windows/symupload/symupload.cc @@ -51,14 +51,10 @@ #include #include +#include "common/windows/string_utils-inl.h" + #include "common/windows/http_upload.h" #include "common/windows/pdb_source_line_writer.h" -#include "common/windows/string_utils-inl.h" -#include "common/windows/wchar_logging.h" -// See http://code.google.com/p/google-glog/issues/detail?id=33 for why -// this #undef is added. -#undef ERROR -#include "third_party/glog/glog/src/windows/glog/logging.h" using std::string; using std::wstring; @@ -116,15 +112,12 @@ static bool DumpSymbolsToTempFile(const wchar_t *file, wstring *temp_file_path, PDBModuleInfo *pdb_info) { google_breakpad::PDBSourceLineWriter writer; - VLOG(1) << "DumpSymbolsToTempFile opening file"; // Use EXE_FILE to get information out of the exe/dll in addition to the // pdb. The name and version number of the exe/dll are of value, and // there's no way to locate an exe/dll given a pdb. if (!writer.Open(file, PDBSourceLineWriter::EXE_FILE)) { - VLOG(1) << "Error opening input module"; return false; } - VLOG(1) << "DumpSymbolsToTempFile file opened"; wchar_t temp_path[_MAX_PATH]; if (GetTempPath(_MAX_PATH, temp_path) == 0) { @@ -135,7 +128,6 @@ static bool DumpSymbolsToTempFile(const wchar_t *file, if (GetTempFileName(temp_path, L"sym", 0, temp_filename) == 0) { return false; } - VLOG(1) << "Temporary symbol filename is: " << temp_filename; FILE *temp_file = NULL; #if _MSC_VER >= 1400 // MSVC 2005/8 @@ -153,8 +145,7 @@ static bool DumpSymbolsToTempFile(const wchar_t *file, fclose(temp_file); if (!success) { _wunlink(temp_filename); - LOG(ERROR) << "Error writing to temp file"; - return false; + return false; } *temp_file_path = temp_filename; @@ -169,24 +160,11 @@ void printUsageAndExit() { exit(0); } int wmain(int argc, wchar_t *argv[]) { - char progname[MAX_PATH]; - size_t convertedChars; - wcstombs_s(&convertedChars, progname, MAX_PATH, argv[0], _TRUNCATE); - google::InitGoogleLogging(progname); - if ((argc != 3) && (argc != 5)) { printUsageAndExit(); } - if (argc == 5) { - VLOG(1) << "Module: " << argv[3]; - VLOG(1) << "Server: " << argv[4]; - } else { - VLOG(1) << "Module: " << argv[1]; - VLOG(1) << "Server: " << argv[2]; - } - const wchar_t *module, *url; int timeout = -1; if (argc == 3) { @@ -203,15 +181,12 @@ int wmain(int argc, wchar_t *argv[]) { } } - VLOG(1) << "Beginning symbol dump"; wstring symbol_file; PDBModuleInfo pdb_info; if (!DumpSymbolsToTempFile(module, &symbol_file, &pdb_info)) { fwprintf(stderr, L"Could not get symbol data from %s\n", module); - LOG(ERROR) << "Could not get symbol data from " << module; return 1; } - VLOG(1) << "Symbol dump completed to " << symbol_file; wstring code_file = WindowsStringUtils::GetBaseName(wstring(module)); diff --git a/src/tools/windows/symupload/symupload.vcproj b/src/tools/windows/symupload/symupload.vcproj index b11389c2..d6d07f1e 100644 --- a/src/tools/windows/symupload/symupload.vcproj +++ b/src/tools/windows/symupload/symupload.vcproj @@ -39,7 +39,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- cgit v1.2.1