Conform to C89—and my own quality standards—for MSVC (2005,2022,2026), DOS (OpenWatcom), gcc, and clang

Author: SamuelMarks

c89stringutils/c89stringutils_export_pregen.h

@@ -2,6 +2,10 @@
 #ifndef C89STRINGUTILS_EXPORT_H
 #define C89STRINGUTILS_EXPORT_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 #ifdef C89STRINGUTILS_STATIC_DEFINE
 #define C89STRINGUTILS_EXPORT
 #define C89STRINGUTILS_NO_EXPORT
@@ -14,7 +18,6 @@
 #else
 #define C89STRINGUTILS_EXPORT
 #endif
-#endif
 #else
 /* We are using this library */
 #if defined(BUILD_SHARED)
@@ -23,6 +26,7 @@
 #define C89STRINGUTILS_EXPORT
 #endif
 #endif
+#endif
 
 #ifndef C89STRINGUTILS_NO_EXPORT
 #define C89STRINGUTILS_NO_EXPORT
@@ -53,4 +57,8 @@
 #endif
 #endif
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* C89STRINGUTILS_EXPORT_H */

c89stringutils/c89stringutils_string_extras.c

@@ -26,12 +26,6 @@
  *
  * SPDX-License-Identifier:  BSD-2-Clause
  */
-#ifdef OLD_MSVC
-
-#define snprintf _snprintf
-#define vsnprintf _vsnprintf
-
-#else
 
 #ifdef ANY_BSD
 #define _vsnprintf vsnprintf
@@ -41,7 +35,11 @@ static int wtf_snprintf(char *buffer, size_t count, const char *format, ...) {
   int result;
   va_list args;
   va_start(args, format);
+#if defined(_MSC_VER)
+  result = _vsnprintf_s(buffer, count, _TRUNCATE, format, args);
+#else
   result = _vsnprintf(buffer, count, format, args);
+#endif
   va_end(args);
   /* In the case where the string entirely filled the buffer, _vsnprintf will
      not null-terminate it, but snprintf must. */
@@ -52,23 +50,23 @@ static int wtf_snprintf(char *buffer, size_t count, const char *format, ...) {
 
 static int wtf_vsnprintf(char *buffer, size_t count, const char *format,
                          va_list args) {
-  int result = _vsnprintf(buffer, count, format, args);
+  int result;
+#if defined(_MSC_VER)
+  result = _vsnprintf_s(buffer, count, _TRUNCATE, format, args);
+#else
+  result = _vsnprintf(buffer, count, format, args);
+#endif
   /* In the case where the string entirely filled the buffer, _vsnprintf will
      not null-terminate it, but vsnprintf must. */
   if (count > 0)
     buffer[count - 1] = '\0';
   return result;
 }
 
-/* Work around a difference in Microsoft's implementation of vsnprintf, where
-   vsnprintf does not null terminate the buffer. WebKit can rely on the null
-   termination. Microsoft's implementation is fixed in VS 2015. */
 #define vsnprintf(buffer, count, format, args)                                 \
   wtf_vsnprintf(buffer, count, format, args)
 #define snprintf wtf_snprintf
 
-#endif /* OLD_MSVC */
-
 #endif /* !HAVE_SNPRINTF_H */
 
 #ifndef HAVE_STRNCASECMP_H