static void initqueue(pkq *q) { q->head = 0; q->tail = &q->head; }
-static pkq_node *make_pkqnode(void *p, size_t n)
+static pkq_node *make_pkqnode(const void *p, size_t n)
{
pkq_node *pn;
* calls a user-supplied calback function, and quits.
*/
-static void gobbler_close(gobbler *g)
+static void close_gobbler(gobbler *g)
{ if (g->f.fd != -1) { sel_rmfile(&g->f); close(g->f.fd); g->f.fd = -1; } }
-static void gobbler_destroy(gobbler *g) { gobbler_close(g); DESTROY(g); }
+static void destroy_gobbler(gobbler *g) { close_gobbler(g); DESTROY(g); }
static void do_gobble_in(int fd, unsigned mode, void *p)
{
else {
moan("read (gobble): %s", strerror(errno));
if (g->done) g->done(g, errno, g->p);
- gobbler_close(g);
+ close_gobbler(g);
break;
}
} else if (n == 0) {
if (g->done) g->done(g, 0, g->p);
- gobbler_close(g);
+ close_gobbler(g);
break;
}
}
{
if (err)
moan("write (client): %s", strerror(err));
- gobbler_destroy(p);
+ destroy_gobbler(p);
destroy_dribbler(d);
reasons--;
}
}
}
-static void client_destroy(client *c)
+static void destroy_client(client *c)
{
sel_rmfile(&c->f);
close(c->f.fd);
break;
else {
moan("read (client): %s", strerror(errno));
- client_destroy(c);
+ destroy_client(c);
return;
}
} else if (n == 0) {
if (enqueue_dribble(dribble_out, make_pkqnode(c->d.buf, c->d.len)))
reasons++;
}
- client_destroy(c);
+ destroy_client(c);
return;
}
if (c->mode == '?') {
return;
default:
moan("bad client mode `%c'", buf[0]);
- client_destroy(c);
+ destroy_client(c);
return;
}
}
/*----- Main daemon -------------------------------------------------------*/
-static void done_slip_dribble(dribbler *d, int err, void *p)
+static void done_slip_dribble(dribbler *d, int err, void *hunoz)
{
if (!err)
reasons--;
static int timerflag;
-static void conndrip(struct timeval *tv, void *p)
+static void conndrip(struct timeval *tv, void *hunoz)
{
conninfo *c, *cc;
/* --- Sinking (glug glug) --- */
-static void sink_close(gobbler *g, int err, void *p)
+static void close_sink(gobbler *g, int err, void *p)
{
static char baton[4] = "/-\\|";
static int pos = 0;
connrecycle(c);
return;
}
- make_gobbler(fd, sink_close, c);
+ make_gobbler(fd, close_sink, c);
}
static void sink(void) { connloop(sink_connected); }
/* --- Flooding --- */
-static void flood_close(dribbler *d, int err, void *p)
+static void close_flood(dribbler *d, int err, void *p)
{
conninfo *c = p;
for (i = 4; i < FLOOD_PKSZ; i++)
pn->buf[i + 1] = i & 0xff;
seq++;
- d = make_dribbler(fd, flood_close, c);
+ d = make_dribbler(fd, close_flood, c);
enqueue_dribble(d, pn);
}