X-Git-Url: https://git.datadissipation.net/libcext/blobdiff_plain/fd4273e5b7249057309c65c78ec1bd766bed03fe..refs/heads/master:/asprintf.h

diff --git a/asprintf.h b/asprintf.h
index a22a6fb..47b9752 100644
--- a/asprintf.h
+++ b/asprintf.h
@@ -26,105 +26,51 @@
  */
 
 /* https://git.datadissipation.net */
-#ifndef ASPRINTF_H_
- #define ASPRINTF_H_ 1
+#ifndef LCE_ASPRINTF_H
+ #define LCE_ASPRINTF_H            1
 
- #ifdef ASPRINTF_INCLUDE_LIBC
+ #ifdef LCE_ASPRINTF_INCLUDE_LIBC
   #include <stdarg.h>
   #include <stdio.h>
   #include <stdlib.h>
- #endif
+ #endif /* LCE_ASPRINTF_INCLUDE_LIBC */
 
  #ifndef HAVE_ASPRINTF
-  #define HAVE_ASPRINTF 1
-  int i_vasprintf_(char **restrict strp, const char *restrict fmt, va_list ap);
-  int i_asprintf_(char **restrict strp, const char *restrict fmt, ...);
-  /* 
-   * Credit for a big part of the macro madness:
-   * Jens Gustedt
-   * https://gustedt.wordpress.com/2010/06/08/detect-empty-macro-arguments/
-   */
-
-  /*
-   * This isn't strict C99, because C99 requires at least one argument in "..."
-   * for macros. Still, I haven't encountered a compiler that won't preprocess 
-   * this right (out of the popular ones, MSVC wasn't tested)
-   */
-  #define vasprintf(s, f, a)   i_vasprintf_(s, f, a)
-  #define I_COND_COMMA_(...) ,
-  #define I_PICK_ARG_(_1, _2, ARG, ...) ARG
-  #define I_HAS_COMMA_(...) I_PICK_ARG_(__VA_ARGS__, 1, 0)
- 
-  #define I_ISEMPTY_(...)                                                      \
-  II_ISEMPTY_(                                                                 \
-	  /* test if there is just one argument, eventually an empty           \
-	  one */                                                               \
-	  I_HAS_COMMA_(__VA_ARGS__),                                           \
-	  /* test if I_COND_COMMA_ together with the argument                  \
-	  adds a comma */                                                      \
-	  I_HAS_COMMA_(I_COND_COMMA_ __VA_ARGS__),                             \
-	  /* test if the argument together with a parenthesis                  \
-	  adds a comma */                                                      \
-	  I_HAS_COMMA_(__VA_ARGS__ (/*empty*/)),                               \
-	  /* test if placing it between I_COND_COMMA_ and the                  \
-	  parenthesis adds a comma */                                          \
-	  I_HAS_COMMA_(I_COND_COMMA_ __VA_ARGS__ (/*empty*/))                  \
-	  )
- 
-  #define I_PASTE5_(_0, _1, _2, _3, _4) _0 ## _1 ## _2 ## _3 ## _4
-  #define II_ISEMPTY_(_0, _1, _2, _3)\
-  I_HAS_COMMA_(I_PASTE5_(I_IS_EMPTY_CASE_, _0, _1, _2, _3))
-  #define I_IS_EMPTY_CASE_0001 ,
-
-  #define II_PASTE_(a) I_EMPTY_##a
-  #define I_PASTE_(a) II_PASTE_(a)
-
-  #define I_GET_ARG_(...) I_PICK_ARG_(__VA_ARGS__)
-  #define asprintf(s, f, ...)\
-  i_asprintf_(s, f I_PASTE_(I_ISEMPTY_(I_GET_ARG_(, , __VA_ARGS__))) __VA_ARGS__)
-  #define I_EMPTY_1
-  #define I_EMPTY_0 I_COND_COMMA_()
+  #define HAVE_ASPRINTF         1
+  #define asprintf              lce_asprintf_
+  #define vasprintf             lce_vasprintf_
+int lce_vasprintf_(char **strp, const char *fmt, va_list ap);
+int lce_asprintf_(char **strp, const char *fmt, ...);
  #endif /* !HAVE_ASPRINTF */
 
- #ifdef ASPRINTF_IMPLEMENTATION
- int
- i_vasprintf_(char **restrict strp, const char *restrict fmt, va_list ap)
- {
- 	 int size, ret;
- 	 va_list tp;
-
-	 va_copy(tp, ap);
-	 size = vsnprintf(NULL, 0, fmt, tp);
-	 va_end(tp);
+ #ifdef LCE_ASPRINTF_IMPLEMENTATION
+int
+lce_vasprintf_(char **strp, const char *fmt, va_list ap)
+{
+	int size;
+	va_list tp;
 
-	 if (size < 0) {
-		 return -1;
-	 }
-	 *strp = malloc(size + 1);
-	 if (*strp == NULL) {
-		 return -1;
-	 }
+	va_copy(tp, ap);
+	size = vsnprintf(NULL, 0, fmt, tp);
+	va_end(tp);
 
-	 ret = vsnprintf(*strp, size + 1, fmt, ap);
-	 if (ret < 0) {
-		 free(*strp);
-		 return -1;
-	 }
+	if (size < 0 || !(*strp = malloc(size + 1)))
+		return -1;
 
-	 return ret;
- }
+	return vsnprintf(*strp, size + 1, fmt, ap);
+}
 
- int
- i_asprintf_(char **restrict strp, const char *restrict fmt, ...)
- {
-	 int ret;
-	 va_list ap;
+int
+lce_asprintf_(char **strp, const char *fmt, ...)
+{
+	int ret;
+	va_list ap;
 
-	 va_start(ap, fmt);
-	 ret = i_vasprintf_(strp, fmt, ap);
-	 va_end(ap);
+	va_start(ap, fmt);
+	ret = lce_vasprintf_(strp, fmt, ap);
+	va_end(ap);
 
-	 return ret;
- }
- #endif /* ASPRINTF_IMPLEMENTATION */
-#endif /* !ASPRINTF_H_ */
+	return ret;
+}
+ #endif /* LCE_ASPRINTF_IMPLEMENTATION */
+#endif /* !LCE_ASPRINTF_H */