[Libreoffice-commits] core.git: sal/osl

Stephan Bergmann sbergman at redhat.com
Thu Nov 2 12:06:27 UTC 2017


 sal/osl/unx/file_error_transl.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 83c81ca9d80f3d997861ee7a0cfb8f7ce620a3bb
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Nov 2 13:03:32 2017 +0100

    Avoid warning thrash
    
    ...between "error: unannotated fall-through between switch labels
    [-Werror,-Wimplicit-fallthrough]" (in some builds, for the original code) and
    "error: fallthrough annotation in unreachable code
    [-Werror,-Wimplicit-fallthrough]" (in other builds, after adding
    SAL_FALLTHROUGH).
    
    Change-Id: I75bbefd69c81f43f22117f8ad110237de24e18af

diff --git a/sal/osl/unx/file_error_transl.cxx b/sal/osl/unx/file_error_transl.cxx
index 10812a8245ae..54b19ce10a9f 100644
--- a/sal/osl/unx/file_error_transl.cxx
+++ b/sal/osl/unx/file_error_transl.cxx
@@ -164,9 +164,8 @@ oslFileError oslTranslateFileError(int Errno)
         case ETIMEDOUT:
             return osl_File_E_TIMEDOUT;
 
-        case 0:
-            assert(false);
         default:
+            assert(Errno != 0);
             /* FIXME translateFileError: is this alright? Or add a new one: osl_File_E_Unknown? */
             return osl_File_E_invalidError;
     }


More information about the Libreoffice-commits mailing list