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

Commit 4318b9c8 authored by Ian Pedowitz's avatar Ian Pedowitz Committed by Android (Google) Code Review
Browse files

Merge "Revert "Revert "Fix warnings in servicemanager and KeyCharacterMap""" into nyc-dev

parents 3f0d7629 d57d9b90

cmds/servicemanager/Android.mk

+1 −1
Original line number Diff line number Diff line 
LOCAL_PATH:= $(call my-dir)



svc_c_flags =	\

	-Wall -Wextra \

	-Wall -Wextra -Werror \



ifneq ($(TARGET_USES_64_BIT_BINDER),true)

ifneq ($(TARGET_IS_64_BIT),true)

cmds/servicemanager/binder.c

+1 −1
Original line number Diff line number Diff line
@@ -449,7 +449,7 @@ static void *bio_alloc(struct binder_io *bio, size_t size) 
}



void binder_done(struct binder_state *bs,

                 struct binder_io *msg,

                 __unused struct binder_io *msg,

                 struct binder_io *reply)

{

    struct {

cmds/servicemanager/service_manager.c

+4 −4
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ uint16_t svcmgr_id[] = { 
};





uint32_t do_find_service(struct binder_state *bs, const uint16_t *s, size_t len, uid_t uid, pid_t spid)

uint32_t do_find_service(const uint16_t *s, size_t len, uid_t uid, pid_t spid)

{

    struct svcinfo *si = find_svc(s, len);
@@ -304,7 +304,7 @@ int svcmgr_handler(struct binder_state *bs, 
        if (s == NULL) {

            return -1;

        }

        handle = do_find_service(bs, s, len, txn->sender_euid, txn->sender_pid);

        handle = do_find_service(s, len, txn->sender_euid, txn->sender_pid);

        if (!handle)

            break;

        bio_put_ref(reply, handle);
@@ -349,7 +349,7 @@ int svcmgr_handler(struct binder_state *bs, 
}





static int audit_callback(void *data, security_class_t cls, char *buf, size_t len)

static int audit_callback(void *data, __unused security_class_t cls, char *buf, size_t len)

{

    struct audit_data *ad = (struct audit_data *)data;
@@ -362,7 +362,7 @@ static int audit_callback(void *data, security_class_t cls, char *buf, size_t le 
    return 0;

}



int main(int argc, char **argv)

int main()

{

    struct binder_state *bs;

libs/input/KeyCharacterMap.cpp

+1 −1
Original line number Diff line number Diff line
@@ -608,7 +608,7 @@ sp<KeyCharacterMap> KeyCharacterMap::readFromParcel(Parcel* parcel) { 
        return NULL;

    }

    if (numKeys > MAX_KEYS) {

        ALOGE("Too many keys in KeyCharacterMap (%d > %d)", numKeys, MAX_KEYS);

        ALOGE("Too many keys in KeyCharacterMap (%zu > %d)", numKeys, MAX_KEYS);

        return NULL;

    }