Remove buflib allocation names, part two

Remove allocation names from the buflib API and fix up all callers.

Change-Id: I3df922e258d5f0d711d70e72b56b4ed634fb0f5a

2 files changed, 7 insertions, 23 deletions

diff --git a/firmware/include/buflib.h b/firmware/include/buflib.h
index d2231ab79d..e54ec72a99 100644
--- a/firmware/include/buflib.h
+++ b/firmware/include/buflib.h
@@ -62,8 +62,7 @@ struct buflib_context
  * to the actually requested number of bytes.
  *
  * The total number of bytes consumed by an allocation is
- * BUFLIB_ALLOC_OVERHEAD + requested bytes + strlen(<name passed to
- * buflib_alloc_ex()) + pad to pointer size
+ * BUFLIB_ALLOC_OVERHEAD + requested bytes + pad to pointer size
  */
 #define BUFLIB_ALLOC_OVERHEAD (5*sizeof(union buflib_data))
 
@@ -215,7 +214,6 @@ int buflib_alloc(struct buflib_context *context, size_t size);
  * Allocates memory from the buflib's memory pool with additional callbacks
  * and flags
  *
- * name: A string identifier giving this allocation a name
  * size: How many bytes to allocate
  * ops: a struct with pointers to callback functions (see above).
  *      if "ops" is NULL: Buffer is movable.
@@ -223,7 +221,7 @@ int buflib_alloc(struct buflib_context *context, size_t size);
  * Returns: A positive integer handle identifying this allocation, or
  * a negative value on error (0 is also not a valid handle)
  */
-int buflib_alloc_ex(struct buflib_context *ctx, size_t size, const char *name,
+int buflib_alloc_ex(struct buflib_context *ctx, size_t size,
                     struct buflib_callbacks *ops);
 
 
@@ -241,15 +239,14 @@ int buflib_alloc_ex(struct buflib_context *ctx, size_t size, const char *name,
  * and even shrinks other allocations. However, do not depend on this behavior,
  * it may change.
  *
- * name: A string identifier giving this allocation a name
  * size: The actual size will be returned into size
  * ops: a struct with pointers to callback functions
  *
  * Returns: A positive integer handle identifying this allocation, or
  * a negative value on error (0 is also not a valid handle)
  */
-int buflib_alloc_maximum(struct buflib_context* ctx, const char* name,
-                    size_t *size, struct buflib_callbacks *ops);
+int buflib_alloc_maximum(struct buflib_context* ctx,
+                         size_t *size, struct buflib_callbacks *ops);
 
 /**
  * Queries the data pointer for the given handle. It's actually a cheap
@@ -349,18 +346,6 @@ void buflib_buffer_in(struct buflib_context *ctx, int size);
 /* debugging */
 
 /**
- * Returns the name, as given to buflib_alloc() and buflib_allloc_ex(), of the
- * allocation associated with the given handle. As naming allocations
- * is optional, there might be no name associated.
- *
- * handle: The handle indicating the allocation
- *
- * Returns: A pointer to the string identifier of the allocation, or NULL
- * if none was specified with buflib_alloc_ex().
- */
-const char* buflib_get_name(struct buflib_context *ctx, int handle);
-
-/**
  * Gets the number of blocks in the entire buffer, allocated or unallocated
  *
  * Only available if BUFLIB_DEBUG_BLOCK_SIGNLE is defined
diff --git a/firmware/include/core_alloc.h b/firmware/include/core_alloc.h
index 13d8165be2..8011c227b1 100644
--- a/firmware/include/core_alloc.h
+++ b/firmware/include/core_alloc.h
@@ -11,9 +11,9 @@
  * they have a predefined context
  */
 void core_allocator_init(void) INIT_ATTR;
-int core_alloc(const char* name, size_t size);
-int core_alloc_ex(const char* name, size_t size, struct buflib_callbacks *ops);
-int core_alloc_maximum(const char* name, size_t *size, struct buflib_callbacks *ops);
+int core_alloc(size_t size);
+int core_alloc_ex(size_t size, struct buflib_callbacks *ops);
+int core_alloc_maximum(size_t *size, struct buflib_callbacks *ops);
 bool core_shrink(int handle, void* new_start, size_t new_size);
 void core_pin(int handle);
 void core_unpin(int handle);
@@ -21,7 +21,6 @@ unsigned core_pin_count(int handle);
 int core_free(int handle);
 size_t core_available(void);
 size_t core_allocatable(void);
-const char* core_get_name(int handle);
 #ifdef DEBUG
 void core_check_valid(void);
 #endif