Prepend regerror() messages with "regexp error: "

[notmuch] / lib / regexp-fields.cc

diff --git a/lib/regexp-fields.cc b/lib/regexp-fields.cc
index 084bc8c019999cefe7b7d0dff01d27463d6cc4a7..f50da9a3c99baa9841ddb6e1912cff3bc190dbdb 100644 (file)
--- a/lib/regexp-fields.cc
+++ b/lib/regexp-fields.cc
@@ -35,9 +35,9 @@ compile_regex (regex_t &regexp, const char *str)
     if (err != 0) {
        size_t len = regerror (err, &regexp, NULL, 0);
        char *buffer = new char[len];
     if (err != 0) {
        size_t len = regerror (err, &regexp, NULL, 0);
        char *buffer = new char[len];

-       std::string msg;
+       std::string msg = "Regexp error: ";

        (void) regerror (err, &regexp, buffer, len);
        (void) regerror (err, &regexp, buffer, len);

-       msg.assign (buffer, len);
+       msg.append (buffer, len);

        delete[] buffer;
 
        throw Xapian::QueryParserError (msg);
        delete[] buffer;
 
        throw Xapian::QueryParserError (msg);