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

Commit 0cf75840 authored by Yi Kong's avatar Yi Kong
Browse files

[binder] Modernize codebase by replacing NULL with nullptr 

Fixes -Wzero-as-null-pointer-constant warning.

Test: m
Bug: 68236239
Change-Id: Icae41e24bc3dc2cc81ddb14978d1f6c1e52061f5
parent d544a9c2

libs/binder/include/binder/Binder.h

+3 −3
Original line number Diff line number Diff line
@@ -40,13 +40,13 @@ public: 
                                    uint32_t flags = 0);



    virtual status_t    linkToDeath(const sp<DeathRecipient>& recipient,

                                    void* cookie = NULL,

                                    void* cookie = nullptr,

                                    uint32_t flags = 0);



    virtual status_t    unlinkToDeath(  const wp<DeathRecipient>& recipient,

                                        void* cookie = NULL,

                                        void* cookie = nullptr,

                                        uint32_t flags = 0,

                                        wp<DeathRecipient>* outRecipient = NULL);

                                        wp<DeathRecipient>* outRecipient = nullptr);



    virtual void        attachObject(   const void* objectID,

                                        void* object,

libs/binder/include/binder/BpBinder.h

+3 −3
Original line number Diff line number Diff line
@@ -47,12 +47,12 @@ public: 
                                    uint32_t flags = 0);



    virtual status_t    linkToDeath(const sp<DeathRecipient>& recipient,

                                    void* cookie = NULL,

                                    void* cookie = nullptr,

                                    uint32_t flags = 0);

    virtual status_t    unlinkToDeath(  const wp<DeathRecipient>& recipient,

                                        void* cookie = NULL,

                                        void* cookie = nullptr,

                                        uint32_t flags = 0,

                                        wp<DeathRecipient>* outRecipient = NULL);

                                        wp<DeathRecipient>* outRecipient = nullptr);



    virtual void        attachObject(   const void* objectID,

                                        void* object,

libs/binder/include/binder/Debug.h

+2 −2
Original line number Diff line number Diff line
@@ -31,12 +31,12 @@ const char* stringForIndent(int32_t indentLevel); 
typedef void (*debugPrintFunc)(void* cookie, const char* txt);



void printTypeCode(uint32_t typeCode,

    debugPrintFunc func = 0, void* cookie = 0);

    debugPrintFunc func = nullptr, void* cookie = nullptr);



void printHexData(int32_t indent, const void *buf, size_t length,

    size_t bytesPerLine=16, int32_t singleLineBytesCutoff=16,

    size_t alignment=0, bool cArrayStyle=false,

    debugPrintFunc func = 0, void* cookie = 0);

    debugPrintFunc func = nullptr, void* cookie = nullptr);





ssize_t getBinderKernelReferences(size_t count, uintptr_t* buf);

libs/binder/include/binder/IBinder.h

+3 −3
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ public: 
     * directly do with it now that it has passed on.)

     */

    virtual status_t        linkToDeath(const sp<DeathRecipient>& recipient,

                                        void* cookie = NULL,

                                        void* cookie = nullptr,

                                        uint32_t flags = 0) = 0;



    /**
@@ -143,9 +143,9 @@ public: 
     * added with that cookie will be unlinked.

     */

    virtual status_t        unlinkToDeath(  const wp<DeathRecipient>& recipient,

                                            void* cookie = NULL,

                                            void* cookie = nullptr,

                                            uint32_t flags = 0,

                                            wp<DeathRecipient>* outRecipient = NULL) = 0;

                                            wp<DeathRecipient>* outRecipient = nullptr) = 0;



    virtual bool            checkSubclass(const void* subclassID) const;

libs/binder/include/binder/IInterface.h

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ inline sp<IInterface> BnInterface<INTERFACE>::queryLocalInterface( 
        const String16& _descriptor)

{

    if (_descriptor == INTERFACE::descriptor) return this;

    return NULL;

    return nullptr;

}



template<typename INTERFACE>