simplify functions that ought to be one-liners

This commit is contained in:
randomuser 2021-06-13 23:27:38 -05:00
parent d65a124626
commit d986e7ec25
1 changed files with 9 additions and 33 deletions

View File

@ -6,17 +6,9 @@ struct timer {
int (*p)(struct timer *t); /* pause check function */ int (*p)(struct timer *t); /* pause check function */
}; };
void timerdec(struct timer *t) { void timerdec(struct timer *t) { if (t->s != 0) t->s--; }
if (t->s != 0) t->s--; void timerinc(struct timer *t) { t->s++; }
} void timerupdate(struct timer *t) { if(t->u != NULL) t->u(t); }
void timerinc(struct timer *t) {
t->s++;
}
void timerupdate(struct timer *t) {
if(t->u != NULL) t->u(t);
}
int timerstate(int (*f)(struct timer *t), struct timer *t) { int timerstate(int (*f)(struct timer *t), struct timer *t) {
if(f != NULL) { if(f != NULL) {
@ -26,34 +18,18 @@ int timerstate(int (*f)(struct timer *t), struct timer *t) {
return 0; return 0;
} }
int timerstop(struct timer *t) { int timerstop(struct timer *t) { return timerstate(t->c, t); }
return timerstate(t->c, t); int timerpause(struct timer *t) { return timerstate(t->p, t); }
}
int timerpause(struct timer *t) {
return timerstate(t->p, t);
}
int timerzero(struct timer *t) { int timerzero(struct timer *t) {
if(t->s == 0) return 1; if(t->s == 0) return 1;
return 0; return 0;
} }
int seconds(int t) { int seconds(int t) { return t % 60; }
return t % 60; int minutes(int t) { return (t / 60) % 60; }
} int minute(int t) { return t / 60; }
int hours(int t) { return (t / 60) / 60; }
int minutes(int t) {
return (t / 60) % 60;
}
int minute(int t) {
return t / 60;
}
int hours(int t) {
return (t / 60) / 60;
}
struct timer *timerinit(void) { struct timer *timerinit(void) {
struct timer *t = malloc(sizeof *t); struct timer *t = malloc(sizeof *t);