From 2b94cc264f54fb588a8721caf92fff95b7576f4a Mon Sep 17 00:00:00 2001 From: Mark Salyzyn Date: Fri, 22 Nov 2013 07:36:45 -0800 Subject: libcutils: UNUSED argument warnings (cherry picked from commit ba02cd1e9bccee9b112ccbee06bc204381b5a215) Change-Id: Ie427d481298af8d911bb2b157ebba30954335354 --- libcutils/android_reboot.c | 4 +++- libcutils/socket_local_client.c | 4 +++- libcutils/str_parms.c | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) (limited to 'libcutils') diff --git a/libcutils/android_reboot.c b/libcutils/android_reboot.c index aef3054..b7895fa 100644 --- a/libcutils/android_reboot.c +++ b/libcutils/android_reboot.c @@ -25,6 +25,8 @@ #include +#define UNUSED __attribute__((unused)) + /* Check to see if /proc/mounts contains any writeable filesystems * backed by a block device. * Return true if none found, else return false. @@ -102,7 +104,7 @@ static void remount_ro(void) } -int android_reboot(int cmd, int flags, char *arg) +int android_reboot(int cmd, int flags UNUSED, char *arg) { int ret; diff --git a/libcutils/socket_local_client.c b/libcutils/socket_local_client.c index 036ce2e..5310516 100644 --- a/libcutils/socket_local_client.c +++ b/libcutils/socket_local_client.c @@ -39,6 +39,8 @@ int socket_local_client(const char *name, int namespaceId, int type) #include "socket_local.h" +#define UNUSED __attribute__((unused)) + #define LISTEN_BACKLOG 4 /* Documented in header file. */ @@ -122,7 +124,7 @@ error: * Used by AndroidSocketImpl */ int socket_local_client_connect(int fd, const char *name, int namespaceId, - int type) + int type UNUSED) { struct sockaddr_un addr; socklen_t alen; diff --git a/libcutils/str_parms.c b/libcutils/str_parms.c index 9e1d2dc..f1f3584 100644 --- a/libcutils/str_parms.c +++ b/libcutils/str_parms.c @@ -30,6 +30,8 @@ #include +#define UNUSED __attribute__((unused)) + struct str_parms { Hashmap *map; }; @@ -318,7 +320,7 @@ char *str_parms_to_str(struct str_parms *str_parms) return str; } -static bool dump_entry(void *key, void *value, void *context) +static bool dump_entry(void *key, void *value, void *context UNUSED) { ALOGI("key: '%s' value: '%s'\n", (char *)key, (char *)value); return true; -- cgit v1.1