[Libreoffice-commits] core.git: unoidl/source

Jochen Nitschke j.nitschke+logerrit at ok.de
Mon Feb 6 04:39:30 UTC 2017


 unoidl/source/sourceprovider-scanner.l |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit b524ace6f575a4ff1469fc637955328a511b9ff6
Author: Jochen Nitschke <j.nitschke+logerrit at ok.de>
Date:   Sun Feb 5 17:31:52 2017 +0100

    loplugin:nullptr
    
    seen on tinderbox Linux-F19-x86_64_14-with-check
    
    Change-Id: Ica9c2707b43317f7dd1cf99440c6cdb7fe28e0bc
    Reviewed-on: https://gerrit.libreoffice.org/33938
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/unoidl/source/sourceprovider-scanner.l b/unoidl/source/sourceprovider-scanner.l
index d9b60ba..a4f6368 100644
--- a/unoidl/source/sourceprovider-scanner.l
+++ b/unoidl/source/sourceprovider-scanner.l
@@ -45,7 +45,7 @@ namespace unoidl { namespace detail {
 static std::size_t sourceProviderScannerInput(
     SourceProviderScannerData * data, char * buffer, std::size_t size)
 {
-    assert(data != 0);
+    assert(data != nullptr);
     if (data->sourcePosition == data->sourceEnd) {
         return YY_NULL;
     }
@@ -67,10 +67,10 @@ int nonZeroIntegerLiteral(
     char const * text, std::size_t length, sal_Int16 radix, sal_uInt64 * value,
     unoidl::detail::SourceProviderScannerData * data)
 {
-    assert(text != 0);
+    assert(text != nullptr);
     assert(length != 0);
-    assert(value != 0);
-    assert(data != 0);
+    assert(value != nullptr);
+    assert(data != nullptr);
     std::size_t n = length;
     switch (text[length - 1]) {
     case 'L':
@@ -224,7 +224,7 @@ ALNUM {DIGIT}|{ALPHA}
 {DIGIT}*"."{DIGIT}+([Ee][+\-]?{DIGIT}+)?[Ff]? {
     rtl_math_ConversionStatus s;
     yylval->fval = rtl_math_stringToDouble(
-        yytext, yytext + yyleng, '.', 0, &s, 0);
+        yytext, yytext + yyleng, '.', 0, &s, nullptr);
     if (s == rtl_math_ConversionStatus_OutOfRange) {
         yyextra->errorMessage = "out-of-range floating-point literal "
             + OUString(yytext, yyleng, RTL_TEXTENCODING_ASCII_US);


More information about the Libreoffice-commits mailing list