Drop win32-specific asprintf implementation

asprintf is implemented by rrd_snprintf anyway, the win32-specific implementation is redundant. Signed-off-by: Michal Suchanek <[email protected]>
oetiker · Jan 7, 2024 · de325d7 · de325d7
1 parent 6892508
commit de325d7
Show file tree

Hide file tree

Showing 10 changed files with 4 additions and 124 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -26,7 +26,7 @@ EXTRA_DIST = COPYRIGHT CHANGES TODO CONTRIBUTORS THREADS VERSION LICENSE \
              win32/rrdcgi.rc win32/rrd_config.h \
              win32/rrd.sln win32/rrdtool.rc win32/rrdtool.vcxproj win32/rrdupdate.rc \
              win32/rrdcgi.vcxproj win32/rrdupdate.vcxproj win32/uac.manifest \
-             win32/asprintf.c win32/asprintf.h win32/dirent.h win32/vasprintf-msvc.c
+             win32/dirent.h
 
 CLEANFILES = config.cache
 

diff --git a/src/rrd_info.c b/src/rrd_info.c
@@ -8,9 +8,7 @@
 #include "rrd_rpncalc.h"
 #include "rrd_client.h"
 #include <stdarg.h>
-#ifdef _MSC_VER
-#include "asprintf.h"   /* for vasprintf() here */
-#endif
+#include "rrd_snprintf.h"   /* for vasprintf() here */
 
 /* allocate memory for string */
 char     *sprintf_alloc(

diff --git a/src/rrd_list.c b/src/rrd_list.c
@@ -5,7 +5,6 @@
 #ifdef _MSC_VER
 #include "win32-glob.h"    /* from https://sourceforge.net/projects/sox/ */
 #include "dirent.h"        /* from https://github.com/tronkko/dirent */
-#include "asprintf.h"      /* from http://asprintf.insanecoding.org */
 #else
 #if defined(__MINGW32__) && !defined(HAVE_GLOB_H)   /* MinGW has glob.h, MinGW-w64 not (yet?) */
 #include "win32/win32-glob.h"    /* from https://sourceforge.net/projects/sox/ */
@@ -18,6 +17,7 @@
 
 #include "rrd_tool.h"
 #include "rrd_client.h"
+#include "rrd_snprintf.h"
 
 static char *move_past_prefix(const char *prefix, const char *string)
 {

diff --git a/win32/Makefile.msc b/win32/Makefile.msc
@@ -81,8 +81,6 @@ RRD_LIB_OBJ_LIST = \
         $(TOP)/src/rrd_utils.obj \
         $(TOP)/src/rrd_version.obj \
         $(TOP)/src/rrd_xport.obj \
-        $(TOP)/win32/asprintf.obj \
-        $(TOP)/win32/vasprintf-msvc.obj \
         $(TOP)/win32/win32-glob.obj
 # win32comp.obj is not added to RRD_LIB_OBJ_LIST, because definitions are already in rrd_thread_safe_nt.obj
 

diff --git a/win32/Makefile_vcpkg.msc b/win32/Makefile_vcpkg.msc
@@ -82,8 +82,6 @@ RRD_LIB_OBJ_LIST = \
         $(TOP)/src/rrd_utils.obj \
         $(TOP)/src/rrd_version.obj \
         $(TOP)/src/rrd_xport.obj \
-        $(TOP)/win32/asprintf.obj \
-        $(TOP)/win32/vasprintf-msvc.obj \
         $(TOP)/win32/win32-glob.obj
 # win32comp.obj is not added to RRD_LIB_OBJ_LIST, because definitions are already in rrd_thread_safe_nt.obj
 

diff --git a/win32/asprintf.c b/win32/asprintf.c
diff --git a/win32/asprintf.h b/win32/asprintf.h
diff --git a/win32/librrd-8.vcxproj b/win32/librrd-8.vcxproj
@@ -427,8 +427,6 @@
     <ClCompile Include="..\src\rrd_utils.c" />
     <ClCompile Include="..\src\rrd_version.c" />
     <ClCompile Include="..\src\rrd_xport.c" />
-    <ClCompile Include="asprintf.c" />
-    <ClCompile Include="vasprintf-msvc.c" />
     <ClCompile Include="win32-glob.c" />
   </ItemGroup>
   <ItemGroup>
@@ -468,4 +466,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
diff --git a/win32/rrd_config.h b/win32/rrd_config.h
@@ -52,9 +52,6 @@
 #  endif
 #endif
 
-/* Define to 1 if you have the `asprintf' function. */
-#define HAVE_ASPRINTF 1
-
 /* Define to 1 if you have the `chdir' function. */
 #define HAVE_CHDIR 1
 
@@ -103,9 +100,6 @@
 /* Define to 1 if you have the `uintptr_t' standard type. */
 #define HAVE_UINTPTR_T 1
 
-/* Define to 1 if you have the `vasprintf' function. */
-#define HAVE_VASPRINTF 1
-
 /* Define to 1 if you have the `va_copy' function or macro. */
 #define HAVE_VA_COPY 1
 

diff --git a/win32/vasprintf-msvc.c b/win32/vasprintf-msvc.c