[BIGMOVE] exploded the monolithic haproxy.c file into multiple files.
The files are now stored under :
- include/haproxy for the generic includes
- include/types.h for the structures needed within prototypes
- include/proto.h for function prototypes and inline functions
- src/*.c for the C files
Most include files are now covered by LGPL. A last move still needs
to be done to put inline functions under GPL and not LGPL.
Version has been set to 1.3.0 in the code but some control still
needs to be done before releasing.
diff --git a/src/list.c b/src/list.c
index 364ed14..0eaf6ce 100644
--- a/src/list.c
+++ b/src/list.c
@@ -18,7 +18,7 @@
#include <stdlib.h>
#include <string.h>
-#include <include/list.h>
+#include <haproxy/list.h>
/*****************************************************************************
* *
@@ -28,17 +28,17 @@
void list_init(List *list, void (*destroy)(void *data)) {
- /*****************************************************************************
- * *
- * Initialize the list. *
- * *
- *****************************************************************************/
+ /*********************************************************************
+ * *
+ * Initialize the list. *
+ * *
+ *********************************************************************/
- list->size = 0;
- list->destroy = destroy;
- list->head = NULL;
- list->tail = NULL;
- return;
+ list->size = 0;
+ list->destroy = destroy;
+ list->head = NULL;
+ list->tail = NULL;
+ return;
} /* end list_init() */
/*****************************************************************************
@@ -49,39 +49,39 @@
void list_destroy(List *list) {
- void *data;
- int rc;
+ void *data;
+ int rc;
- /*****************************************************************************
- * *
- * Remove each element. *
- * *
- *****************************************************************************/
+ /*********************************************************************
+ * *
+ * Remove each element. *
+ * *
+ *********************************************************************/
- while (list_size(list) > 0) {
+ while (list_size(list) > 0) {
- rc = list_rem_next(list, NULL, (void **)&data);
+ rc = list_rem_next(list, NULL, (void **)&data);
- if (( rc == 0) && (list->destroy != NULL)) {
+ if (( rc == 0) && (list->destroy != NULL)) {
- /***********************************************************************
- * *
- * Call a user-defined function to free dynamically allocated data. *
- * *
- ***********************************************************************/
+ /*******************************************************************
+ * *
+ * Call a user-defined function to free dynamically allocated data.*
+ * *
+ *******************************************************************/
- list->destroy(data);
- }/* end if() */
- }/* end while() */
+ list->destroy(data);
+ }/* end if() */
+ }/* end while() */
- /*****************************************************************************
- * *
- * No operations are allowed now, but clear the structure as a precaution. *
- * *
- *****************************************************************************/
+ /**************************************************************************
+ * *
+ * No operations are allowed now, but clear the structure as a precaution.*
+ * *
+ **************************************************************************/
- memset(list, 0, sizeof(List));
- return;
+ memset(list, 0, sizeof(List));
+ return;
} /* void list_destroy(List *list) */
/*****************************************************************************
@@ -92,62 +92,62 @@
int list_ins_next(List *list, ListElmt *element, const void *data) {
- ListElmt *new_element;
+ ListElmt *new_element;
- /*****************************************************************************
- * *
- * Allocate storage for the element. *
- * *
- *****************************************************************************/
+ /*********************************************************************
+ * *
+ * Allocate storage for the element. *
+ * *
+ *********************************************************************/
- if ((new_element = (ListElmt *)malloc(sizeof(ListElmt))) == NULL)
- return -1;
+ if ((new_element = (ListElmt *)malloc(sizeof(ListElmt))) == NULL)
+ return -1;
- /*****************************************************************************
- * *
- * Insert the element into the list. *
- * *
- *****************************************************************************/
+ /*********************************************************************
+ * *
+ * Insert the element into the list. *
+ * *
+ *********************************************************************/
- new_element->data = (void *)data;
+ new_element->data = (void *)data;
- if (element == NULL) {
+ if (element == NULL) {
- /**************************************************************************
- * *
- * Handle insertion at the head of the list. *
- * *
- **************************************************************************/
+ /*************************************************************
+ * *
+ * Handle insertion at the head of the list. *
+ * *
+ *************************************************************/
- if (list_size(list) == 0)
- list->tail = new_element;
+ if (list_size(list) == 0)
+ list->tail = new_element;
- new_element->next = list->head;
- list->head = new_element;
- }/* end if (element == NULL) */
- else {
+ new_element->next = list->head;
+ list->head = new_element;
+ }/* end if (element == NULL) */
+ else {
- /**************************************************************************
- * *
- * Handle insertion somewhere other than at the head. *
- * *
- **************************************************************************/
+ /*************************************************************
+ * *
+ * Handle insertion somewhere other than at the head. *
+ * *
+ *************************************************************/
- if (element->next == NULL)
- list->tail = new_element;
+ if (element->next == NULL)
+ list->tail = new_element;
- new_element->next = element->next;
- element->next = new_element;
- }/* end else */
+ new_element->next = element->next;
+ element->next = new_element;
+ }/* end else */
- /*****************************************************************************
- * *
- * Adjust the size of the list to account for the inserted element. *
- * *
- *****************************************************************************/
+ /*********************************************************************
+ * *
+ * Adjust the size of the list to account for the inserted element. *
+ * *
+ *********************************************************************/
- list->size++;
- return 0;
+ list->size++;
+ return 0;
} /* end list_ins_next() */
/*****************************************************************************
@@ -158,71 +158,78 @@
int list_rem_next(List *list, ListElmt *element, void **data) {
- ListElmt *old_element;
+ ListElmt *old_element;
- /*****************************************************************************
- * *
- * Do not allow removal from an empty list. *
- * *
- *****************************************************************************/
+ /*********************************************************************
+ * *
+ * Do not allow removal from an empty list. *
+ * *
+ *********************************************************************/
- if (list_size(list) == 0)
- return -1;
+ if (list_size(list) == 0)
+ return -1;
- /*****************************************************************************
- * *
- * Remove the element from the list. *
- * *
- *****************************************************************************/
+ /*********************************************************************
+ * *
+ * Remove the element from the list. *
+ * *
+ *********************************************************************/
- if (element == NULL) {
+ if (element == NULL) {
- /**************************************************************************
- * *
- * Handle removal from the head of the list. *
- * *
- **************************************************************************/
+ /*************************************************************
+ * *
+ * Handle removal from the head of the list. *
+ * *
+ *************************************************************/
- *data = list->head->data;
- old_element = list->head;
- list->head = list->head->next;
+ *data = list->head->data;
+ old_element = list->head;
+ list->head = list->head->next;
- if (list_size(list) == 1)
- list->tail = NULL;
- }/* end if (element == NULL) */
- else {
+ if (list_size(list) == 1)
+ list->tail = NULL;
+ }/* end if (element == NULL) */
+ else {
- /**************************************************************************
- * *
- * Handle removal from somewhere other than the head. *
- * *
- **************************************************************************/
+ /*************************************************************
+ * *
+ * Handle removal from somewhere other than the head. *
+ * *
+ *************************************************************/
- if (element->next == NULL)
- return -1;
+ if (element->next == NULL)
+ return -1;
- *data = element->next->data;
- old_element = element->next;
- element->next = element->next->next;
+ *data = element->next->data;
+ old_element = element->next;
+ element->next = element->next->next;
- if (element->next == NULL)
- list->tail = element;
- }/* end else */
+ if (element->next == NULL)
+ list->tail = element;
+ }/* end else */
- /*****************************************************************************
- * *
- * Free the storage allocated by the abstract data type. *
- * *
- *****************************************************************************/
+ /*********************************************************************
+ * *
+ * Free the storage allocated by the abstract data type. *
+ * *
+ *********************************************************************/
- free(old_element);
+ free(old_element);
- /*****************************************************************************
- * *
- * Adjust the size of the list to account for the removed element. *
- * *
- *****************************************************************************/
+ /*********************************************************************
+ * *
+ * Adjust the size of the list to account for the removed element. *
+ * *
+ *********************************************************************/
- list->size--;
- return 0;
+ list->size--;
+ return 0;
}
+
+/*
+ * Local variables:
+ * c-indent-level: 8
+ * c-basic-offset: 8
+ * End:
+ */