diff options
author | Fedor Indutny <fedor.indutny@gmail.com> | 2014-01-27 21:30:51 +0400 |
---|---|---|
committer | Fedor Indutny <fedor.indutny@gmail.com> | 2014-01-27 21:30:51 +0400 |
commit | 64d33a751935bb0fa9fad8f6525dcd378b5fe3da (patch) | |
tree | d2c7d5106014ec7c7aeafadfbee5ef50735e8e53 /deps/uv/src/unix/linux-core.c | |
parent | cc4b6e6e582e868cba9f84195f62a51721f8cbad (diff) | |
download | android-node-v8-64d33a751935bb0fa9fad8f6525dcd378b5fe3da.tar.gz android-node-v8-64d33a751935bb0fa9fad8f6525dcd378b5fe3da.tar.bz2 android-node-v8-64d33a751935bb0fa9fad8f6525dcd378b5fe3da.zip |
deps: update uv to 0.11.18
Diffstat (limited to 'deps/uv/src/unix/linux-core.c')
-rw-r--r-- | deps/uv/src/unix/linux-core.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/deps/uv/src/unix/linux-core.c b/deps/uv/src/unix/linux-core.c index 78b234364e..4f11d88eed 100644 --- a/deps/uv/src/unix/linux-core.c +++ b/deps/uv/src/unix/linux-core.c @@ -635,9 +635,11 @@ static int read_times(unsigned int numcpus, uv_cpu_info_t* ci) { /* skip "cpu<num> " marker */ { - unsigned int n = num; + unsigned int n; + int r = sscanf(buf, "cpu%u ", &n); + assert(r == 1); + (void) r; // silence build warning for (len = sizeof("cpu0"); n /= 10; len++); - assert(sscanf(buf, "cpu%u ", &n) == 1 && n == num); } /* Line contains user, nice, system, idle, iowait, irq, softirq, steal, @@ -664,6 +666,7 @@ static int read_times(unsigned int numcpus, uv_cpu_info_t* ci) { ci[num++].cpu_times = ts; } fclose(fp); + assert(num == numcpus); return 0; } |