Changeset 89 for trunk/lib

Timestamp:

03/09/07 10:00:09 (18 years ago)

Author:

tim

Message:

Added contract comments to void_stack header. Minor cleanups in void_stack implementation.

File:

• trunk/lib/void_stack.c (modified) (3 diffs)

trunk/lib/void_stack.c

@@ -105 +105 @@
 
 
-unsigned short void_stack_size(void_stack* stack)
+unsigned short void_stack_size(const void_stack* stack)
 {
   return stack->top;
+}
+
+
+void* void_stack_pop(void_stack* stack)
+{
+  void* ret_val = NULL;
+
+  if(stack->top > 0)
+  {
+    ret_val = stack->elements[--(stack->top)];
+    stack->elements[stack->top] = NULL;
+  }
+
+  return ret_val;
 }
 
@@ -123 +137 @@
 
 
-void* void_stack_pop(void_stack* stack)
+const void* void_stack_cur(const void_stack* stack)
 {
   void* ret_val = NULL;
 
   if(stack->top > 0)
-  {
-    ret_val = stack->elements[--(stack->top)];
-    stack->elements[stack->top] = NULL;
-  }
-  else
-    ret_val = NULL;
+    ret_val = stack->elements[stack->top-1];
 
   return ret_val;
@@ -139 +148 @@
 
 
-const void* void_stack_cur(void_stack* stack)
-{
-  void* ret_val = NULL;
-
-  if(stack->top > 0)
-    ret_val = stack->elements[stack->top-1];
-  else
-    ret_val = NULL;
-
-  return ret_val;
-}
-
-
-void_stack_iterator* void_stack_iterator_new(void_stack* stack)
+void_stack_iterator* void_stack_iterator_new(const void_stack* stack)
 {
   void_stack_iterator* ret_val = NULL;
   
-  ret_val = (void_stack_iterator*)malloc(sizeof(void_stack_iterator));
-  if (ret_val != NULL)
+  if(stack != NULL)
   {
-    ret_val->stack = stack;
-    ret_val->cur = 0;
+    ret_val = (void_stack_iterator*)malloc(sizeof(void_stack_iterator));
+    if (ret_val != NULL)
+    {
+      ret_val->stack = stack;
+      ret_val->cur = 0;
+    }
   }