glenn/tts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

No need to use kevent64().

Browse source
This commit is contained in:
Felicity Tarnell 2014-03-07 22:19:07 +00:00
parent e8396d70ba
commit ca908281b4
1 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

26
tts.c
View file

@ -208,14 +208,14 @@ static io_connect_t root_port;
static volatile sig_atomic_t donesleep; static volatile sig_atomic_t donesleep;
static time_t sleeptime; static time_t sleeptime;
static void power_setup(struct kevent64_s *); static void power_setup(struct kevent *);
static void power_handle(struct kevent64_s *); static void power_handle(struct kevent *);
static void power_event(void *, io_service_t, natural_t, void *); static void power_event(void *, io_service_t, natural_t, void *);
static void prompt_sleep(void); static void prompt_sleep(void);
static void static void
power_setup(ev) power_setup(ev)
struct kevent64_s *ev; struct kevent *ev;
{ {
mach_port_t pset; mach_port_t pset;
int ret; int ret;
@ -232,7 +232,7 @@ int ret;
root_port = IORegisterForSystemPower(NULL, &port_ref, power_event, root_port = IORegisterForSystemPower(NULL, &port_ref, power_event,
&notifier); &notifier);
ioport = IONotificationPortGetMachPort(port_ref); ioport = IONotificationPortGetMachPort(port_ref);
EV_SET64(ev, pset, EVFILT_MACHPORT, EV_ADD, 0, 0, 0, 0, 0); EV_SET(ev, pset, EVFILT_MACHPORT, EV_ADD, 0, 0, 0);
if ((ret = mach_port_insert_member(mach_task_self(), ioport, if ((ret = mach_port_insert_member(mach_task_self(), ioport,
pset)) != KERN_SUCCESS) { pset)) != KERN_SUCCESS) {
@ -244,7 +244,7 @@ int ret;
static void static void
power_handle(ev) power_handle(ev)
struct kevent64_s *ev; struct kevent *ev;
{ {
mach_msg_return_t ret; mach_msg_return_t ret;
void *msg = alloca(ev->data); void *msg = alloca(ev->data);
@ -303,11 +303,11 @@ int
main(argc, argv) main(argc, argv)
char **argv; char **argv;
{ {
struct passwd *pw; struct passwd *pw;
char rcfile[PATH_MAX + 1]; char rcfile[PATH_MAX + 1];
#ifdef USE_DARWIN_POWER #ifdef USE_DARWIN_POWER
int kq; int kq;
struct kevent64_s evs[2], rev; struct kevent evs[2], rev;
# define STDIN_EV 0 # define STDIN_EV 0
# define IOKIT_EV 1 # define IOKIT_EV 1
#endif #endif
@ -322,10 +322,10 @@ struct kevent64_s evs[2], rev;
memset(evs, 0, sizeof(evs)); memset(evs, 0, sizeof(evs));
EV_SET64(&evs[STDIN_EV], STDIN_FILENO, EVFILT_READ, EV_ADD, 0, 0, 0, 0, 0); EV_SET(&evs[STDIN_EV], STDIN_FILENO, EVFILT_READ, EV_ADD, 0, 0, 0);
power_setup(&evs[IOKIT_EV]); power_setup(&evs[IOKIT_EV]);
if (kevent64(kq, evs, 2, NULL, 0, 0, NULL) == -1) { if (kevent(kq, evs, 2, NULL, 0, NULL) == -1) {
perror("kevent"); perror("kevent");
return 1; return 1;
} }
@ -467,7 +467,7 @@ struct kevent64_s evs[2], rev;
timeout.tv_sec = 0; timeout.tv_sec = 0;
timeout.tv_nsec = 500000000; timeout.tv_nsec = 500000000;
if ((nev = kevent64(kq, NULL, 0, &rev, 1, 0, &timeout)) == -1) { if ((nev = kevent(kq, NULL, 0, &rev, 1, &timeout)) == -1) {
if (doexit) if (doexit)
break; break;
if (errno == EINTR) if (errno == EINTR)
@ -476,7 +476,7 @@ struct kevent64_s evs[2], rev;
return 1; return 1;
} }
if (rev.filter == EVFILT_MACHPORT) { if (nev == 1 && (rev.filter == EVFILT_MACHPORT)) {
power_handle(&rev); power_handle(&rev);
continue; continue;
} }