aboutsummaryrefslogtreecommitdiff
path: root/src/client/ios
diff options
context:
space:
mode:
authorqsr@chromium.org <qsr@chromium.org@4c0a9323-5329-0410-9bdc-e9ce6186880e>2011-11-16 17:42:49 +0000
committerqsr@chromium.org <qsr@chromium.org@4c0a9323-5329-0410-9bdc-e9ce6186880e>2011-11-16 17:42:49 +0000
commitd529b2d0a0e57556b4a71d788782000ef7c0517c (patch)
treef1e2970ff4980a467d01022aa1a32cdde3a7ffa9 /src/client/ios
parent Add an API to Breakpad to upload custom file to the crash server. (diff)
downloadbreakpad-d529b2d0a0e57556b4a71d788782000ef7c0517c.tar.xz
Correct bug introduced by last commit: Interface on Breakpad is incorrect.
R=mark@chromium.org git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@886 4c0a9323-5329-0410-9bdc-e9ce6186880e
Diffstat (limited to 'src/client/ios')
-rw-r--r--src/client/ios/Breakpad.h2
-rw-r--r--src/client/ios/Breakpad.mm12
2 files changed, 8 insertions, 6 deletions
diff --git a/src/client/ios/Breakpad.h b/src/client/ios/Breakpad.h
index 1483e860..1b9d0e83 100644
--- a/src/client/ios/Breakpad.h
+++ b/src/client/ios/Breakpad.h
@@ -198,7 +198,7 @@ void BreakpadUploadNextReport(BreakpadRef ref);
// Upload a file to the server. |data| is the content of the file to sent.
// |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);
#ifdef __cplusplus
diff --git a/src/client/ios/Breakpad.mm b/src/client/ios/Breakpad.mm
index 0b9cabbb..25cbb762 100644
--- a/src/client/ios/Breakpad.mm
+++ b/src/client/ios/Breakpad.mm
@@ -152,7 +152,8 @@ class Breakpad {
void RemoveKeyValue(NSString *key);
NSString *NextCrashReportToUpload();
void UploadNextReport();
- void UploadData(NSData *data, NSDictionary *server_parameters);
+ void UploadData(NSData *data, NSString *name,
+ NSDictionary *server_parameters);
private:
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];
SimpleStringDictionaryIterator it(*config_params_);
@@ -442,7 +444,7 @@ void Breakpad::UploadData(NSData *data, NSDictionary *server_parameters) {
[uploader addServerParameter:[server_parameters objectForKey: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) {
try {
// Not called at exception time
Breakpad *breakpad = (Breakpad *)ref;
if (breakpad) {
- breakpad->UploadData(data, server_parameters);
+ breakpad->UploadData(data, name, server_parameters);
}
} catch(...) { // don't let exceptions leave this C API
fprintf(stderr, "BreakpadUploadData() : error\n");