[c89stringutils/c89stringutils_string_extras.c] Remove superfluous guards ; [{.github/workflows/linux-Windows-macOS-sunOS.yml,README.md}] Reflect (temporary) lack of SunOS testing

Author: SamuelMarks

.github/workflows/linux-Windows-macOS-sunOS.yml

@@ -1,4 +1,4 @@
-name: Linux, Windows, macOS, SunOS
+name: Linux, Windows, macOS
 
 on:
   push:

README.md

@@ -1,7 +1,7 @@
 c89stringutils
 ==============
 [![License](https://img.shields.io/badge/license-Apache--2.0%20OR%20MIT-blue.svg)](https://opensource.org/licenses/Apache-2.0)
-[![CI for Linux, Windows, macOS, sunOS](https://github.com/offscale/c89stringutils/actions/workflows/linux-Windows-macOS-sunOS.yml/badge.svg)](https://github.com/offscale/c89stringutils/actions/workflows/github-actions.yml)
+[![CI for Linux, Windows, macOS](https://github.com/offscale/c89stringutils/actions/workflows/linux-Windows-macOS-sunOS.yml/badge.svg)](https://github.com/offscale/c89stringutils/actions/workflows/github-actions.yml)
 [![CI for FreeBSD](https://api.cirrus-ci.com/github/offscale/c89stringutils.svg)](https://cirrus-ci.com/github/offscale/c89stringutils)
 [![C89](https://img.shields.io/badge/C-89-blue)](https://en.wikipedia.org/wiki/C89_(C_version))
 

c89stringutils/c89stringutils_string_extras.c

@@ -10,8 +10,9 @@
 #include <string.h>
 #include <stdlib.h>
 
-#if !defined(HAVE_SNPRINTF_H)
+#ifndef HAVE_SNPRINTF_H
 #define HAVE_SNPRINTF_H
+
 /*
  * `snprintf`, `vsnprintf`, `strnstr` taken from:
  * https://chromium.googlesource.com/chromium/blink/+/5cedd2fd208daf119b9ea47c7c1e22d760a586eb/Source/wtf/StringExtras.h
@@ -32,10 +33,6 @@
 
 #else
 
-#ifdef ANY_BSD
-#define vsnprintf _vsnprintf
-#endif /* !ANY_BSD */
-
 inline int snprintf(char *buffer, size_t count, const char *format, ...) {
   int result;
   va_list args;
@@ -67,24 +64,20 @@ inline double wtf_vsnprintf(char *buffer, size_t count, const char *format,
 
 #endif /* OLD_MSVC */
 
-#endif /* !defined(HAVE_SNPRINTF_H) */
+#endif /* !HAVE_SNPRINTF_H */
 
 #ifndef HAVE_STRNCASECMP_H
 
-#if !defined(HAVE_STRNCASECMP_H)
 #define HAVE_STRNCASECMP_H
 
 #define strncasecmp _strnicmp
 #define strcasecmp _stricmp
 
-#endif /* !defined(HAVE_STRNCASECMP_H) */
-
 #endif /* !HAVE_STRNCASECMP_H */
 
 #ifndef HAVE_STRNSTR
-
-#if !defined(HAVE_STRNSTR)
 #define HAVE_STRNSTR
+
 char *strnstr(const char *buffer, const char *target, size_t bufferLength) {
   /*
      Find the first occurrence of find in s, where the search is limited to the
@@ -115,13 +108,11 @@ char *strnstr(const char *buffer, const char *target, size_t bufferLength) {
   }
   return 0;
 }
-#endif /* !defined(HAVE_STRNSTR) */
 
 #endif /* !HAVE_STRNSTR */
 
 #ifndef HAVE_STRCASESTR_H
 
-#if !defined(HAVE_STRCASESTR_H)
 #define HAVE_STRCASESTR_H
 
 /* `strcasestr` from MUSL */
@@ -134,13 +125,10 @@ char *strcasestr(const char *h, const char *n) {
   return 0;
 }
 
-#endif /* !defined(HAVE_STRCASESTR_H) */
-
 #endif /* !HAVE_STRCASESTR_H */
 
 #ifndef HAVE_STRERRORLEN_S
 
-#if !defined(HAVE_STRERRORLEN_S)
 #define HAVE_STRERRORLEN_S
 /* MIT licensed function from Safe C Library */
 
@@ -186,13 +174,9 @@ size_t strerrorlen_s(errno_t errnum) {
   }
 }
 
-#endif /* !defined(HAVE_STRERRORLEN_S) */
-
 #endif /* !HAVE_STRERRORLEN_S */
 
 #ifndef HAVE_ASPRINTF
-
-#if !defined(HAVE_ASPRINTF)
 #define HAVE_ASPRINTF
 
 #include <errno.h>
@@ -265,13 +249,9 @@ extern int asprintf(char **str, const char *fmt, ...) {
   return ret;
 }
 
-#endif /* !defined(HAVE_ASPRINTF) */
-
 #endif /* !HAVE_ASPRINTF */
 
 #ifndef HAVE_JASPRINTF
-
-#if !defined(HAVE_JASPRINTF)
 #define HAVE_JASPRINTF
 char *jasprintf(char **unto, const char *fmt, ...) {
   va_list args;
@@ -297,5 +277,4 @@ char *jasprintf(char **unto, const char *fmt, ...) {
 
   return result;
 }
-#endif /* !defined(HAVE_JASPRINTF) */
 #endif /* !HAVE_JASPRINTF */