Cleanup _snprintf logic

Fix building dyninstAPI_RT with VS 2015. Remove unnecessary overriding of _snprintf in favor of a centralized definition.
dyninst · Jun 15, 2016 · 89c7c45 · 89c7c45
1 parent 22d9723
commit 89c7c45
Show file tree

Hide file tree

Showing 12 changed files with 3 additions and 58 deletions.
diff --git a/cmake/shared.cmake b/cmake/shared.cmake
@@ -105,7 +105,7 @@ foreach (p LIB INCLUDE CMAKE)
 endforeach()
 
 if(PLATFORM MATCHES nt OR PLATFORM MATCHES windows)
-  if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 19)
+  if (CMAKE_C_COMPILER_VERSION VERSION_GREATER 19)
     add_definitions(-D_SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS=1)
   else()
     add_definitions(-Dsnprintf=_snprintf)

diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
@@ -98,11 +98,7 @@ if (PLATFORM MATCHES nt OR PLATFORM MATCHES windows)
 #	src/dthread.C
     src/addrtranslate-win.C
   )
-  if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 19)
-    add_definitions(-DWIN32 -D_WIN32_WINNT=0x500)
-  else()
-    add_definitions(-DWIN32 -D_WIN32_WINNT=0x500 -Dsnprintf=_snprintf)
-  endif()
+  add_definitions(-DWIN32 -D_WIN32_WINNT=0x500)
 endif()  
 
 

diff --git a/common/src/Types.C b/common/src/Types.C
@@ -37,10 +37,6 @@
 #include <stdio.h>
 #include <assert.h>
 
-#if (defined(_MSC_VER) && _MSC_VER < 1900)
-#define snprintf _snprintf
-#endif
-
 // verify the size of the defined Address type
 void Address_chk ()
 {

diff --git a/common/src/serialize-bin.C b/common/src/serialize-bin.C
@@ -37,10 +37,6 @@
 #include "common/src/Types.h"
 #include "common/src/headers.h"
 
-#if (defined(_MSC_VER) && _MSC_VER < 1900)
-#define snprintf _snprintf
-#endif
-
 #if defined(SERIALIZATION_DISABLED)
 unsigned short Dyninst::get_serializer_index(Dyninst::SerializerBase *) {
   return 0;

diff --git a/common/src/util.C b/common/src/util.C
@@ -36,10 +36,6 @@
 #include <map>
 #include "common/h/dyntypes.h"
 
-#if (defined(_MSC_VER) && _MSC_VER < 1900)
-#define snprintf _snprintf
-#endif
-
 using namespace std;
 
 namespace Dyninst {

diff --git a/dyninstAPI/src/BPatch_type.C b/dyninstAPI/src/BPatch_type.C
@@ -44,10 +44,6 @@
 #include "RegisterConversion.h"
 //#include "Annotatable.h"
 
-#if (defined(_MSC_VER) && _MSC_VER < 1900)
-#define snprintf _snprintf
-#endif
-
 using namespace Dyninst;
 using namespace Dyninst::SymtabAPI;
 

diff --git a/dyninstAPI/src/debug.C b/dyninstAPI/src/debug.C
@@ -152,11 +152,7 @@ int bperr(const char *format, ...)
 
   char syserr[128];
   if (errno) {
-#if defined (i386_unknown_nt4_0)
-    int syserrlen = _snprintf(syserr, 128," [%d: %s]", errno, strerror(errno));
-#else
     int syserrlen = snprintf(syserr, 128," [%d: %s]", errno, strerror(errno));
-#endif
     /* reset errno so that future calls to this function don't report same error */
     errno = 0;
 

diff --git a/dyninstAPI/src/image.C b/dyninstAPI/src/image.C
@@ -67,9 +67,7 @@
 #include "libdwarf.h"
 #endif
 
-#if (defined(_MSC_VER) && _MSC_VER < 1900)
-#define snprintf _snprintf
-#elif defined(_MSC_VER)
+#if defined(_MSC_VER)
 #include <dbghelp.h>
 #endif
 

diff --git a/dyninstAPI/src/pdwinnt.C b/dyninstAPI/src/pdwinnt.C
@@ -59,10 +59,6 @@
 #include "nt_signal_emul.h"
 #include "dyninstAPI/src/PCEventMuxer.h"
 
-#if (defined(_MSC_VER) && _MSC_VER < 1900)
-#define snprintf _snprintf
-#endif
-
 // prototypes of functions used in this file
 
 void InitSymbolHandler( HANDLE hPCProcess );

diff --git a/parseAPI/src/ParseData.C b/parseAPI/src/ParseData.C
@@ -137,20 +137,11 @@ StandardParseData::get_func(CodeRegion * cr, Address entry, FuncSource src)
     if(!(ret = findFunc(cr,entry))) {
         reg = reglookup(cr,entry); // get the *correct* CodeRegion
         if(reg && reg->isCode(entry)) {
-#if defined (os_windows)
-           if (src == MODIFICATION) {
-              _snprintf_s(name,32,"mod%lx",entry);
-           }
-           else {
-              _snprintf_s(name,32,"targ%lx",entry);
-           }
-#else
            if (src == MODIFICATION) {
               snprintf(name,32,"mod%lx",entry);
            } else {
               snprintf(name,32,"targ%lx",entry);
            }
-#endif
             parsing_printf("[%s] new function for target %lx\n",FILE__,entry);
             ret = _parser->factory()._mkfunc(
                entry,src,name,&_parser->obj(),reg,_parser->obj().cs());
@@ -328,17 +319,10 @@ OverlappingParseData::get_func(CodeRegion * cr, Address addr, FuncSource src)
         /* note the difference; we are limited to using the passed-in 
            CodeRegion in this overlapping cr case */
         if(cr && cr->isCode(addr)) {
-#if defined (os_windows)
-            if(src == GAP || src == GAPRT)
-                _snprintf_s(name,32,"gap%lx",addr);
-            else 
-                _snprintf_s(name,32,"targ%lx",addr);
-#else
             if(src == GAP || src == GAPRT)
                 snprintf(name,32,"gap%lx",addr);
             else
                 snprintf(name,32,"targ%lx",addr);
-#endif
             parsing_printf("[%s] new function for target %lx\n",FILE__,addr);
             ret = _parser->factory()._mkfunc(
                addr,src,name,&_parser->obj(),cr,cr);

diff --git a/symtabAPI/src/Object-nt.C b/symtabAPI/src/Object-nt.C
@@ -57,10 +57,6 @@
 
 #include "common/src/headers.h"
 
-#if defined(_MSC_VER)
-#define snprintf _snprintf
-#endif
-
 using namespace Dyninst;
 using namespace Dyninst::SymtabAPI;
 

diff --git a/symtabAPI/src/Type.C b/symtabAPI/src/Type.C
@@ -50,11 +50,6 @@ using namespace std;
 //#include "collections.h"
 //#include "debug.h" TODO: We want such behaviour. LATER!
 
-#if (defined(_MSC_VER) && _MSC_VER < 1900)
-#define snprintf _snprintf
-#endif
-
-
 static int findIntrensicType(std::string &name);
 
 // This is the ID that is decremented for each type a user defines. It is