[Libreoffice-commits] .: 2 commits - patches/dev300

[Petr Mladek]

 patches/dev300/apply                                        |    6 --
 patches/dev300/warning-return-values-registry.diff          |   21 -------
 patches/dev300/warning-uninitialized-variables-tools-2.diff |   33 ------------
 3 files changed, 60 deletions(-)

New commits:
commit 305db610603404a750e8a2c89085d8891a1a632b
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Mar 30 19:48:09 2011 +0200

    pushed warning-uninitialized-variables-tools-2.diff into git

diff --git a/patches/dev300/apply b/patches/dev300/apply
index c6feecc..5c4e36d 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -557,10 +557,6 @@ sfx2-badscript.diff, i#67976
 # work around http://gcc.gnu.org/bugzilla/show_bug.cgi?id=22392
 svx-customshapes-NOOPTFILES.diff, martink
 
-# This set seem to be related to a gcc bug ...
-# fixes warnings about that a variable is used unitialized
-warning-uninitialized-variables-tools-2.diff, i#58984, pmladek
-
 [ LinuxOnly ]
 
 system-python-ure-bootstrap.diff, deb#501028, i#90701
diff --git a/patches/dev300/warning-uninitialized-variables-tools-2.diff b/patches/dev300/warning-uninitialized-variables-tools-2.diff
deleted file mode 100644
index 7b796b6..0000000
--- a/patches/dev300/warning-uninitialized-variables-tools-2.diff
+++ /dev/null
@@ -1,33 +0,0 @@
----
- tools/source/inet/inetmime.cxx |    8 ++++++--
- 1 files changed, 6 insertions(+), 2 deletions(-)
-
-diff --git tools/source/inet/inetmime.cxx tools/source/inet/inetmime.cxx
-index 39df87f..6dfe9fb 100644
---- tools/source/inet/inetmime.cxx
-+++ tools/source/inet/inetmime.cxx
-@@ -3065,7 +3065,9 @@ ByteString INetMIME::decodeUTF8(const ByteString & rText,
-     ByteString sDecoded;
-     while (p != pEnd)
-     {
--        sal_uInt32 nCharacter;
-+        // the value is initialized just to avoid warning: ‘nCharacter’ is used uninitialized in this function
-+        // there seems to be a bug in gcc-4.1 because this value is used only if it is initialized
-+        sal_uInt32 nCharacter=0;
-         if (translateUTF8Char(p, pEnd, eEncoding, nCharacter))
-             sDecoded += sal_Char(nCharacter);
-         else
-@@ -3498,7 +3500,9 @@ UniString INetMIME::decodeHeaderFieldBody(HeaderFieldType eType,
-             {
-                 const sal_Char * pUTF8Begin = p - 1;
-                 const sal_Char * pUTF8End = pUTF8Begin;
--                sal_uInt32 nCharacter;
-+                // the value is initialized just to avoid warning: ‘nCharacter’ is used uninitialized in this function
-+                // there seems to be a bug in gcc-4.1 because this value is used only if it is initialized
-+                sal_uInt32 nCharacter=0;
-                 if (translateUTF8Char(pUTF8End, pEnd, RTL_TEXTENCODING_UCS4,
-                                       nCharacter))
-                 {
--- 
-1.7.0.1
-
commit cfcc56d1cf33f80757910be1cbbe1d47d682468f
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Mar 30 19:39:47 2011 +0200

    pushed warning-return-values-registry.diff into git

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 92f0ac2..c6feecc 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -558,8 +558,6 @@ sfx2-badscript.diff, i#67976
 svx-customshapes-NOOPTFILES.diff, martink
 
 # This set seem to be related to a gcc bug ...
-# fixes warnings about missing return values
-warning-return-values-registry.diff, i#58979, pmladek
 # fixes warnings about that a variable is used unitialized
 warning-uninitialized-variables-tools-2.diff, i#58984, pmladek
 
diff --git a/patches/dev300/warning-return-values-registry.diff b/patches/dev300/warning-return-values-registry.diff
deleted file mode 100644
index 7b4a76c..0000000
--- a/patches/dev300/warning-return-values-registry.diff
+++ /dev/null
@@ -1,21 +0,0 @@
----
- registry/source/regimpl.cxx |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git registry/source/regimpl.cxx registry/source/regimpl.cxx
-index db6990b..8eb00f6 100644
---- registry/source/regimpl.cxx
-+++ registry/source/regimpl.cxx
-@@ -522,6 +522,9 @@ RegError ORegistry::initRegistry(const OUString& regName, RegAccessMode accessMo
-         } else
-             return REG_INVALID_REGISTRY;
-     }
-+    // this line is never accessed
-+    // just hack to avoid warning: control reaches end of non-void function
-+    return REG_INVALID_REGISTRY;
- }
- 
- 
--- 
-1.7.0.1
-