Merge "libsysutils: reimplement NetlinkEvent::findParam in the proper way"

This commit is contained in:
Jean-Baptiste Queru 2010-07-22 09:44:36 -07:00 committed by Android Code Review
commit 315c3a74a1

View file

@ -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);