Allow mpack_stdio to be true, without adding malloc

stdio, stdlib and debug is used for print functions, and only available on systems where list dynamic was available. This also had the effect of bringing in malloc and some nasty long assert functions with 512 bytes on the stack.

The asserts have been gutted from the implementation, and the malloc manually removed from the files.

Author: johandc

include/mpack/mpack-config.h

@@ -97,7 +97,7 @@
  * reading/writing C files and makes debugging easier.
  */
 #ifndef MPACK_STDIO
-#define MPACK_STDIO 0
+#define MPACK_STDIO 1
 #endif
 
 /**
@@ -120,9 +120,7 @@
  *
  * The default is malloc() if @ref MPACK_STDLIB is enabled.
  */
-#ifdef PARAM_LIST_DYNAMIC
-#define MPACK_MALLOC malloc
-#endif
+#undef MPACK_MALLOC
 
 /**
  * @def MPACK_FREE
@@ -134,9 +132,8 @@
  * The default is free() if @ref MPACK_MALLOC has not been customized and
  * @ref MPACK_STDLIB is enabled.
  */
-#ifdef PARAM_LIST_DYNAMIC
-#define MPACK_FREE free
-#endif
+#undef MPACK_FREE
+
 
 /**
  * @def MPACK_REALLOC

include/mpack/mpack.h

@@ -469,7 +469,7 @@
 #endif
 
 // Use defaults in stdlib if we have them. Without it we don't use malloc.
-#if defined(MPACK_STDLIB)
+#if 0
     #if MPACK_STDLIB && !defined(MPACK_MALLOC)
         #define MPACK_MALLOC malloc
         #define MPACK_REALLOC realloc
@@ -1681,7 +1681,7 @@ MPACK_EXTERN_C_BEGIN
 
 #if MPACK_DEBUG
     MPACK_NORETURN(void mpack_assert_fail_wrapper(const char* message));
-    #if MPACK_STDIO
+    #if 0
         MPACK_NORETURN(void mpack_assert_fail_format(const char* format, ...));
         #define mpack_assert_fail_at(line, file, exprstr, format, ...) \
                 MPACK_EXPAND(mpack_assert_fail_format("mpack assertion failed at " file ":" #line "\n%s\n" format, exprstr, __VA_ARGS__))
@@ -1712,7 +1712,7 @@ MPACK_EXTERN_C_BEGIN
                 (void)0))
 
     void mpack_break_hit(const char* message);
-    #if MPACK_STDIO
+    #if 0
         void mpack_break_hit_format(const char* format, ...);
         #define mpack_break_hit_at(line, file, ...) \
                 MPACK_EXPAND(mpack_break_hit_format("mpack breakpoint hit at " file ":" #line "\n" __VA_ARGS__))
@@ -1813,9 +1813,9 @@ MPACK_EXTERN_C_BEGIN
 
 /* Make sure our configuration makes sense */
 #ifndef MPACK_MALLOC
-    #if MPACK_STDIO
-        #error "MPACK_STDIO requires preprocessor definitions for MPACK_MALLOC and MPACK_FREE."
-    #endif
+    //#if MPACK_STDIO
+    //    #error "MPACK_STDIO requires preprocessor definitions for MPACK_MALLOC and MPACK_FREE."
+    //#endif
     #if MPACK_READ_TRACKING
         #error "MPACK_READ_TRACKING requires preprocessor definitions for MPACK_MALLOC and MPACK_FREE."
     #endif

meson.build

@@ -1,7 +1,5 @@
 project('param', 'c', subproject_dir:'lib', default_options: ['warning_level=2', 'werror=true'])
-#add_project_arguments(['-Wstrict-prototypes', '-Wmissing-prototypes', '-Wmissing-declarations', '-Wcast-align', '-Wpointer-arith', '-Wshadow'], language: 'c')
-# We currently dos not build with cast align due to mpack.c in dynamic mode, todo update this and fix warnings
-add_project_arguments(['-Wstrict-prototypes', '-Wmissing-prototypes', '-Wmissing-declarations', '-Wno-cast-align', '-Wpointer-arith', '-Wshadow'], language: 'c')
+add_project_arguments(['-Wstrict-prototypes', '-Wmissing-prototypes', '-Wmissing-declarations', '-Wcast-align', '-Wpointer-arith', '-Wshadow'], language: 'c')
 
 conf = configuration_data()
 conf.set('PARAM_HAVE_SYS_QUEUE', get_option('list_dynamic') or get_option('list_pool') > 0)

src/mpack/mpack.c

@@ -51,34 +51,12 @@ MPACK_SILENCE_WARNINGS_BEGIN
 
 #if MPACK_DEBUG
 
-#if MPACK_STDIO
-void mpack_assert_fail_format(const char* format, ...) {
-    char buffer[512];
-    va_list args;
-    va_start(args, format);
-    vsnprintf(buffer, sizeof(buffer), format, args);
-    va_end(args);
-    buffer[sizeof(buffer) - 1] = 0;
-    mpack_assert_fail_wrapper(buffer);
-}
-
-void mpack_break_hit_format(const char* format, ...) {
-    char buffer[512];
-    va_list args;
-    va_start(args, format);
-    vsnprintf(buffer, sizeof(buffer), format, args);
-    va_end(args);
-    buffer[sizeof(buffer) - 1] = 0;
-    mpack_break_hit(buffer);
-}
-#endif
-
 #if !MPACK_CUSTOM_ASSERT
 void mpack_assert_fail(const char* message) {
     MPACK_UNUSED(message);
 
     #if MPACK_STDIO
-    fprintf(stderr, "%s\n", message);
+    printf("%s\n", message);
     #endif
 }
 #endif
@@ -1254,7 +1232,7 @@ void mpack_writer_init_growable(mpack_writer_t* writer, char** target_data, size
 }
 #endif
 
-#if MPACK_STDIO
+#if MPACK_MALLOC
 static void mpack_file_writer_flush(mpack_writer_t* writer, const char* buffer, size_t count) {
     FILE* file = (FILE*)writer->context;
     size_t written = fwrite((const void*)buffer, 1, count, file);
@@ -2860,7 +2838,7 @@ void mpack_reader_set_skip(mpack_reader_t* reader, mpack_reader_skip_t skip) {
     reader->skip = skip;
 }
 
-#if MPACK_STDIO
+#if MPACK_MALLOC
 static size_t mpack_file_reader_fill(mpack_reader_t* reader, char* buffer, size_t count) {
     if (feof((FILE *)reader->context)) {
        mpack_reader_flag_error(reader, mpack_error_eof);