shithub: neoventi

Info  •  Files  •  Log  •  Branches

minor cleanup

--- a/neoventi.h

+++ b/neoventi.h

@@ -2,6 +2,8 @@

 #define	U16GET(p)	(((p)[0]<<8)|(p)[1])

 #define	U32GET(p)	((u32int)(((p)[0]<<24)|((p)[1]<<16)|((p)[2]<<8)|(p)[3]))

 #define	U64GET(p)	(((u64int)U32GET(p)<<32)|(u64int)U32GET((p)+4))

+#define	U16PUT(p,v)	(p)[0]=(v)>>8;(p)[1]=(v)

+

 #define MACHINE "kaladin"

 enum {

--- a/server.c

+++ b/server.c

@@ -20,10 +20,8 @@

 	va_end(args);

 	if(tbuf != nil){

 		len = snprint(tbuf+6, 0x10000, "neoventi: %r");

-		tbuf[4] = len >> 8;

-		tbuf[5] = len & 0xFF;

-		len += 4;

-		vtsend(conn, tbuf, len, VtRerror, 1);

+		U16PUT(tbuf+4, len);

+		vtsend(conn, tbuf, len+4, VtRerror, 1);

 	}

 	longjmp(conn.bounce, 1);

 }

@@ -68,8 +66,7 @@

 static void

 vtsend(VtConn conn, char *buf, u16int size, u8int tag, int drop)

 {

-	buf[0] = size>>8;

-	buf[1] = size&0xFF;

+	U16PUT(buf, size);

 	buf[2] = tag;

 	if(write(conn.fd, buf, size+2) != size+2){

 		if(drop)