Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d334b826 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes I456aa53d,I286c6947 into main 

* changes:
  getevent: print error message when failing to get event
  getevent: add Framework Input team as owners
parents 9261e262 08686936

toolbox/OWNERS

+1 −0
Original line number Diff line number Diff line 
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

toolbox/getevent.c

+2 −2
Original line number Diff line number Diff line
@@ -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) {