[Libreoffice-commits] core.git: compilerplugins/clang connectivity/source

[Stephan Bergmann (via logerrit)]

 compilerplugins/clang/bufferadd.cxx                     |    9 +++++++++
 compilerplugins/clang/test/bufferadd.cxx                |    6 ++++++
 connectivity/source/drivers/postgresql/pq_statement.cxx |   15 +++++----------
 3 files changed, 20 insertions(+), 10 deletions(-)

New commits:
commit 4c1bf9d7790ca037933c3c6825d48736572a1886
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Sep 28 20:09:55 2021 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Tue Sep 28 21:23:06 2021 +0200

    Make loplugin:bufferadd look through O[U]String::operator std::[u16]string_view
    
    Change-Id: I79a32f64541a90b0b824f7721e8815c1e7c873ee
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122788
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/compilerplugins/clang/bufferadd.cxx b/compilerplugins/clang/bufferadd.cxx
index bc8c7065b2a1..cf2b6a011b4a 100644
--- a/compilerplugins/clang/bufferadd.cxx
+++ b/compilerplugins/clang/bufferadd.cxx
@@ -347,6 +347,15 @@ bool BufferAdd::isSideEffectFree(Expr const* expr)
                     if (isSideEffectFree(callExpr->getArg(0)))
                         return true;
             }
+        // O[U]String::operator std::[u16]string_view:
+        if (auto const d = dyn_cast_or_null<CXXConversionDecl>(callExpr->getCalleeDecl()))
+        {
+            auto tc = loplugin::TypeCheck(d->getParent());
+            if (tc.Class("OString") || tc.Class("OUString"))
+            {
+                return true;
+            }
+        }
     }
 
     // sometimes we have a constructor call on the RHS
diff --git a/compilerplugins/clang/test/bufferadd.cxx b/compilerplugins/clang/test/bufferadd.cxx
index a9f28b13b55a..c8057a6f497b 100644
--- a/compilerplugins/clang/test/bufferadd.cxx
+++ b/compilerplugins/clang/test/bufferadd.cxx
@@ -52,6 +52,12 @@ void f5(OUStringBuffer& input)
     OUStringBuffer v(input);
     v.append("aaaa");
 }
+void f6(OString const& s)
+{
+    // expected-error at +1 {{convert this append sequence into a *String + sequence [loplugin:bufferadd]}}
+    OUStringBuffer b("foo");
+    b.append(OStringToOUString(s, RTL_TEXTENCODING_ASCII_US));
+}
 struct Footer
 {
     OStringBuffer m_descriptorStart;
diff --git a/connectivity/source/drivers/postgresql/pq_statement.cxx b/connectivity/source/drivers/postgresql/pq_statement.cxx
index 48fd7b062c8b..9fc87bc761c2 100644
--- a/connectivity/source/drivers/postgresql/pq_statement.cxx
+++ b/connectivity/source/drivers/postgresql/pq_statement.cxx
@@ -44,7 +44,6 @@
 #include <osl/time.h>
 
 #include <rtl/ustrbuf.hxx>
-#include <rtl/strbuf.hxx>
 
 #include <comphelper/sequence.hxx>
 
@@ -456,15 +455,11 @@ bool executePostgresCommand( const OString & cmd, struct CommandData *data )
                 }
                 else if( !sourceTableKeys.empty() )
                 {
-                    OStringBuffer buf( 128 );
-                    buf.append( "can't support updateable resultset for table " );
-                    buf.append( OUStringToOString( schema, ConnectionSettings::encoding ) );
-                    buf.append( "." );
-                    buf.append( OUStringToOString( table, ConnectionSettings::encoding ) );
-                    buf.append( ", because resultset does not contain a part of the primary key ( column " );
-                    buf.append( OUStringToOString( sourceTableKeys[i], ConnectionSettings::encoding ) );
-                    buf.append( " is missing )" );
-                    aReason = buf.makeStringAndClear();
+                    aReason = "can't support updateable resultset for table "
+                        + OUStringToOString( schema, ConnectionSettings::encoding ) + "."
+                        + OUStringToOString( table, ConnectionSettings::encoding )
+                        + ", because resultset does not contain a part of the primary key ( column "
+                        + OUStringToOString( sourceTableKeys[i], ConnectionSettings::encoding );
                 }
                 else
                 {