commit 1ab3d67f534943018067e2db18a6377404138f52
author Jean-Baptiste Queru <jbq@google.com> Thu Jul 22 09:53:28 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Jul 22 09:53:28 2010 -0700
tree 7cb9c161ee54154cf8ddd7440d58998b2d51e2f8
parent 9060ebb5f7f1b9d979e6ac32e32c719452583363
parent 315c3a74a1fcf1d421ffff0857f998a98a1c224a

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

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

* commit '315c3a74a1fcf1d421ffff0857f998a98a1c224a':
  libsysutils: reimplement NetlinkEvent::findParam in the proper way

libsysutils/src/NetlinkEvent.cpp

diff --git a/libsysutils/src/NetlinkEvent.cpp b/libsysutils/src/NetlinkEvent.cpp
index c2ba647..86c1f42 100644
--- a/libsysutils/src/NetlinkEvent.cpp
+++ b/libsysutils/src/NetlinkEvent.cpp
@@ -93,13 +93,11 @@
 }
 
 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);