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

Commit 1ab3d67f authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

am 315c3a74: Merge "libsysutils: reimplement NetlinkEvent::findParam in the proper way" 

Merge commit '315c3a74' into gingerbread-plus-aosp

* commit '315c3a74':
  libsysutils: reimplement NetlinkEvent::findParam in the proper way
parents 9060ebb5 315c3a74

libsysutils/src/NetlinkEvent.cpp

+5 −7
Original line number Diff line number Diff line
@@ -93,13 +93,11 @@ bool NetlinkEvent::decode(char *buffer, int size) { 
}



const char *NetlinkEvent::findParam(const char *paramName) {

    int i;



    for (i = 0; i < NL_PARAMS_MAX; i++) {

        if (!mParams[i])

            break;

        if (!strncmp(mParams[i], paramName, strlen(paramName)))

            return &mParams[i][strlen(paramName) + 1];

    size_t len = strlen(paramName);

    for (int i = 0; mParams[i] && i < NL_PARAMS_MAX; ++i) {

        const char *ptr = mParams[i] + len;

        if (!strncmp(mParams[i], paramName, len) && *ptr == '=')

            return ++ptr;

    }



    SLOGE("NetlinkEvent::FindParam(): Parameter '%s' not found", paramName);