3rd_party/libsrp6a: Remove unnecessary allocator code and just use malloc/free

2 files changed, 10 insertions, 64 deletions

diff --git a/3rd_party/libsrp6a-sha512/cstr.c b/3rd_party/libsrp6a-sha512/cstr.c
index 9856f46..58a5638 100644
--- a/3rd_party/libsrp6a-sha512/cstr.c
+++ b/3rd_party/libsrp6a-sha512/cstr.c
@@ -8,72 +8,31 @@
 #define MINSIZE         4               /* Absolute minimum - one word */
 
 static char cstr_empty_string[] = { '\0' };
-static cstr_allocator * default_alloc = NULL;
-
-/*
- * It is assumed, for efficiency, that it is okay to pass more arguments
- * to a function than are called for, as long as the required arguments
- * are in proper form.  If extra arguments to malloc() and free() cause
- * problems, define PEDANTIC_ARGS below.
- */
-#ifdef PEDANTIC_ARGS
-static void * Cmalloc(int n, void * heap) { return malloc(n); }
-static void Cfree(void * p, void * heap) { free(p); }
-static cstr_allocator malloc_allocator = { Cmalloc, Cfree, NULL };
-#else
-static cstr_allocator malloc_allocator = { malloc, free, NULL };
-#endif
-
-_TYPE( void )
-cstr_set_allocator(cstr_allocator * alloc)
-{
-  default_alloc = alloc;
-}
 
 _TYPE( cstr * )
-cstr_new_alloc(cstr_allocator * alloc)
+cstr_new()
 {
   cstr * str;
 
-  if(alloc == NULL) {
-    if(default_alloc == NULL) {
-      default_alloc = &malloc_allocator;
-    }
-    alloc = default_alloc;
-  }
-
-  str = (cstr *) (*alloc->alloc)(sizeof(cstr), alloc->heap);
+  str = (cstr *) malloc(sizeof(cstr));
   if(str) {
     str->data = cstr_empty_string;
     str->length = str->cap = 0;
     str->ref = 1;
-    str->allocator = alloc;
   }
   return str;
 }
 
 _TYPE( cstr * )
-cstr_new()
-{
-  return cstr_new_alloc(NULL);
-}
-
-_TYPE( cstr * )
-cstr_dup_alloc(const cstr * str, cstr_allocator * alloc)
+cstr_dup(const cstr * str)
 {
-  cstr * nstr = cstr_new_alloc(alloc);
+  cstr * nstr = cstr_new();
   if(nstr)
     cstr_setn(nstr, str->data, str->length);
   return nstr;
 }
 
 _TYPE( cstr * )
-cstr_dup(const cstr * str)
-{
-  return cstr_dup_alloc(str, NULL);
-}
-
-_TYPE( cstr * )
 cstr_create(const char * s)
 {
   return cstr_createn(s, strlen(s));
@@ -101,9 +60,9 @@ cstr_clear_free(cstr * str)
   if(--str->ref == 0) {
     if(str->cap > 0) {
       memset(str->data, 0, str->cap);
-      (*str->allocator->free)(str->data, str->allocator->heap);
+      free(str->data);
     }
-    (*str->allocator->free)(str, str->allocator->heap);
+    free(str);
   }
 }
 
@@ -112,8 +71,8 @@ cstr_free(cstr * str)
 {
   if(--str->ref == 0) {
     if(str->cap > 0)
-      (*str->allocator->free)(str->data, str->allocator->heap);
-    (*str->allocator->free)(str, str->allocator->heap);
+      free(str->data);
+    free(str);
   }
 }
 
@@ -121,7 +80,7 @@ _TYPE( void )
 cstr_empty(cstr * str)
 {
   if(str->cap > 0)
-    (*str->allocator->free)(str->data, str->allocator->heap);
+    free(str->data);
   str->data = cstr_empty_string;
   str->length = str->cap = 0;
 }
@@ -137,8 +96,7 @@ cstr_alloc(cstr * str, int len)
     if(len < MINSIZE)
       len = MINSIZE;
 
-    t = (char *) (*str->allocator->alloc)(len * sizeof(char),
-                                          str->allocator->heap);
+    t = (char *) malloc(len * sizeof(char));
     if(t) {
       if(str->data) {
         t[str->length] = 0;
diff --git a/3rd_party/libsrp6a-sha512/cstr.h b/3rd_party/libsrp6a-sha512/cstr.h
index 7cc019a..ae7d71a 100644
--- a/3rd_party/libsrp6a-sha512/cstr.h
+++ b/3rd_party/libsrp6a-sha512/cstr.h
@@ -51,27 +51,15 @@
 extern "C" {
 #endif /* __cplusplus */
 
-/* Arguments to allocator methods ordered this way for compatibility */
-typedef struct cstr_alloc_st {
-  void * (_CDECL * alloc)(size_t n, void * heap);
-  void (_CDECL * free)(void * p, void * heap);
-  void * heap;
-} cstr_allocator;
-
 typedef struct cstr_st {
   char * data;  /* Okay to access data and length fields directly */
   int length;
   int cap;
   int ref;      /* Simple reference counter */
-  cstr_allocator * allocator;
 } cstr;
 
-_TYPE( void ) cstr_set_allocator P((cstr_allocator * alloc));
-
 _TYPE( cstr * ) cstr_new P((void));
-_TYPE( cstr * ) cstr_new_alloc P((cstr_allocator * alloc));
 _TYPE( cstr * ) cstr_dup P((const cstr * str));
-_TYPE( cstr * ) cstr_dup_alloc P((const cstr * str, cstr_allocator * alloc));
 _TYPE( cstr * ) cstr_create P((const char * s));
 _TYPE( cstr * ) cstr_createn P((const char * s, int len));