Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6aad4cd authored by Mark Salyzyn's avatar Mark Salyzyn
Browse files

libcutils: Move list.c to inlines on list.h 

(cherry picked from commit 0ea3624b)

Change-Id: I0572555a194d2560e74dfbf07abcec05e9a276a2
parent fb6d601f

include/cutils/list.h

+20 −4
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2010 The Android Open Source Project

 * Copyright (C) 2008-2013 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.
@@ -49,9 +49,25 @@ struct listnode 
         node != (list); \

         node = next, next = node->next)



void list_init(struct listnode *list);

void list_add_tail(struct listnode *list, struct listnode *item);

void list_remove(struct listnode *item);

static inline void list_init(struct listnode *node)

{

    node->next = node;

    node->prev = node;

}



static inline void list_add_tail(struct listnode *head, struct listnode *item)

{

    item->next = head;

    item->prev = head->prev;

    head->prev->next = item;

    head->prev = item;

}



static inline void list_remove(struct listnode *item)

{

    item->next->prev = item->prev;

    item->prev->next = item->next;

}



#define list_empty(list) ((list) == (list)->next)

#define list_head(list) ((list)->next)

libcutils/Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ commonSources := \ 
	config_utils.c \

	cpu_info.c \

	load_file.c \

	list.c \

	open_memstream.c \

	strdup16to8.c \

	strdup8to16.c \

libcutils/list.c

deleted100644 → 0
+0 −37
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2008 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#include <cutils/list.h>



void list_init(struct listnode *node)

{

    node->next = node;

    node->prev = node;

}



void list_add_tail(struct listnode *head, struct listnode *item)

{

    item->next = head;

    item->prev = head->prev;

    head->prev->next = item;

    head->prev = item;

}



void list_remove(struct listnode *item)

{

    item->next->prev = item->prev;

    item->prev->next = item->next;

}