From: Todd Fiala <todd.fiala@gmail.com>
Date: Wed, 28 May 2014 16:43:26 +0000 (+0000)
Subject: Fix Windows warnings.
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0a70a845342cd75f40b7de3f0e7e70d973f5aecb;p=platform%2Fupstream%2Fllvm.git

Fix Windows warnings.

This fixes a number of trivial warnings in the Windows build. This is part of a larger effort to make the Windows build warning-free.

See http://reviews.llvm.org/D3914 for more details.

Change by Zachary Turner

llvm-svn: 209749
---

diff --git a/lldb/source/Commands/CommandObjectArgs.cpp b/lldb/source/Commands/CommandObjectArgs.cpp
index cbfd055..e834298 100644
--- a/lldb/source/Commands/CommandObjectArgs.cpp
+++ b/lldb/source/Commands/CommandObjectArgs.cpp
@@ -57,13 +57,7 @@ CommandObjectArgs::CommandOptions::SetOptionValue (uint32_t option_idx, const ch
     Error error;
     
     const int short_option = m_getopt_table[option_idx].val;
-    
-    switch (short_option)
-    {
-        default:
-            error.SetErrorStringWithFormat("invalid short option character '%c'", short_option);
-            break;
-    }
+    error.SetErrorStringWithFormat("invalid short option character '%c'", short_option);
     
     return error;
 }
diff --git a/lldb/source/Core/ConnectionFileDescriptor.cpp b/lldb/source/Core/ConnectionFileDescriptor.cpp
index 31761d8..f688666 100644
--- a/lldb/source/Core/ConnectionFileDescriptor.cpp
+++ b/lldb/source/Core/ConnectionFileDescriptor.cpp
@@ -609,14 +609,14 @@ ConnectionFileDescriptor::Write (const void *src, size_t src_len, ConnectionStat
 
     switch (m_fd_send_type)
     {
-#ifndef LLDB_DISABLE_POSIX
         case eFDTypeFile:       // Other FD requireing read/write
+#ifndef LLDB_DISABLE_POSIX
             do
             {
                 bytes_sent = ::write (m_fd_send, src, src_len);
             } while (bytes_sent < 0 && errno == EINTR);
-            break;
 #endif
+            break;
         case eFDTypeSocket:     // Socket requiring send/recv
             do
             {
diff --git a/lldb/source/Host/common/SocketAddress.cpp b/lldb/source/Host/common/SocketAddress.cpp
index 971c469..a952a83 100644
--- a/lldb/source/Host/common/SocketAddress.cpp
+++ b/lldb/source/Host/common/SocketAddress.cpp
@@ -90,6 +90,7 @@ GetFamilyLength (sa_family_t family)
         case AF_INET6: return sizeof(struct sockaddr_in6);
     }
     assert(0 && "Unsupported address family");
+    return 0;
 }
 
 socklen_t
diff --git a/lldb/source/Plugins/Instruction/ARM64/EmulateInstructionARM64.cpp b/lldb/source/Plugins/Instruction/ARM64/EmulateInstructionARM64.cpp
index d5b312a..a4320696 100644
--- a/lldb/source/Plugins/Instruction/ARM64/EmulateInstructionARM64.cpp
+++ b/lldb/source/Plugins/Instruction/ARM64/EmulateInstructionARM64.cpp
@@ -575,7 +575,7 @@ EmulateInstructionARM64::Emulate_ldstpair (const uint32_t opcode, AddrMode a_mod
     }
     
     idx = LSL(llvm::SignExtend64<7>(imm7), scale);
-    size = 1 << scale;
+    size = (integer)1 << scale;
     uint64_t datasize = size * 8;
     uint64_t address;
     uint64_t wb_address;
diff --git a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp
index 4c2d369..ab4ed4c 100644
--- a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp
+++ b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp
@@ -38,7 +38,7 @@
 using namespace lldb;
 using namespace lldb_private;
 
-#ifdef LLDB_DISABLE_POSIX
+#if defined(LLDB_DISABLE_POSIX) && !defined(SIGSTOP)
 #define SIGSTOP 17
 #endif
 
diff --git a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
index a9ea0e9..010b668 100644
--- a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
+++ b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
@@ -110,7 +110,7 @@ DW_ACCESS_to_AccessType (uint32_t dwarf_accessibility)
     return eAccessNone;
 }
 
-#if defined(LLDB_CONFIGURATION_DEBUG) or defined(LLDB_CONFIGURATION_RELEASE)
+#if defined(LLDB_CONFIGURATION_DEBUG) || defined(LLDB_CONFIGURATION_RELEASE)
 
 class DIEStack
 {
@@ -5681,7 +5681,7 @@ SymbolFileDWARF::ParseType (const SymbolContext& sc, DWARFCompileUnit* dwarf_cu,
     if (type_is_new_ptr)
         *type_is_new_ptr = false;
 
-#if defined(LLDB_CONFIGURATION_DEBUG) or defined(LLDB_CONFIGURATION_RELEASE)
+#if defined(LLDB_CONFIGURATION_DEBUG) || defined(LLDB_CONFIGURATION_RELEASE)
     static DIEStack g_die_stack;
     DIEStack::ScopedPopper scoped_die_logger(g_die_stack);
 #endif
@@ -5702,7 +5702,7 @@ SymbolFileDWARF::ParseType (const SymbolContext& sc, DWARFCompileUnit* dwarf_cu,
                                                       DW_TAG_value_to_name(die->Tag()),
                                                       die->GetName(this, dwarf_cu));
 
-#if defined(LLDB_CONFIGURATION_DEBUG) or defined(LLDB_CONFIGURATION_RELEASE)
+#if defined(LLDB_CONFIGURATION_DEBUG) || defined(LLDB_CONFIGURATION_RELEASE)
             scoped_die_logger.Push (dwarf_cu, die);
             g_die_stack.LogDIEs(log, this);
 #endif
diff --git a/lldb/source/Target/Platform.cpp b/lldb/source/Target/Platform.cpp
index 96f63ea..09ba8b4 100644
--- a/lldb/source/Target/Platform.cpp
+++ b/lldb/source/Target/Platform.cpp
@@ -530,6 +530,9 @@ RecurseCopy_Callback (void *baton,
             rc_baton->error.SetErrorStringWithFormat("invalid file detected during copy: %s", src.GetPath().c_str());
             return FileSpec::eEnumerateDirectoryResultQuit; // got an error, bail out
             break;
+        default:
+            return FileSpec::eEnumerateDirectoryResultQuit; // unsupported file type, bail out
+            break;
     }
 }