1265df1f3

Denis Vlasenko

2009-01-13

FAILED Duration: 39s

Subject

libbb: shrink linked list ops (by xmaks AT email.cz)

No binary (build failed)

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

(log yok)

libbb/llist.c+18 -36

@@ -25,56 +25,38 @@ void FAST_FUNC llist_add_to(llist_t *old_head, void data)
	/* Add data to the end of the linked list. */
	void FAST_FUNC llist_add_to_end(llist_t *list_head, void data)
	{
-	llist_t *new_item = xmalloc(sizeof(llist_t));
-
-	new_item->data = data;
-	new_item->link = NULL;
-
-	if (!*list_head)
-	*list_head = new_item;
-	else {
-	llist_t tail = list_head;
-
-	while (tail->link)
-	tail = tail->link;
-	tail->link = new_item;
-	}
+	while (*list_head)
+	list_head = &(*list_head)->link;
+	*list_head = xzalloc(sizeof(llist_t));
+	(*list_head)->data = data;
+	/(list_head)->link = NULL;*/
	}

	/* Remove first element from the list and return it */
	void* FAST_FUNC llist_pop(llist_t **head)
	{
-	void data, next;
-
-	if (!*head)
-	return NULL;
-
-	data = (*head)->data;
-	next = (*head)->link;
-	free(*head);
-	*head = next;
+	void *data = NULL;
+	llist_t temp = head;

+	if (temp) {
+	data = temp->data;
+	*head = temp->link;
+	free(temp);
+	}
	return data;
	}

	/* Unlink arbitrary given element from the list */
	void FAST_FUNC llist_unlink(llist_t *head, llist_t elm)
	{
-	llist_t *crt;
-
-	if (!(elm && *head))
-	return;
-
-	if (elm == *head) {
-	head = (head)->link;
+	if (!elm)
	return;
-	}
-
-	for (crt = *head; crt; crt = crt->link) {
-	if (crt->link == elm) {
-	crt->link = elm->link;
-	return;
+	while (*head) {
+	if (*head == elm) {
+	head = (head)->link;
+	break;
	}
+	head = &(*head)->link;
	}
	}