1 files changed, 30 insertions, 49 deletions

diff --git a/src/base/storage.c b/src/base/storage.c
index 0d48711..be27321 100644
--- a/src/base/storage.c
+++ b/src/base/storage.c
@@ -1,3 +1,4 @@
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -22,15 +23,13 @@ static storage_item_t* newStorageItem(char *group, char *name, void *data)
 {
 	storage_item_t *new;
 
-	assert( name != NULL );
-	assert( group != NULL );
-	assert( data != NULL );
-
-	new = malloc( sizeof(storage_item_t) );
+	assert(name != NULL);
+	assert(group != NULL);
+	assert(data != NULL);
+	new = malloc(sizeof(storage_item_t));
 	new->name = strdup(name);
 	new->group = strdup(group);
 	new->data = data;
-
 	return new;
 }
 
@@ -38,11 +37,9 @@ static void destroyStorageItem(storage_item_t *p, void *f)
 {
 	void(*fce)(void *);
 
-	assert( p != NULL );
-	assert( f != NULL );
-
+	assert(p != NULL);
+	assert(f != NULL);
 	fce = f;
-
 	fce(p->data);
 	free(p->name);
 	free(p->group);
@@ -51,10 +48,9 @@ static void destroyStorageItem(storage_item_t *p, void *f)
 
 void addItemToStorage(list_t *list, char *group, char *name, void *data)
 {
-	assert( list != NULL );
-	assert( group != NULL );
-	assert( name != NULL );
-
+	assert(list != NULL);
+	assert(group != NULL);
+	assert(name != NULL);
 	addList(list, newStorageItem(group, name, data) );
 }
 
@@ -63,21 +59,17 @@ void* getItemFromStorage(list_t *list, char *group, char *name)
 	storage_item_t *this;
 	int i;
 
-	assert( list != NULL );
-	assert( group != NULL );
-	assert( name != NULL );
-	
-	for(i = 0 ; i < list->count; i++)
-	{
+	assert(list != NULL);
+	assert(group != NULL);
+	assert(name != NULL);
+	for (i = 0; i < list->count; i++) {
 		this = (storage_item_t *) list->list[i];
-	
-		if( strcmp(group, this->group) == 0 && strcmp(name, this->name) == 0 )
-		{
+		if (strcmp(group, this->group) == 0 && strcmp(name, this->name) == 0)
 			return this->data;
-		}
 	}
-
-	printf("%s %s not found in storage !!!\n", group, name);
+#ifdef DEBUG
+	printf("%s %s was not found in storage!\n", group, name);
+#endif
 	return NULL;
 }
 
@@ -86,22 +78,17 @@ void delItemFromStorage(list_t *list, char *group, char *name, void *f)
 	storage_item_t *this;
 	int i;
 
-	assert( list != NULL );
-	assert( group != NULL );
-	assert( name != NULL );
-
-	for(i = 0 ; i < list->count; i++)
-	{
+	assert(list != NULL);
+	assert(group != NULL);
+	assert(name != NULL);
+	for (i = 0; i < list->count; i++) {
 		this = (storage_item_t *) list->list[i];
-	
-		if( strcmp(group, this->group) == 0 && strcmp(name, this->name) == 0 )
-		{
+		if (strcmp(group, this->group) == 0 && strcmp(name, this->name) == 0) {
 			destroyStorageItem(this, f);
 			delList(list, i);
 			return;
 		}
 	}
-
 	return;
 }
 
@@ -110,15 +97,12 @@ void delAllItemFromStorage(list_t *list, char *group, void *f)
 	storage_item_t *this;
 	int i;
 
-	assert( list != NULL );
-	assert( group != NULL );
+	assert(list != NULL);
+	assert(group != NULL);
 
-	for(i = 0 ; i < list->count; i++)
-	{
+	for (i = 0; i < list->count; i++) {
 		this = (storage_item_t *) list->list[i];
-
-		if( strcmp(group, this->group) == 0 )
-		{
+		if (strcmp(group, this->group) == 0) {
 			destroyStorageItem(this, f);
 			delList(list, i);
 			i--;
@@ -131,14 +115,11 @@ void destroyStorage(list_t *p, void *f)
 	storage_item_t *this;
 	int i;
 
-	assert( p != NULL );
-	assert( f != NULL );
-
-	for( i = 0 ; i < p->count ; i++ )
-	{
+	assert(p != NULL);
+	assert(f != NULL);
+	for (i = 0; i < p->count; i++) {
 		this = (storage_item_t *)p->list[i];
 		destroyStorageItem(this, f);
 	}
-
 	destroyList(p);
 }