chiark
/
gitweb
/
~mdw
/
tripe
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
01d12d8
)
uslip/uslip.c: Be consistent about `VERB_NOUN' function naming.
author
Mark Wooding
<mdw@distorted.org.uk>
Mon, 17 Apr 2017 23:39:24 +0000
(
00:39
+0100)
committer
Mark Wooding
<mdw@distorted.org.uk>
Sun, 23 Apr 2017 03:13:15 +0000
(
04:13
+0100)
uslip/uslip.c
patch
|
blob
|
blame
|
history
diff --git
a/uslip/uslip.c
b/uslip/uslip.c
index 74a5b17eb84ff8547b8b5d6cc7b3fbe126e361a7..8892cb804abd34434b7fe08d41fa42c8c9689a4c 100644
(file)
--- a/
uslip/uslip.c
+++ b/
uslip/uslip.c
@@
-195,10
+195,10
@@
static void destroy_pkq(pkq *q)
* calls a user-supplied calback function, and quits.
*/
* 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; } }
{ 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)
{
static void do_gobble_in(int fd, unsigned mode, void *p)
{
@@
-213,12
+213,12
@@
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);
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);
break;
}
} else if (n == 0) {
if (g->done) g->done(g, 0, g->p);
-
gobbler_close
(g);
+
close_gobbler
(g);
break;
}
}
break;
}
}
@@
-320,7
+320,7
@@
static void done_client_dribble(dribbler *d, int err, void *p)
{
if (err)
moan("write (client): %s", strerror(err));
{
if (err)
moan("write (client): %s", strerror(err));
-
gobbler_destroy
(p);
+
destroy_gobbler
(p);
destroy_dribbler(d);
reasons--;
}
destroy_dribbler(d);
reasons--;
}
@@
-345,7
+345,7
@@
static void dequeue_to_waiter(void)
}
}
}
}
-static void
client_destroy
(client *c)
+static void
destroy_client
(client *c)
{
sel_rmfile(&c->f);
close(c->f.fd);
{
sel_rmfile(&c->f);
close(c->f.fd);
@@
-374,7
+374,7
@@
static void do_client_in(int fd, unsigned mode, void *p)
break;
else {
moan("read (client): %s", strerror(errno));
break;
else {
moan("read (client): %s", strerror(errno));
-
client_destroy
(c);
+
destroy_client
(c);
return;
}
} else if (n == 0) {
return;
}
} else if (n == 0) {
@@
-383,7
+383,7
@@
static void do_client_in(int fd, unsigned mode, void *p)
if (enqueue_dribble(dribble_out, make_pkqnode(c->d.buf, c->d.len)))
reasons++;
}
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;
}
if (c->mode == '?') {
@@
-405,7
+405,7
@@
static void do_client_in(int fd, unsigned mode, void *p)
return;
default:
moan("bad client mode `%c'", buf[0]);
return;
default:
moan("bad client mode `%c'", buf[0]);
-
client_destroy
(c);
+
destroy_client
(c);
return;
}
}
return;
}
}
@@
-759,7
+759,7
@@
static void connloop(void (*connected)(int, conninfo *))
/* --- Sinking (glug glug) --- */
/* --- 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;
{
static char baton[4] = "/-\\|";
static int pos = 0;
@@
-796,14
+796,14
@@
static void sink_connected(int fd, conninfo *c)
connrecycle(c);
return;
}
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 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;
{
conninfo *c = p;
@@
-828,7
+828,7
@@
static void flood_connected(int fd, conninfo *c)
for (i = 4; i < FLOOD_PKSZ; i++)
pn->buf[i + 1] = i & 0xff;
seq++;
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);
}
enqueue_dribble(d, pn);
}