generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Fix unused result errors in bionic."

Browse Source
This commit is contained in:
Elliott Hughes
2015-05-13 21:09:41 +00:00
committed by Gerrit Code Review
parent fe77d2d003 c217373bd6
commit 706eafc9b0
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
benchmarks/stdio_benchmark.cpp
View File

@@ -16,6 +16,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdio_ext.h> #include <stdio_ext.h>
#include <stdlib.h>
#include <benchmark/Benchmark.h> #include <benchmark/Benchmark.h>
@@ -73,7 +74,7 @@ static void FopenFgetsFclose(int iters, bool no_locking) {
for (int i = 0; i < iters; ++i) { for (int i = 0; i < iters; ++i) {
FILE* fp = fopen("/proc/version", "re"); FILE* fp = fopen("/proc/version", "re");
if (no_locking) __fsetlocking(fp, FSETLOCKING_BYCALLER); if (no_locking) __fsetlocking(fp, FSETLOCKING_BYCALLER);
fgets(buf, sizeof(buf), fp); if (fgets(buf, sizeof(buf), fp) == nullptr) abort();
fclose(fp); fclose(fp);
} }
} }

11
benchmarks/utils.cpp
View File

@@ -14,6 +14,8 @@
* limitations under the License. * limitations under the License.
*/ */
#include "utils.h"
#include <inttypes.h> #include <inttypes.h>
#include <stdio.h> #include <stdio.h>
#include <stdint.h> #include <stdint.h>
@@ -21,7 +23,7 @@
#include <string> #include <string>
#include "utils.h" #include <base/stringprintf.h>
int Round(int n) { int Round(int n) {
int base = 1; int base = 1;
@@ -72,10 +74,7 @@ std::string PrettyInt(long value, size_t base) {
break; break;
} }
} }
char* s = NULL; return android::base::StringPrintf("%s%" PRId64 "%s",
asprintf(&s, "%s%" PRId64 "%s", (negative_number ? "-" : ""), negative_number ? "-" : "",
count / kAmountPerUnit[i], kUnitStrings[i]); count / kAmountPerUnit[i], kUnitStrings[i]);
std::string result(s);
free(s);
return result;
} }