diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2009-10-27 11:50:01 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2009-10-27 11:50:01 +0100 |
| commit | de73835bdadaf13a7cc5a2f1b08428da3a8e78b6 (patch) | |
| tree | 1adfe2d5c878646f85244b38b83d2eadfa664f31 /lib/Plugins | |
| parent | b9305465f239d3cd338d0c913b95bdc264f76ea9 (diff) | |
| download | abrt-de73835bdadaf13a7cc5a2f1b08428da3a8e78b6.tar.gz abrt-de73835bdadaf13a7cc5a2f1b08428da3a8e78b6.tar.xz abrt-de73835bdadaf13a7cc5a2f1b08428da3a8e78b6.zip | |
simplify base64 conversion
text data bss dec hexfilename
39575 2016 288 41879 old/libBugzilla.so
38598 1840 288 40726 new/libBugzilla.so
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'lib/Plugins')
| -rw-r--r-- | lib/Plugins/Bugzilla.cpp | 32 | ||||
| -rw-r--r-- | lib/Plugins/Makefile.am | 4 |
2 files changed, 6 insertions, 30 deletions
diff --git a/lib/Plugins/Bugzilla.cpp b/lib/Plugins/Bugzilla.cpp index 4ed5946..2da3908 100644 --- a/lib/Plugins/Bugzilla.cpp +++ b/lib/Plugins/Bugzilla.cpp @@ -1,4 +1,3 @@ -#include <nssb64.h> #include <xmlrpc-c/base.h> #include <xmlrpc-c/client.h> @@ -97,21 +96,6 @@ CReporterBugzilla::CReporterBugzilla() : CReporterBugzilla::~CReporterBugzilla() {} -static PRInt32 base64_encode_cb(void *arg, const char* obuf, PRInt32 size) -{ - std::string& attachment_b64 = *static_cast<std::string*>(arg); - int ii; - for (ii = 0; ii < size; ii++) - { - if (isprint(obuf[ii])) - { - attachment_b64 += obuf[ii]; - } - } - return 1; -} - - static void login(const char* login, const char* passwd) { xmlrpc_value* result = NULL; @@ -409,25 +393,17 @@ static void add_attachments(const std::string& pBugId, const map_crash_report_t& { if (it->second[CD_TYPE] == CD_ATT) { - std::string attachment_b64; - NSSBase64Encoder* base64 = NSSBase64Encoder_Create(&base64_encode_cb, &attachment_b64); - if (!base64) - { - error_msg_and_die("cannot initialize base64"); // never happens - } - NSSBase64Encoder_Update(base64, - reinterpret_cast<const unsigned char*>(it->second[CD_CONTENT].c_str()), - it->second[CD_CONTENT].length()); - NSSBase64Encoder_Destroy(base64, PR_FALSE); - std::string description = "File: " + it->first; + const std::string& to_encode = it->second[CD_CONTENT]; + char *encoded64 = encode_base64(to_encode.c_str(), to_encode.length()); xmlrpc_value* param = xmlrpc_build_value(&env,"(s{s:s,s:s,s:s,s:s})", pBugId.c_str(), "description", description.c_str(), "filename", it->first.c_str(), "contenttype", "text/plain", - "data", attachment_b64.c_str() + "data", encoded64 ); + free(encoded64); throw_if_fault_occurred(&env); xmlrpc_client_call2(&env, client, server_info, "bugzilla.addAttachment", param, &result); diff --git a/lib/Plugins/Makefile.am b/lib/Plugins/Makefile.am index a5c5a46..cf46aee 100644 --- a/lib/Plugins/Makefile.am +++ b/lib/Plugins/Makefile.am @@ -80,9 +80,9 @@ libSOSreport_la_LDFLAGS = -avoid-version # Bugzilla libBugzilla_la_SOURCES = Bugzilla.h Bugzilla.cpp -libBugzilla_la_LIBADD = $(XMLRPC_LIBS) $(XMLRPC_CLIENT_LIBS) $(NSS_LIBS) +libBugzilla_la_LIBADD = $(XMLRPC_LIBS) $(XMLRPC_CLIENT_LIBS) libBugzilla_la_LDFLAGS = -avoid-version -libBugzilla_la_CPPFLAGS = $(XMLRPC_CFLAGS) $(XMLRPC_CLIENT_CFLAGS) $(NSS_CFLAGS) -I$(srcdir)/../../inc -I$(srcdir)/../Utils -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" +libBugzilla_la_CPPFLAGS = $(XMLRPC_CFLAGS) $(XMLRPC_CLIENT_CFLAGS) -I$(srcdir)/../../inc -I$(srcdir)/../Utils -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" # TicketUploader libTicketUploader_la_SOURCES = TicketUploader.h TicketUploader.cpp |