1 files changed, 11 insertions, 23 deletions

diff --git a/src/stack.h b/src/stack.h
index c2335b3a..4c53b4ae 100644
--- a/src/stack.h
+++ b/src/stack.h
@@ -20,8 +20,8 @@
 #include <assert.h>
 #include <stdbool.h>
 #include <stddef.h>
-#include <stdint.h>
 #include <stdlib.h>
+#include <string.h>
 
 /** An offset to start the stack at. Note 0 is reserved for NULL. */
 #define SERD_STACK_BOTTOM sizeof(void*)
@@ -81,40 +81,28 @@ serd_stack_pop(SerdStack* stack, size_t n_bytes)
   stack->size -= n_bytes;
 }
 
+static inline void
+serd_stack_pop_to(SerdStack* stack, size_t n_bytes)
+{
+  assert(stack->size >= n_bytes);
+  stack->size = n_bytes;
+}
+
 static inline void*
 serd_stack_push_aligned(SerdStack* stack, size_t n_bytes, size_t align)
 {
-  // Push one byte to ensure space for a pad count
-  if (!serd_stack_push(stack, 1)) {
-    return NULL;
-  }
-
   // Push padding if necessary
   const size_t pad = align - stack->size % align;
   if (pad > 0) {
-    if (!serd_stack_push(stack, pad)) {
+    void* padding = serd_stack_push(stack, pad);
+    if (!padding) {
       return NULL;
     }
+    memset(padding, 0, pad);
   }
 
-  // Set top of stack to pad count so we can properly pop later
-  stack->buf[stack->size - 1] = (char)pad;
-
   // Push requested space at aligned location
   return serd_stack_push(stack, n_bytes);
 }
 
-static inline void
-serd_stack_pop_aligned(SerdStack* stack, size_t n_bytes)
-{
-  // Pop requested space down to aligned location
-  serd_stack_pop(stack, n_bytes);
-
-  // Get amount of padding from top of stack
-  const uint8_t pad = (uint8_t)stack->buf[stack->size - 1];
-
-  // Pop padding and pad count
-  serd_stack_pop(stack, pad + 1u);
-}
-
 #endif // SERD_STACK_H