Changeset 151 in libcf for trunk/src/cf_stack.c

Timestamp:

10/31/13 10:17:24 (11 years ago)

Author:

cheese

Message:

#1 fix interface and add util module

File:

• trunk/src/cf_stack.c (modified) (7 diffs)

trunk/src/cf_stack.c

@@ -8 +8 @@
 #include "cf_stack.h"
 #include "cf_list.h"
+#include "cf_local.h"
 #include "cf_error.h"
 
 #include <stdio.h>
+
+static int
+CF_Stack_Local_Get (cf_ctx  ctx,
+                    void    ** element,
+                    CF_BOOL removeFlag)
+{
+    int             result = 0;
+    cf_ctx          list = (cf_ctx) ctx;
+    cf_traverser    trav = NULL;
+
+    result = CF_List_Front (list, &trav);
+    if (result < 0)
+        return result;
+
+    result = CF_List_Get (trav, element);
+    if (result < 0)
+        return result;
+
+    result = (removeFlag == CF_TRUE)
+           ? CF_List_Remove (ctx, &trav)
+           : CF_OK;
+
+    return result;
+}
 
 /**
@@ -20 +45 @@
  */
 int
-CF_Stack_CreateCtx (CF_Stack_Ctx * ctx)
+CF_Stack_Create (cf_ctx * ctx)
 {
-    return CF_List_CreateCtx ((CF_List_Ctx *) ctx);
+    return CF_List_Create ((cf_ctx *) ctx);
 }
 
@@ -33 +58 @@
  */
 int
-CF_Stack_DestroyCtx (CF_Stack_Ctx ctx)
+CF_Stack_Destroy (cf_ctx ctx)
 {
-    return CF_List_DestroyCtx (ctx);
+    return CF_List_Destroy (ctx);
 }
 
@@ -47 +72 @@
  */
 int
-CF_Stack_Push (CF_Stack_Ctx ctx,
+CF_Stack_Push (cf_ctx       ctx,
                const void   * element)
 {
-    int             result = 0;
-    CF_List_Ctx     list = (CF_List_Ctx) ctx;
-    CF_Traverser    traverser = NULL;
+    cf_ctx list = (cf_ctx) ctx;
 
-    result = CF_List_Front (list, &traverser);
-    if (result < 0)
-        return result;
-
-    return CF_List_Insert (list, traverser, CF_DIRECTION_BEFORE, element);
+    return CF_List_AddFront (list, element);
 }
 
@@ -70 +89 @@
  */
 int
-CF_Stack_Pop (CF_Stack_Ctx  ctx,
-              void          ** element)
+CF_Stack_Pop (cf_ctx    ctx,
+              void      ** element)
 {
-    int         result = 0;
-    CF_List_Ctx list = (CF_List_Ctx) ctx;
-    CF_Traverser    traverser = NULL;
-
-    result = CF_Stack_Top (ctx, element);
-    if (result < 0)
-        return result;
-
-    result = CF_List_Front (list, &traverser);
-    if (result < 0)
-        return result;
-
-    return CF_List_Remove (ctx, &traverser);
+    return CF_Stack_Local_Get (ctx, element, CF_TRUE);
 }
 
@@ -97 +104 @@
  */
 int
-CF_Stack_Top (CF_Stack_Ctx  ctx,
-              void          ** element)
+CF_Stack_Top (cf_ctx    ctx,
+              void      ** element)
 {
-    int             result = 0;
-    CF_List_Ctx     list = (CF_List_Ctx) ctx;
-    CF_Traverser    traverser = NULL;
-
-    result = CF_List_Front (list, &traverser);
-    if (result < 0)
-        return result;
-
-    return CF_List_GetElement (traverser, element);
+    return CF_Stack_Local_Get (ctx, element, CF_FALSE);
 }
 
@@ -119 +118 @@
  */
 int
-CF_Stack_GetSize (CF_Stack_Ctx ctx)
+CF_Stack_GetSize (cf_ctx ctx)
 {
-    return CF_List_GetSize ((CF_List_Ctx) ctx);
+    return CF_List_GetSize ((cf_ctx) ctx);
 }