Add C89 support

Author: jonasschnelli

configure.ac

@@ -10,19 +10,21 @@ AH_TOP([#ifndef LIBLOGDB_CONFIG_H])
 AH_TOP([#define LIBLOGDB_CONFIG_H])
 AH_BOTTOM([#endif /*LIBLOGDB_CONFIG_H*/])
 AM_INIT_AUTOMAKE([no-define subdir-objects foreign])
-AC_HEADER_STDBOOL
 LT_INIT
 
 PKG_PROG_PKG_CONFIG
 AC_PATH_TOOL(AR, ar)
 AC_PATH_TOOL(RANLIB, ranlib)
 AC_PATH_TOOL(STRIP, strip)
 AM_PROG_CC_C_O
-AC_PROG_CC_C99
+AC_PROG_CC_C89
+if test x"$ac_cv_prog_cc_c89" = x"no"; then
+AC_MSG_ERROR([c89 compiler support required])
+fi
 
 CFLAGS="$CFLAGS -W"
 
-warn_CFLAGS="-std=gnu99 -pedantic -Wno-unused-function -Wno-long-long -Wno-overlength-strings -Wno-pointer-arith"
+warn_CFLAGS="-pedantic -Wall -Wextra -Wno-unused-function -Wno-long-long -Wno-overlength-strings -Wno-pointer-arith"
 saved_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS $warn_CFLAGS"
 AC_MSG_CHECKING([if ${CC} supports ${warn_CFLAGS}])

include/logdb/buffer.h

@@ -56,4 +56,4 @@ LIBLOGDB_API struct buffer* buffer_copy(const void* data, size_t data_len);
 }
 #endif
 
-#endif //__LIBLOGDB_BUFFER_H__
+#endif /* __LIBLOGDB_BUFFER_H__ */

include/logdb/cstr.h

@@ -56,13 +56,10 @@ LIBLOGDB_API int cstr_erase(cstring* s, size_t pos, ssize_t len);
 LIBLOGDB_API int cstr_append_buf(cstring* s, const void* buf, size_t sz);
 LIBLOGDB_API int cstr_append_cstr(cstring* s, cstring *append);
 
-LIBLOGDB_API static inline int cstr_append_c(cstring* s, char ch)
-{
-    return cstr_append_buf(s, &ch, 1);
-}
+    LIBLOGDB_API int cstr_append_c(cstring* s, char ch);
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif //__LIBLOGDB_CSTR_H__
+#endif /* __LIBLOGDB_CSTR_H__ */

include/logdb/logdb.h

@@ -30,7 +30,7 @@
 #ifndef __LIBLOGDB_H__
 #define __LIBLOGDB_H__
 
-typedef uint8_t logdb_bool; //!serialize, c/c++ save bool
+typedef uint8_t logdb_bool; /*!serialize, c/c++ save bool*/
 
 #ifndef true
 #define true 1
@@ -40,6 +40,10 @@ typedef uint8_t logdb_bool; //!serialize, c/c++ save bool
 #define false 0
 #endif
 
+#ifndef NULL
+#define NULL 0
+#endif 
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -62,4 +66,4 @@ extern "C" {
 }
 #endif
 
-#endif //__LIBLOGDB_H__
+#endif /* __LIBLOGDB_H__ */

include/logdb/logdb_file.h

@@ -68,24 +68,24 @@ enum logdb_logdb_error {
     LOGDB_ERROR_WRONG_FILE_FORMAT = 300,
     LOGDB_ERROR_DATASTREAM_ERROR = 400,
     LOGDB_ERROR_CHECKSUM = 500,
-    LOGDB_ERROR_FILE_ALREADY_OPEN = 600,
+    LOGDB_ERROR_FILE_ALREADY_OPEN = 600
 };
 
 /** logdb handle */
 typedef struct logdb_log_db {
     FILE *file;
-    void (*mem_map_cb)(void*, logdb_logdb_record *); //callback for memory mapping
-    void *cb_ctx; //callback context
-    logdb_logdb_record *memdb_head; //optional non-schematic memory database
+    void (*mem_map_cb)(void*, logdb_logdb_record *); /* callback for memory mapping */
+    void *cb_ctx; /* callback context */
+    logdb_logdb_record *memdb_head; /* optional non-schematic memory database */
     logdb_logdb_record *cache_head;
     SHA256_CTX hashctx;
     uint8_t hashlen;
     uint32_t version;
     uint32_t support_flags;
 } logdb_log_db;
 
-/////////// DB HANDLING
-//////////////////////////////////
+/* DB HANDLING
+////////////////////////////////// */
 /** creates new logdb handle, sets default values */
 LIBLOGDB_API logdb_log_db* logdb_logdb_new();
 
@@ -130,4 +130,4 @@ logdb_bool logdb_logdb_remove_existing_records(logdb_logdb_record *usehead, cstr
 }
 #endif
 
-#endif //__LIBLOGDB_LOGDB_H__
+#endif /* __LIBLOGDB_LOGDB_H__ */

include/logdb/logdb_memdb.h

@@ -60,4 +60,4 @@ LIBLOGDB_API size_t logdb_memdb_size(logdb_log_db* db);
 }
 #endif
 
-#endif //__LIBLOGDB_LOGDB_MEMDB_H__
+#endif /* __LIBLOGDB_LOGDB_MEMDB_H__ */

include/logdb/logdb_rec.h

@@ -49,14 +49,13 @@ enum logdb_logdb_record_type {
 typedef struct logdb_logdb_record {
     cstring* key;
     cstring* value;
-    struct logdb_logdb_record* next; //linked list -> next node (NULL if end)
-    struct logdb_logdb_record* prev; //linked list -> prev node (NULL if end)
-    int written; //! 0 = not written to databse, 1 = written
-    uint8_t mode; // record mode, 0 = WRITE, 1 = ERASE
+    struct logdb_logdb_record* next; /* linked list -> next node (NULL if end) */
+    struct logdb_logdb_record* prev; /* linked list -> prev node (NULL if end) */
+    int written; /* 0 = not written to databse, 1 = written */
+    uint8_t mode; /* record mode, 0 = WRITE, 1 = ERASE */
 } logdb_logdb_record;
 
-/////////// RECORD HANDLING
-//////////////////////////////////
+/* RECORD HANDLING  */
 /** creates new logdb key/value record */
 LIBLOGDB_API logdb_logdb_record* logdb_logdb_record_new();
 
@@ -85,4 +84,4 @@ LIBLOGDB_API logdb_logdb_record* logdb_logdb_record_rm_desc(logdb_logdb_record *
 }
 #endif
 
-#endif //__LIBLOGDB_LOGDB_REC_H__
+#endif /* __LIBLOGDB_LOGDB_REC_H__ */

include/logdb/portable_endian.h

@@ -1,9 +1,9 @@
-// "License": Public Domain
+/* "License": Public Domain
 // I, Mathias Panzenböck, place this file hereby into the public domain. Use it at your own risk for whatever you like.
 // In case there are jurisdictions that don't support putting things in the public domain you can also consider it to
 // be "dual licensed" under the BSD, MIT and Apache licenses, if you want to. This code is trivial anyway. Consider it
 // an example on how to get the endian conversion functions on different platforms.
-
+*/
 #ifndef PORTABLE_ENDIAN_H__
 #define PORTABLE_ENDIAN_H__
 

include/logdb/serialize.h

@@ -45,48 +45,29 @@ LIBLOGDB_API void ser_u16(cstring* s, uint16_t v_);
 LIBLOGDB_API void ser_u32(cstring* s, uint32_t v_);
 LIBLOGDB_API void ser_i32(cstring* s, int32_t v_);
 LIBLOGDB_API void ser_u64(cstring* s, uint64_t v_);
-static inline void ser_u256(cstring* s, const unsigned char* v_)
-{
-    ser_bytes(s, v_, 32);
-}
-
+LIBLOGDB_API void ser_u256(cstring* s, const unsigned char* v_);
 LIBLOGDB_API void ser_varlen(cstring* s, uint32_t vlen);
 LIBLOGDB_API void ser_str(cstring* s, const char* s_in, size_t maxlen);
 LIBLOGDB_API void ser_varstr(cstring* s, cstring* s_in);
 
-static inline void ser_s32(cstring* s, int32_t v_)
-{
-    ser_u32(s, (uint32_t)v_);
-}
+LIBLOGDB_API void ser_s32(cstring* s, int32_t v_);
 
-static inline void ser_s64(cstring* s, int64_t v_)
-{
-    ser_u64(s, (uint64_t)v_);
-}
+LIBLOGDB_API void ser_s64(cstring* s, int64_t v_);
 
 LIBLOGDB_API int deser_skip(struct const_buffer* buf, size_t len);
 LIBLOGDB_API int deser_bytes(void* po, struct const_buffer* buf, size_t len);
 LIBLOGDB_API int deser_u16(uint16_t* vo, struct const_buffer* buf);
 LIBLOGDB_API int deser_u32(uint32_t* vo, struct const_buffer* buf);
-LIBLOGDB_API int deser_u64(uint64_t* vo, struct const_buffer* buf);
-
 LIBLOGDB_API int deser_i32(int32_t* vo, struct const_buffer* buf);
-
-
-static inline int deser_u256(uint8_t* vo, struct const_buffer* buf)
-{
-    return deser_bytes(vo, buf, 32);
-}
+LIBLOGDB_API int deser_u64(uint64_t* vo, struct const_buffer* buf);
+LIBLOGDB_API int deser_u256(uint8_t* vo, struct const_buffer* buf);
 
 LIBLOGDB_API int deser_varlen(uint32_t* lo, struct const_buffer* buf);
 LIBLOGDB_API int deser_varlen_file(uint32_t* lo, FILE *file, uint8_t *rawdata, size_t *buflen_inout);
 LIBLOGDB_API int deser_str(char* so, struct const_buffer* buf, size_t maxlen);
 LIBLOGDB_API int deser_varstr(cstring** so, struct const_buffer* buf);
 
-static inline int deser_s64(int64_t* vo, struct const_buffer* buf)
-{
-    return deser_u64((uint64_t*)vo, buf);
-}
+LIBLOGDB_API int deser_s64(int64_t* vo, struct const_buffer* buf);
 
 #ifdef __cplusplus
 }

include/logdb/sha2.h

@@ -76,4 +76,4 @@ LIBLOGDB_API void hmac_sha512(const uint8_t* key, const uint32_t keylen, const u
 }
 #endif
 
-#endif //__LOGDB_SHA2_H__
+#endif /* __LOGDB_SHA2_H__ */

include/logdb/utils.h

@@ -32,6 +32,8 @@
 #include <stdint.h>
 #include <stddef.h>
 
+#include <logdb/logdb.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -41,16 +43,17 @@ extern "C" {
 
 #define strlens(s) (s == NULL ? 0 : strlen(s))
 
+LIBLOGDB_API void utils_clear_buffers(void);
+LIBLOGDB_API void utils_hex_to_bin(const char* str, unsigned char* out, int inLen, int* outLen);
+LIBLOGDB_API void utils_bin_to_hex(unsigned char* bin_in, size_t inlen, char* hex_out);
+LIBLOGDB_API uint8_t* utils_hex_to_uint8(const char* str);
+LIBLOGDB_API char* utils_uint8_to_hex(const uint8_t* bin, size_t l);
+LIBLOGDB_API void utils_reverse_hex(char* h, int len);
 
-void utils_clear_buffers(void);
-void utils_hex_to_bin(const char* str, unsigned char* out, int inLen, int* outLen);
-void utils_bin_to_hex(unsigned char* bin_in, size_t inlen, char* hex_out);
-uint8_t* utils_hex_to_uint8(const char* str);
-char* utils_uint8_to_hex(const uint8_t* bin, size_t l);
-void utils_reverse_hex(char* h, int len);
+LIBLOGDB_API void * safe_malloc(size_t size);
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif //LIBBTC_UTILS_H__
+#endif /* LIBBTC_UTILS_H__*/

src/cstr.c

@@ -9,17 +9,20 @@
 
 static int cstr_alloc_min_sz(cstring* s, size_t sz)
 {
-    sz++; // NUL overhead
+    unsigned int shift;
+    unsigned int al_sz;
+    char* new_s;
+
+    sz++; /* NULL overhead */
 
     if (s->alloc && (s->alloc >= sz))
         return 1;
 
-    unsigned int shift = 3;
-    unsigned int al_sz;
+    shift = 3;
     while ((al_sz = (1 << shift)) < sz)
         shift++;
 
-    char* new_s = realloc(s->str, al_sz);
+    new_s = realloc(s->str, al_sz);
     if (!new_s)
         return 0;
 
@@ -59,10 +62,12 @@ cstring* cstr_new_buf(const void* buf, size_t sz)
 
 cstring* cstr_new(const char* init_str)
 {
+    size_t slen;
+
     if (!init_str || !*init_str)
         return cstr_new_sz(0);
 
-    size_t slen = strlen(init_str);
+    slen = strlen(init_str);
     return cstr_new_buf(init_str, slen);
 }
 
@@ -80,22 +85,22 @@ void cstr_free(cstring* s, int free_buf)
 
 int cstr_resize(cstring* s, size_t new_sz)
 {
-    // no change
+    /* no change */
     if (new_sz == s->len)
         return 1;
 
-    // truncate string
+    /* truncate string */
     if (new_sz <= s->len) {
         s->len = new_sz;
         s->str[s->len] = 0;
         return 1;
     }
 
-    // increase string size
+    /* increase string size */
     if (!cstr_alloc_min_sz(s, new_sz))
         return 0;
 
-    // contents of string tail undefined
+    /* contents of string tail undefined */
 
     s->len = new_sz;
     s->str[s->len] = 0;
@@ -120,6 +125,13 @@ int cstr_append_cstr(cstring* s, cstring *append)
     return cstr_append_buf(s, append->str, append->len);
 }
 
+
+int cstr_append_c(cstring* s, char ch)
+{
+    return cstr_append_buf(s, &ch, 1);
+}
+
+
 int cstr_equal(const cstring* a, const cstring* b)
 {
     if (a == b)
@@ -133,12 +145,14 @@ int cstr_equal(const cstring* a, const cstring* b)
 
 int cstr_erase(cstring* s, size_t pos, ssize_t len)
 {
+    ssize_t old_tail;
+
     if (pos == s->len && len == 0)
         return 1;
     if (pos >= s->len)
         return 0;
 
-    ssize_t old_tail = s->len - pos;
+    old_tail = s->len - pos;
     if ((len >= 0) && (len > old_tail))
         return 0;