commit 9ed86eff8890446f0d0b281a26a71c233f95f4c0
author Christopher Ferris <cferris@google.com> Thu May 01 00:13:46 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu May 01 00:13:46 2014 +0000
tree a99692b9ef9d4fe052b35c4c883f17d78baed2fd
parent f8eb56b2c0ed519f2e3b45f507eade619ad571b2
parent aa63d9f980f95718fc28ca7e222c1e8d7ca9e778

Merge "Use real time signal for threads instead of SIGURG."

libsysutils/src/FrameworkListener.cpp

diff --git a/libsysutils/src/FrameworkListener.cpp b/libsysutils/src/FrameworkListener.cpp
index 01ed54e..e7b3dd6 100644
--- a/libsysutils/src/FrameworkListener.cpp
+++ b/libsysutils/src/FrameworkListener.cpp
@@ -92,7 +92,6 @@
     char *qlimit = tmp + sizeof(tmp) - 1;
     bool esc = false;
     bool quote = false;
-    int k;
     bool haveCmdNum = !mWithSeq;
 
     memset(argv, 0, sizeof(argv));
@@ -166,7 +165,7 @@
         goto overflow;
     argv[argc++] = strdup(tmp);
 #if 0
-    for (k = 0; k < argc; k++) {
+    for (int k = 0; k < argc; k++) {
         SLOGD("arg[%d] = '%s'", k, argv[k]);
     }
 #endif

libsysutils/src/NetlinkEvent.cpp

diff --git a/libsysutils/src/NetlinkEvent.cpp b/libsysutils/src/NetlinkEvent.cpp
index 34f2016..6976eba 100644
--- a/libsysutils/src/NetlinkEvent.cpp
+++ b/libsysutils/src/NetlinkEvent.cpp
@@ -399,7 +399,6 @@
     const char *s = buffer;
     const char *end;
     int param_idx = 0;
-    int i;
     int first = 1;
 
     if (size == 0)