Merge pull request #31 from kivikakk/latest

latest cbits

.gitignore

@@ -11,3 +11,4 @@ cabal.sandbox.config
 cabal.config
 stack.yaml.lock
 .stack-work/
+dist-newstyle

Makefile

@@ -33,9 +33,6 @@ cbits/cmark-gfm_export.h: $(CMARK_DIR)/build/src/cmark-gfm_export.h
 cbits/cmark-gfm_version.h: $(CMARK_DIR)/build/src/cmark-gfm_version.h
 	cp $< $@
 
-cbits/cmark-gfm-extensions_export.h: $(CMARK_DIR)/build/extensions/cmark-gfm-extensions_export.h
-	cp $< $@
-
 cbits/%: $(CMARK_DIR)/src/%
 	cp $< $@
 

cbits/arena.c

@@ -68,15 +68,16 @@ static void *arena_calloc(size_t nmem, size_t size) {
   const size_t align = sizeof(size_t) - 1;
   sz = (sz + align) & ~align;
 
+  struct arena_chunk *chunk;
   if (sz > A->sz) {
-    A->prev = alloc_arena_chunk(sz, A->prev);
-    return (uint8_t *) A->prev->ptr + sizeof(size_t);
+    A->prev = chunk = alloc_arena_chunk(sz, A->prev);
+  } else if (sz > A->sz - A->used) {
+    A = chunk = alloc_arena_chunk(A->sz + A->sz / 2, A);
+  } else {
+    chunk = A;
   }
-  if (sz > A->sz - A->used) {
-    A = alloc_arena_chunk(A->sz + A->sz / 2, A);
-  }
-  void *ptr = (uint8_t *) A->ptr + A->used;
-  A->used += sz;
+  void *ptr = (uint8_t *) chunk->ptr + chunk->used;
+  chunk->used += sz;
   *((size_t *) ptr) = sz - sizeof(size_t);
   return (uint8_t *) ptr + sizeof(size_t);
 }
@@ -98,6 +99,6 @@ static void arena_free(void *ptr) {
 
 cmark_mem CMARK_ARENA_MEM_ALLOCATOR = {arena_calloc, arena_realloc, arena_free};
 
-cmark_mem *cmark_get_arena_mem_allocator() {
+cmark_mem *cmark_get_arena_mem_allocator(void) {
   return &CMARK_ARENA_MEM_ALLOCATOR;
 }