X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?p=ossec-hids.git;a=blobdiff_plain;f=src%2Fshared%2Fstore_op.c;h=b051abbe27fa671f9eea6133d89ca4afe252479b;hp=c3feacc6d93694929df9a665b6b1f823c99ffd0f;hb=3f728675941dc69d4e544d3a880a56240a6e394a;hpb=927951d1c1ad45ba9e7325f07d996154a91c911b

diff --git a/src/shared/store_op.c b/src/shared/store_op.c
index c3feacc..b051abb 100644
--- a/src/shared/store_op.c
+++ b/src/shared/store_op.c
@@ -1,6 +1,3 @@
-/* @(#) $Id: ./src/shared/store_op.c, 2011/09/08 dcid Exp $
- */
-
 /* Copyright (C) 2009 Trend Micro Inc.
  * All right reserved.
  *
@@ -10,24 +7,24 @@
  * Foundation
  */
 
-/* Common API for dealing with ordered lists.
- * Provides a fast search on average (n/2).
+/* Common API for dealing with ordered lists
+ * Provides a fast search on average (n/2)
  */
 
-
 #include "shared.h"
 
 
 /* Create the list storage
- * Return NULL on error
+ * Returns NULL on error
  */
 OSStore *OSStore_Create()
 {
     OSStore *my_list;
 
-    my_list = calloc(1, sizeof(OSStore));
-    if(!my_list)
-        return(NULL);
+    my_list = (OSStore *) calloc(1, sizeof(OSStore));
+    if (!my_list) {
+        return (NULL);
+    }
 
     my_list->first_node = NULL;
     my_list->last_node = NULL;
@@ -36,33 +33,28 @@ OSStore *OSStore_Create()
     my_list->max_size = 0;
     my_list->free_data_function = NULL;
 
-    return(my_list);
+    return (my_list);
 }
 
-
-
-/* Deletes the list storage
- * Return NULL on error
+/* Delete the list storage
+ * Returns NULL on error
  */
 OSStore *OSStore_Free(OSStore *list)
 {
     OSStoreNode *delnode;
     list->cur_node = list->first_node;
 
-    while(list->cur_node)
-    {
-        if(list->cur_node->key)
-        {
+    while (list->cur_node) {
+        if (list->cur_node->key) {
             free(list->cur_node->key);
             list->cur_node->key = NULL;
         }
-        if(list->cur_node->data)
-        {
+        if (list->cur_node->data) {
             free(list->cur_node->data);
             list->cur_node->data = NULL;
         }
 
-        /* Deleting each node. */
+        /* Delete each node */
         delnode = list->cur_node;
         list->cur_node = list->cur_node->next;
         free(delnode);
@@ -74,123 +66,107 @@ OSStore *OSStore_Free(OSStore *list)
     free(list);
     list = NULL;
 
-    return(list);
+    return (list);
 }
 
-
-
-/* Set the maximum number of elements
- * in the storage. Returns 0 on error or
- * 1 on success.
+/* Set the maximum number of elements in the storage
+ * Returns 0 on error or 1 on success
  */
 int OSStore_SetMaxSize(OSStore *list, int max_size)
 {
-    if(!list)
-    {
-        return(0);
+    if (!list) {
+        return (0);
     }
 
     /* Minimum size is 1 */
-    if(max_size <= 1)
-    {
-        return(0);
+    if (max_size <= 1) {
+        return (0);
     }
 
     list->max_size = max_size;
 
-    return(1);
+    return (1);
 }
 
-
-
-/* Set the pointer to the function to free the memory
- * data.
- */
-int OSStore_SetFreeDataPointer(OSStore *list, void *free_data_function)
+/* Set the pointer to the function to free the memory data */
+int OSStore_SetFreeDataPointer(OSStore *list, void (free_data_function)(void *))
 {
-    if(!list)
-    {
-        return(0);
+    if (!list) {
+        return (0);
     }
 
     list->free_data_function = free_data_function;
-    return(1);
+    return (1);
 }
 
-
-
-/* Sorts the storage by size.
- *
- */
-int OSStore_Sort(OSStore *list, void*(sort_data_function)(void *d1, void *d2))
+/* Sort the storage by size */
+int OSStore_Sort(OSStore *list, void *(sort_data_function)(void *d1, void *d2))
 {
     OSStoreNode *newnode = NULL;
     OSStoreNode *movenode = NULL;
     list->cur_node = list->first_node;
 
-    while(list->cur_node)
-    {
+    while (list->cur_node) {
         movenode = list->cur_node->prev;
 
-        /* Here we check for all the previous entries, using the sort . */
-        while(movenode)
-        {
+        /* Check for all the previous entries, using sort */
+        while (movenode) {
 
-            if(sort_data_function(list->cur_node->data, movenode->data))
-            {
+            if (sort_data_function(list->cur_node->data, movenode->data)) {
                 movenode = movenode->prev;
             }
 
-            /* In here, this node should stay where it is. */
-            else if(movenode == list->cur_node->prev)
-            {
+            /* This node should stay where it is */
+            else if (movenode == list->cur_node->prev) {
                 break;
             }
 
-            /* In here we need to replace the nodes. */
-            else
-            {
+            /* Replace the nodes */
+            else {
                 newnode = list->cur_node;
 
-                if(list->cur_node->prev)
+                if (list->cur_node->prev) {
                     list->cur_node->prev->next = list->cur_node->next;
+                }
 
-                if(list->cur_node->next)
+                if (list->cur_node->next) {
                     list->cur_node->next->prev = list->cur_node->prev;
-                else
+                } else {
                     list->last_node = list->cur_node->prev;
+                }
 
                 list->cur_node = list->cur_node->prev;
 
-
                 newnode->next = movenode->next;
                 newnode->prev = movenode;
 
-                if(movenode->next)
+                if (movenode->next) {
                     movenode->next->prev = newnode;
+                }
 
                 movenode->next = newnode;
 
-
                 break;
             }
         }
 
-
-        /* If movenode is not set, we need to put the current node in first.*/
-        if(!movenode && (list->cur_node != list->first_node))
-        {
+        /* If movenode is not set, put the current node in first */
+        if (!movenode && (list->cur_node != list->first_node)) {
             newnode = list->cur_node;
 
-            if(list->cur_node->prev)
+            if (list->cur_node->prev) {
                 list->cur_node->prev->next = list->cur_node->next;
+            }
 
-            if(list->cur_node->next)
+            if (list->cur_node->next) {
                 list->cur_node->next->prev = list->cur_node->prev;
-            else
+            } else {
                 list->last_node = list->cur_node->prev;
+            }
 
-            list->cur_node = list->cur_node->prev;
+            if ((list->cur_node = list->cur_node->prev) == NULL) {
+                return (1);
+            }
 
             newnode->prev = NULL;
             newnode->next = list->first_node;
@@ -202,220 +178,185 @@ int OSStore_Sort(OSStore *list, void*(sort_data_function)(void *d1, void *d2))
         list->cur_node = list->cur_node->next;
     }
 
-    return(1);
+    return (1);
 }
 
-
-
 /* Get key position from storage
- * Returns 0 if not present or the key
- * if available.
+ * Returns 0 if not present or the key if available
  * (position may change after each PUT)
  */
-int OSStore_GetPosition(OSStore *list, char *key)
+int OSStore_GetPosition(OSStore *list, const char *key)
 {
     int chk_rc, pos = 1;
     list->cur_node = list->first_node;
 
-    while(list->cur_node)
-    {
-        if((chk_rc = strcmp(list->cur_node->key, key)) >= 0)
-        {
+    while (list->cur_node) {
+        if ((chk_rc = strcmp(list->cur_node->key, key)) >= 0) {
             /* Found */
-            if(chk_rc == 0)
-                return(pos);
+            if (chk_rc == 0) {
+                return (pos);
+            }
 
             /* Not found */
-            return(0);
+            return (0);
         }
 
         list->cur_node = list->cur_node->next;
         pos++;
     }
-    return(0);
+    return (0);
 }
 
-
-
-/* Get first node from storage.
- * Returns NULL if not present.
+/* Get first node from storage
+ * Returns NULL if not present
  */
 OSStoreNode *OSStore_GetFirstNode(OSStore *list)
 {
-    return(list->first_node);
+    return (list->first_node);
 }
 
-
-
-/* Get data from storage.
- * Returns NULL if not present.
+/* Get data from storage
+ * Returns NULL if not present
  */
-void *OSStore_Get(OSStore *list, char *key)
+void *OSStore_Get(OSStore *list, const char *key)
 {
     int chk_rc;
     list->cur_node = list->first_node;
 
-    while(list->cur_node)
-    {
-        if((chk_rc = strcmp(list->cur_node->key, key)) >= 0)
-        {
+    while (list->cur_node) {
+        if ((chk_rc = strcmp(list->cur_node->key, key)) >= 0) {
             /* Found */
-            if(chk_rc == 0)
-                return(list->cur_node->data);
+            if (chk_rc == 0) {
+                return (list->cur_node->data);
+            }
 
             /* Not found */
-            return(NULL);
+            return (NULL);
         }
 
         list->cur_node = list->cur_node->next;
     }
-    return(NULL);
+    return (NULL);
 }
 
-
-
-/* Check if key is present on storage.
- * Returns 0 if not present.
+/* Check if key is present on storage
+ * Returns 0 if not present
  */
-int OSStore_Check(OSStore *list, char *key)
+int OSStore_Check(OSStore *list, const char *key)
 {
     int chk_rc;
     list->cur_node = list->first_node;
 
-    while(list->cur_node)
-    {
-        if((chk_rc = strcmp(list->cur_node->key, key)) >= 0)
-        {
+    while (list->cur_node) {
+        if ((chk_rc = strcmp(list->cur_node->key, key)) >= 0) {
             /* Found */
-            if(chk_rc == 0)
-                return(1);
+            if (chk_rc == 0) {
+                return (1);
+            }
 
             /* Not found */
-            return(0);
+            return (0);
         }
 
         list->cur_node = list->cur_node->next;
     }
-    return(0);
+    return (0);
 }
 
-
-
-/* Check if key is present on storage (using strncmp).
- * Returns 0 if not present.
+/* Check if key is present on storage (using strncmp)
+ * Returns 0 if not present
  */
-int OSStore_NCheck(OSStore *list, char *key)
+int OSStore_NCheck(OSStore *list, const char *key)
 {
     int chk_rc;
     list->cur_node = list->first_node;
 
-    while(list->cur_node)
-    {
-        if((chk_rc = strncmp(list->cur_node->key, key,
-                             list->cur_node->key_size)) >= 0)
-        {
+    while (list->cur_node) {
+        if ((chk_rc = strncmp(list->cur_node->key, key,
+                              list->cur_node->key_size)) >= 0) {
             /* Found */
-            if(chk_rc == 0)
-                return(1);
+            if (chk_rc == 0) {
+                return (1);
+            }
 
             /* Not found */
-            return(0);
+            return (0);
         }
 
         list->cur_node = list->cur_node->next;
     }
-    return(0);
+    return (0);
 }
 
-
-
-/* Check if key is present on storage (case insensitive).
- * Returns 0 if not present.
+/* Check if key is present on storage (case insensitive)
+ * Returns 0 if not present
  */
-int OSStore_NCaseCheck(OSStore *list, char *key)
+int OSStore_NCaseCheck(OSStore *list, const char *key)
 {
     int chk_rc;
     list->cur_node = list->first_node;
 
-    while(list->cur_node)
-    {
-        if((chk_rc = strncasecmp(list->cur_node->key, key,
-                                 list->cur_node->key_size)) == 0)
-        {
-            return(1);
+    while (list->cur_node) {
+        if ((chk_rc = strncasecmp(list->cur_node->key, key,
+                                  list->cur_node->key_size)) == 0) {
+            return (1);
         }
 
         list->cur_node = list->cur_node->next;
     }
-    return(0);
-}
-
-
-
-/* Delete this node from list
- * Pointer goes to the next node available.
- */
-void OSStore_Delete(OSStore *list, char *key)
-{
-    return;
+    return (0);
 }
 
-
-
 /* Add data to the list
  * Returns 1 on success and 0 on failure
  */
-int OSStore_Put(OSStore *list, char *key, void *data)
+int OSStore_Put(OSStore *list, const char *key, void *data)
 {
     int chk_rc;
     OSStoreNode *newnode;
 
-
-    /* Allocating memory for new node */
-    newnode = calloc(1, sizeof(OSStoreNode));
-    if(!newnode)
-    {
-        merror(MEM_ERROR, __local_name);
-        return(0);
+    /* Allocate memory for new node */
+    newnode = (OSStoreNode *) calloc(1, sizeof(OSStoreNode));
+    if (!newnode) {
+        merror(MEM_ERROR, __local_name, errno, strerror(errno));
+        return (0);
     }
 
     newnode->prev = NULL;
     newnode->next = NULL;
     newnode->data = data;
-    newnode->key = key;
+    newnode->key = strdup(key);
+    if (!newnode->key) {
+        free(newnode);
+        merror(MEM_ERROR, __local_name, errno, strerror(errno));
+        return (0);
+    }
     newnode->key_size = strlen(key);
 
-
     /* If we don't have first node, assign it */
-    if(!list->first_node)
-    {
+    if (!list->first_node) {
         list->first_node = newnode;
         list->last_node = newnode;
     }
 
-
     /* Store the data in order */
-    else
-    {
+    else {
         list->cur_node = list->first_node;
-        while(list->cur_node)
-        {
-            if((chk_rc = strcmp(list->cur_node->key, key)) >= 0)
-            {
-                /* Duplicated entry */
-                if(chk_rc == 0)
-                {
-                    return(1);
+        while (list->cur_node) {
+            if ((chk_rc = strcmp(list->cur_node->key, key)) >= 0) {
+                /* Duplicate entry */
+                if (chk_rc == 0) {
+                    free(newnode->key);
+                    free(newnode);
+                    return (1);
                 }
 
-                /* If there is no prev node, it is because
-                 * this is the first node.
-                 */
-                if(list->cur_node->prev)
+                /* If there is no prev node, this is the first node */
+                if (list->cur_node->prev) {
                     list->cur_node->prev->next = newnode;
-                else
+                } else {
                     list->first_node = newnode;
-
+                }
 
                 newnode->prev = list->cur_node->prev;
 
@@ -428,19 +369,15 @@ int OSStore_Put(OSStore *list, char *key, void *data)
         }
 
         /* New node is the higher key */
-        if(!newnode->next)
-        {
+        if (!newnode->next) {
             list->last_node->next = newnode;
             newnode->prev = list->last_node;
             list->last_node = newnode;
         }
     }
 
-
     /* Increment list size */
     list->currently_size++;
 
-    return(1);
+    return (1);
 }
-
-/* EOF */