diff options
| author | Jiri Moskovcak <jmoskovc@redhat.com> | 2010-01-19 14:52:53 +0100 |
|---|---|---|
| committer | Jiri Moskovcak <jmoskovc@redhat.com> | 2010-01-19 14:52:53 +0100 |
| commit | 8ddcb9404d65bc6b09910099988fe6a0f33fe250 (patch) | |
| tree | 2214c48219c8f3cf1b4110113467fa92d38bfa84 /src/Daemon/CommLayerServerDBus.cpp | |
| parent | 04d69684f58d851ab604b2ed5eeb04f373efd4d8 (diff) | |
| parent | b348085ac9f3d4a7ded81026bffa962a065bdf97 (diff) | |
| download | abrt-8ddcb9404d65bc6b09910099988fe6a0f33fe250.tar.gz abrt-8ddcb9404d65bc6b09910099988fe6a0f33fe250.tar.xz abrt-8ddcb9404d65bc6b09910099988fe6a0f33fe250.zip | |
resolve conflict
Diffstat (limited to 'src/Daemon/CommLayerServerDBus.cpp')
| -rw-r--r-- | src/Daemon/CommLayerServerDBus.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/Daemon/CommLayerServerDBus.cpp b/src/Daemon/CommLayerServerDBus.cpp index db0d2f5..182aa6c 100644 --- a/src/Daemon/CommLayerServerDBus.cpp +++ b/src/Daemon/CommLayerServerDBus.cpp @@ -205,10 +205,8 @@ static int handle_Report(DBusMessage* call, DBusMessage* reply) int r; DBusMessageIter in_iter; dbus_message_iter_init(call, &in_iter); - map_crash_report_t argin1; - const char* comment; - const char* reproduce; + map_crash_report_t argin1; r = load_val(&in_iter, argin1); if (r == ABRT_DBUS_ERROR) { @@ -218,9 +216,8 @@ static int handle_Report(DBusMessage* call, DBusMessage* reply) map_crash_report_t::const_iterator it_comment = argin1.find(CD_COMMENT); map_crash_report_t::const_iterator it_reproduce = argin1.find(CD_REPRODUCE); - comment = (it_comment != argin1.end()) ? it_comment->second[CD_CONTENT].c_str() : ""; - reproduce = (it_reproduce != argin1.end()) ? it_reproduce->second[CD_CONTENT].c_str() : ""; - + const char* comment = (it_comment != argin1.end()) ? it_comment->second[CD_CONTENT].c_str() : ""; + const char* reproduce = (it_reproduce != argin1.end()) ? it_reproduce->second[CD_CONTENT].c_str() : ""; const char* errmsg = NULL; if (strlen(comment) > LIMIT_MESSAGE) { |