zeroc-ice 3.7.1 → 3.7.6

data/ext/ice/cpp/src/IceSSL/Util.h

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICESSL_UTIL_H
 #define ICESSL_UTIL_H

data/ext/ice/cpp/src/IceUtil/ConsoleUtil.cpp

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/ConsoleUtil.h>
 #include <IceUtil/MutexPtrLock.h>

data/ext/ice/cpp/src/IceUtil/ConvertUTF.cpp

@@ -20,14 +20,9 @@
  * remains attached.
  */
 
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 /* ---------------------------------------------------------------------
 

data/ext/ice/cpp/src/IceUtil/ConvertUTF.h

@@ -20,14 +20,9 @@
  * remains attached.
  */
 
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_UTIL_CONVERT_UTF_H
 #define ICE_UTIL_CONVERT_UTF_H

data/ext/ice/cpp/src/IceUtil/CtrlCHandler.cpp

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifdef __sun
 #    define _POSIX_PTHREAD_SEMANTICS
@@ -131,6 +126,7 @@ CtrlCHandler::~CtrlCHandler()
     {
         IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(globalMutex);
         _handler = 0;
+        _callback = ICE_NULLPTR;
     }
 }
 
@@ -242,6 +238,7 @@ CtrlCHandler::~CtrlCHandler()
     {
         IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(globalMutex);
         _handler = 0;
+        _callback = ICE_NULLPTR;
     }
 
     //

data/ext/ice/cpp/src/IceUtil/FileUtil.cpp

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/DisableWarnings.h>
 #include <IceUtil/FileUtil.h>
@@ -384,7 +379,7 @@ IceUtilInternal::rmdir(const string& path)
 int
 IceUtilInternal::mkdir(const string& path, int perm)
 {
-    return ::mkdir(path.c_str(), perm);
+    return ::mkdir(path.c_str(), static_cast<mode_t>(perm));
 }
 
 FILE*

data/ext/ice/cpp/src/IceUtil/InputUtil.cpp

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/InputUtil.h>
 #include <stdlib.h>

data/ext/ice/cpp/src/IceUtil/MutexProtocol.cpp

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/MutexProtocol.h>
 

data/ext/ice/cpp/src/IceUtil/Options.cpp

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/Options.h>
 #include <IceUtil/StringUtil.h>
@@ -436,7 +431,7 @@ IceUtilInternal::Options::split(const string& line)
                                     j < i + 3 && j < l.size() && octalDigits.find_first_of(c = l[j]) != string::npos;
                                     ++j)
                                 {
-                                    us = us * 8 + c - '0';
+                                    us = us * 8 + static_cast<unsigned short>(c - '0');
                                 }
                                 i = j - 1;
                                 arg.push_back(static_cast<char>(us));
@@ -534,7 +529,7 @@ IceUtilInternal::Options::split(const string& line)
             }
             default:
             {
-                assert(!"Impossible parse state");
+                assert(false); // Impossible parse state
                 break;
             }
         }
@@ -564,7 +559,7 @@ IceUtilInternal::Options::split(const string& line)
         }
         default:
         {
-            assert(!"Impossible parse state");
+            assert(false); // Impossible parse state
             break;
         }
     }
@@ -646,13 +641,20 @@ IceUtilInternal::Options::parse(const StringVector& args)
 
             if(p != string::npos)
             {
-                if(pos->second->arg == NoArg && p != args[i].size() - 1)
+                if(pos->second->arg == NoArg)
                 {
                     string err = "`";
-                    err += args[i];
+                    err += opt;
                     err += "': option does not take an argument";
                     throw BadOptException(__FILE__, __LINE__, err);
                 }
+                else if(pos->second->arg == NeedArg && p == args[i].size() - 1)
+                {
+                    string err = "`";
+                    err += opt;
+                    err += "': option requires an argument";
+                    throw BadOptException(__FILE__, __LINE__, err);
+                }
                 setOpt(opt, "", args[i].substr(p + 1), pos->second->repeat);
                 argDone = true;
             }
@@ -685,12 +687,20 @@ IceUtilInternal::Options::parse(const StringVector& args)
                     }
                 }
 
-                if(pos->second->arg == NeedArg && p != args[i].size() - 1)
+                if(pos->second->arg == NeedArg)
+                {
+                    if(p != args[i].size() - 1)
+                    {
+                        string optArg = args[i].substr(p + 1);
+                        setOpt(opt, "", optArg, pos->second->repeat);
+                        argDone = true;
+                        break;
+                    }
+                }
+                else
                 {
-                    string optArg = args[i].substr(p + 1);
-                    setOpt(opt, "", optArg, pos->second->repeat);
+                    setOpt(opt, "", "1", pos->second->repeat);
                     argDone = true;
-                    break;
                 }
             }
         }

data/ext/ice/cpp/src/IceUtil/OutputUtil.cpp

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/OutputUtil.h>
 #include <IceUtil/FileUtil.h>
@@ -240,33 +235,43 @@ IceUtilInternal::OutputBase::operator!() const
 // Output
 // ----------------------------------------------------------------------
 
-IceUtilInternal::Output::Output() :
+IceUtilInternal::Output::Output(bool breakBeforeBlock, bool shortEmptyBlock) :
     OutputBase(),
     _blockStart("{"),
     _blockEnd("}"),
-    _par(-1)
+    _par(-1),
+    _breakBeforeBlock(breakBeforeBlock),
+    _shortEmptyBlock(shortEmptyBlock),
+    _emptyBlock(false)
 {
 }
 
-IceUtilInternal::Output::Output(ostream& os) :
+IceUtilInternal::Output::Output(ostream& os, bool breakBeforeBlock, bool shortEmptyBlock) :
     OutputBase(os),
     _blockStart("{"),
     _blockEnd("}"),
-    _par(-1)
+    _par(-1),
+    _breakBeforeBlock(breakBeforeBlock),
+    _shortEmptyBlock(shortEmptyBlock),
+    _emptyBlock(false)
 {
 }
 
-IceUtilInternal::Output::Output(const char* s) :
+IceUtilInternal::Output::Output(const char* s, bool breakBeforeBlock, bool shortEmptyBlock) :
     OutputBase(s),
     _blockStart("{"),
     _blockEnd("}"),
-    _par(-1)
+    _par(-1),
+    _breakBeforeBlock(breakBeforeBlock),
+    _shortEmptyBlock(shortEmptyBlock),
+    _emptyBlock(false)
 {
 }
 
 void
 IceUtilInternal::Output::print(const string& s)
 {
+    _emptyBlock = false;
     if(_par >= 0)
     {
         if(++_par > 1) // No comma for the first parameter.
@@ -282,22 +287,41 @@ IceUtilInternal::Output::sb()
 {
     if(_blockStart.length())
     {
-        newline();
+        if(_breakBeforeBlock)
+        {
+            newline();
+        }
+        else
+        {
+            _out << ' ';
+        }
         _out << _blockStart;
     }
     ++_pos;
     inc();
     _separator = false;
+    _emptyBlock = true;
 }
 
 void
 IceUtilInternal::Output::eb()
 {
     dec();
-    if(_blockEnd.length())
+    if(_emptyBlock && _shortEmptyBlock)
     {
-        newline();
-        _out << _blockEnd;
+        if(_blockEnd.length())
+        {
+            _separator = true;
+            _out << _blockEnd;
+        }
+    }
+    else
+    {
+        if(_blockEnd.length())
+        {
+            newline();
+            _out << _blockEnd;
+        }
     }
     --_pos;
 }
@@ -305,6 +329,7 @@ IceUtilInternal::Output::eb()
 void
 IceUtilInternal::Output::spar(char c)
 {
+    _emptyBlock = false;
     _out << c;
     _par = 0;
 }

data/ext/ice/cpp/src/IceUtil/Random.cpp

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifdef _WIN32
 #  define _CRT_RAND_S
@@ -152,7 +147,7 @@ IceUtilInternal::generateRandom(char* buffer, size_t size)
         }
         else
         {
-            index += bytesRead;
+            index += static_cast<size_t>(bytesRead);
             reads++;
         }
     }
@@ -179,7 +174,7 @@ IceUtilInternal::random(int limit)
 #endif
     if(limit > 0)
     {
-        r = r % limit;
+        r = r % static_cast<unsigned int>(limit);
     }
     return r;
 }

data/ext/ice/cpp/src/IceUtil/RecMutex.cpp

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/RecMutex.h>
 #include <IceUtil/Exception.h>
@@ -113,7 +108,7 @@ IceUtil::RecMutex::lock(LockState& state) const
 #else
 
 void
-IceUtil::RecMutex::init(const MutexProtocol protocol)
+IceUtil::RecMutex::init(ICE_MAYBE_UNUSED const MutexProtocol protocol)
 {
     int rc;
     pthread_mutexattr_t attr;

data/ext/ice/cpp/src/IceUtil/Shared.cpp

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/Shared.h>
 

data/ext/ice/cpp/src/IceUtil/StringConverter.cpp

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/StringConverter.h>
 #include <IceUtil/MutexPtrLock.h>
@@ -97,7 +92,7 @@ public:
         do
         {
             assert(factor <= 4);
-            const size_t chunkSize = std::max<size_t>((sourceEnd - sourceStart) * factor, 4);
+            const size_t chunkSize = std::max<size_t>(static_cast<size_t>(sourceEnd - sourceStart) * factor, 4);
             ++factor; // at the next round, we'll allocate more bytes per remaining source character
 
             targetStart = reinterpret_cast<char*>(buffer.getMoreBytes(chunkSize, reinterpret_cast<Byte*>(targetNext)));
@@ -150,7 +145,7 @@ public:
 
     virtual void fromUTF8(const Byte* sourceStart, const Byte* sourceEnd, wstring& target) const
     {
-        const size_t sourceSize = sourceEnd - sourceStart;
+        const size_t sourceSize = static_cast<size_t>(sourceEnd - sourceStart);
 
         if(sourceSize == 0)
         {
@@ -178,7 +173,7 @@ public:
                 throw IllegalConversionException(__FILE__, __LINE__, "codecvt.in failure");
             }
 
-            target.resize(targetNext - targetStart);
+            target.resize(static_cast<size_t>(targetNext - targetStart));
         }
     }
 
@@ -280,7 +275,7 @@ public:
         size_t bytesUsed = 0;
         if(firstUnused != 0)
         {
-            bytesUsed = firstUnused - reinterpret_cast<const Byte*>(_buffer.data());
+            bytesUsed = static_cast<size_t>(firstUnused - reinterpret_cast<const Byte*>(_buffer.data()));
         }
 
         if(_buffer.size() < howMany + bytesUsed)
@@ -294,7 +289,7 @@ public:
     void swap(string& other, const Byte* tail)
     {
         assert(tail >= reinterpret_cast<const Byte*>(_buffer.data()));
-        _buffer.resize(tail - reinterpret_cast<const Byte*>(_buffer.data()));
+        _buffer.resize(static_cast<size_t>(tail - reinterpret_cast<const Byte*>(_buffer.data())));
         other.swap(_buffer);
     }