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

Commit 9880128a authored by Mark Salyzyn's avatar Mark Salyzyn Committed by Android (Google) Code Review
Browse files

Merge changes I7d9db1e2,I48b0942a,I0572555a 

* changes:
  liblog: whitespace cleanup
  libsysutils: Get rid of warnings
  libcutils: Move list.c to inlines on list.h
parents d33b5b7c c1215c0b

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;

}

liblog/logprint.c

+1 −1
Original line number Diff line number Diff line 
/* //device/libs/cutils/logprint.c

/*

**

** Copyright 2006, The Android Open Source Project

**

libsysutils/src/FrameworkCommand.cpp

+4 −1
Original line number Diff line number Diff line
@@ -21,11 +21,14 @@ 


#include <sysutils/FrameworkCommand.h>



#define UNUSED __attribute__((unused))



FrameworkCommand::FrameworkCommand(const char *cmd) {

    mCommand = cmd;

}



int FrameworkCommand::runCommand(SocketClient *c, int argc, char **argv) {

int FrameworkCommand::runCommand(SocketClient *c UNUSED, int argc UNUSED,

                                 char **argv UNUSED) {

    SLOGW("Command %s has no run handler!", getCommand());

    errno = ENOSYS;

    return -1;