diff options
| -rw-r--r-- | debuggerd/handler/debuggerd_handler.cpp | 2 | ||||
| -rw-r--r-- | toolbox/OWNERS | 1 | ||||
| -rw-r--r-- | toolbox/getevent.c | 4 | ||||
| -rw-r--r-- | trusty/libtrusty/tipc-test/tipc_test.c | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/debuggerd/handler/debuggerd_handler.cpp b/debuggerd/handler/debuggerd_handler.cpp index 25031bff6..e26746b60 100644 --- a/debuggerd/handler/debuggerd_handler.cpp +++ b/debuggerd/handler/debuggerd_handler.cpp @@ -108,7 +108,7 @@ static bool is_permissive_mte() { "persist.device_config.memory_safety_native.permissive.process.%s", getprogname()); // DO NOT REPLACE this with GetBoolProperty. That uses std::string which allocates, so it is - // not async-safe (and this functiong gets used in a signal handler). + // not async-safe, and this function gets used in a signal handler. return property_parse_bool("persist.sys.mte.permissive") || property_parse_bool("persist.device_config.memory_safety_native.permissive.default") || property_parse_bool(process_sysprop_name) || diff --git a/toolbox/OWNERS b/toolbox/OWNERS index 5e2c5813f..898ddce5f 100644 --- a/toolbox/OWNERS +++ b/toolbox/OWNERS @@ -1,2 +1,3 @@ include platform/system/core:/janitors/OWNERS per-file modprobe.c=willmcvicker@google.com,dvander@google.com +per-file getevent.c=file:platform/frameworks/base:/INPUT_OWNERS diff --git a/toolbox/getevent.c b/toolbox/getevent.c index f65bb20b5..7b896e9ec 100644 --- a/toolbox/getevent.c +++ b/toolbox/getevent.c @@ -441,7 +441,7 @@ static int read_notify(const char *dirname, int nfd, int print_flags) if(res < (int)sizeof(*event)) { if(errno == EINTR) return 0; - fprintf(stderr, "could not get event, %s\n", strerror(errno)); + fprintf(stderr, "could not get inotify events, %s\n", strerror(errno)); return 1; } //printf("got %d bytes of event information\n", res); @@ -664,7 +664,7 @@ int getevent_main(int argc, char *argv[]) if(ufds[i].revents & POLLIN) { res = read(ufds[i].fd, &event, sizeof(event)); if(res < (int)sizeof(event)) { - fprintf(stderr, "could not get event\n"); + fprintf(stderr, "could not get evdev event, %s\n", strerror(errno)); return 1; } if(get_time) { diff --git a/trusty/libtrusty/tipc-test/tipc_test.c b/trusty/libtrusty/tipc-test/tipc_test.c index dabe118e1..1eac9cfb9 100644 --- a/trusty/libtrusty/tipc-test/tipc_test.c +++ b/trusty/libtrusty/tipc-test/tipc_test.c @@ -37,7 +37,7 @@ #define BENCH_RESULT_TPL \ "{" \ " \"schema_version\": 3," \ -" \"suite_name\": \"crypto\"," \ +" \"suite_name\": \"tipc\"," \ " \"bench_name\": \"%s\"," \ " \"results\": [" \ " {" \ |