X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;ds=sidebyside;f=ll.c;h=e9cde23e9a0f1d71868e57e8fa9085b59595848a;hb=3877403043acfbfa57497d3ba51a5ec2db1c77dc;hp=ed6315a4e2048b1a5d0b8ec56f79a96218e380b6;hpb=5e1b22d763640c4d7a09d07920403d8d491b4410;p=onak.git
diff --git a/ll.c b/ll.c
index ed6315a..e9cde23 100644
--- a/ll.c
+++ b/ll.c
@@ -13,15 +13,14 @@
* more details.
*
* You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * this program. If not, see .
*/
+#include
#include
#include
#include "ll.h"
-#include "log.h"
struct ll *lladd(struct ll *curll, void *object)
{
@@ -45,8 +44,6 @@ struct ll *lladdend(struct ll *curll, void *object)
struct ll *cur;
if ((new = malloc(sizeof(struct ll))) == NULL) {
- logthing(LOGTHING_ERROR,
- "Couldn't allocate memory in lladdend()");
return NULL;
}
@@ -72,7 +69,7 @@ struct ll *lldel(struct ll *curll, void *object,
struct ll *cur = NULL;
struct ll *old = NULL;
- log_assert(objectcmp != NULL);
+ assert(objectcmp != NULL);
cur = curll;
if (cur == NULL) {
@@ -99,7 +96,7 @@ struct ll *llfind(struct ll *curll, void *object,
{
struct ll *cur;
- log_assert(objectcmp != NULL);
+ assert(objectcmp != NULL);
cur = curll;
while (cur != NULL && (*objectcmp)(cur->object, object)) {
@@ -120,15 +117,6 @@ unsigned long llsize(struct ll *curll)
return count;
}
-/**
- * llfree - Frees a linked list.
- * @curll: The list to free.
- * @objectfree: A pointer to a free function for the object.
- *
- * Walks through a list and free it. If a function is provided for
- * objectfree then it's called for each element to free them, if it's NULL
- * just the list is freed.
- */
void llfree(struct ll *curll, void (*objectfree) (void *object))
{
struct ll *nextll;