From 9d3f8fbdf112ade82ecdbaac18e2ef47faadac9d Mon Sep 17 00:00:00 2001 From: malc Date: Mon, 13 Feb 2012 04:34:12 +0400 Subject: [PATCH] Refactor --- link.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/link.c b/link.c index 97d5f67..4c23e9d 100644 --- a/link.c +++ b/link.c @@ -418,21 +418,7 @@ static int hasdata (void) return avail > 0; } -static int readlen (void) -{ - ssize_t n; - unsigned char p[4]; - - n = read (state.cr, (char *) p, 4); - if (n != 4) { - if (!n) errx (1, "EOF while reading length"); - err (1, "read %zd", n); - } - - return (p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3]; -} - -static void readdata (char *p, int size) +static void readdata (void *p, int size) { ssize_t n; @@ -443,6 +429,14 @@ static void readdata (char *p, int size) } } +static int readlen (void) +{ + unsigned char p[4]; + + readdata (p, 4); + return (p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3]; +} + static void writedata (char *p, int size) { char buf[4]; -- 2.11.4.GIT