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

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

Merge "libcutils: UNUSED argument warnings"

parents fe4d0a10 ba02cd1e
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@

#include <cutils/android_reboot.h>

#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;

+3 −1
Original line number Diff line number Diff line
@@ -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;
+3 −1
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@

#include <cutils/str_parms.h>

#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;