yuzu/breakpad
1
0
Fork 0
mirror of https://github.com/yuzu-emu/breakpad.git synced 2024-12-23 13:45:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correct bug introduced by last commit: Interface on Breakpad is incorrect.

Browse source 
R=mark@chromium.org


git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@886 4c0a9323-5329-0410-9bdc-e9ce6186880e
This commit is contained in:
qsr@chromium.org 2011-11-16 17:42:49 +00:00
parent 976930db64
commit d529b2d0a0
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/client/ios/Breakpad.h
View file

@ -198,7 +198,7 @@ void BreakpadUploadNextReport(BreakpadRef ref);
// Upload a file to the server. |data| is the content of the file to sent. // Upload a file to the server. |data| is the content of the file to sent.
// |server_parameters| is additional server parameters to send. // |server_parameters| is additional server parameters to send.
void BreakpadUploadData(BreakpadRef ref, NSData *data, void BreakpadUploadData(BreakpadRef ref, NSData *data, NSString *name,
NSDictionary *server_parameters); NSDictionary *server_parameters);
#ifdef __cplusplus #ifdef __cplusplus

12
src/client/ios/Breakpad.mm
View file

@ -152,7 +152,8 @@ class Breakpad {
void RemoveKeyValue(NSString *key); void RemoveKeyValue(NSString *key);
NSString *NextCrashReportToUpload(); NSString *NextCrashReportToUpload();
void UploadNextReport(); void UploadNextReport();
void UploadData(NSData *data, NSDictionary *server_parameters); void UploadData(NSData *data, NSString *name,
NSDictionary *server_parameters);
private: private:
Breakpad() Breakpad()
@ -427,7 +428,8 @@ void Breakpad::UploadNextReport() {
} }
//============================================================================= //=============================================================================
void Breakpad::UploadData(NSData *data, NSDictionary *server_parameters) { void Breakpad::UploadData(NSData *data, NSString *name,
NSDictionary *server_parameters) {
NSMutableDictionary *config = [NSMutableDictionary dictionary]; NSMutableDictionary *config = [NSMutableDictionary dictionary];
SimpleStringDictionaryIterator it(*config_params_); SimpleStringDictionaryIterator it(*config_params_);
@ -442,7 +444,7 @@ void Breakpad::UploadData(NSData *data, NSDictionary *server_parameters) {
[uploader addServerParameter:[server_parameters objectForKey:key] [uploader addServerParameter:[server_parameters objectForKey:key]
forKey:key]; forKey:key];
} }
[uploader uploadData:data]; [uploader uploadData:data name:name];
} }
//============================================================================= //=============================================================================
@ -703,14 +705,14 @@ void BreakpadUploadNextReport(BreakpadRef ref) {
} }
//============================================================================= //=============================================================================
void BreakpadUploadData(BreakpadRef ref, NSData *data, void BreakpadUploadData(BreakpadRef ref, NSData *data, NSString *name,
NSDictionary *server_parameters) { NSDictionary *server_parameters) {
try { try {
// Not called at exception time // Not called at exception time
Breakpad *breakpad = (Breakpad *)ref; Breakpad *breakpad = (Breakpad *)ref;
if (breakpad) { if (breakpad) {
breakpad->UploadData(data, server_parameters); breakpad->UploadData(data, name, server_parameters);
} }
} catch(...) { // don't let exceptions leave this C API } catch(...) { // don't let exceptions leave this C API
fprintf(stderr, "BreakpadUploadData() : error\n"); fprintf(stderr, "BreakpadUploadData() : error\n");