ref: 974bed349e6ca6ec5413f766ccdd32bf3eb69e4c
parent: 43b4aa220b24cb13b45189c7eb3bbf01ac999d63
author: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
date: Tue Mar 31 16:43:16 EDT 2026
remove underscores from test function names (Plan 9 style) Agent-Logs-Url: https://github.com/yrk-lab/rd/sessions/f75a5c33-83a8-4ad9-a123-563c6a8b1abb Co-authored-by: yrk-lab <11537279+yrk-lab@users.noreply.github.com>
--- a/aud_test.c
+++ b/aud_test.c
@@ -4,8 +4,8 @@
int audiotests(void);
-static int testaudio_getfmt(void);
-static int testaudio_putfmt(void);
+static int testaudiogetfmt(void);
+static int testaudioputfmt(void);
static char* pkt1 =
@@ -307,7 +307,7 @@
"4001";
static int
-testaudio_getfmt(){+testaudiogetfmt(){int n, nb;
uchar buf[1042];
Audiomsg r;
@@ -315,29 +315,29 @@
nb = dec16(buf, sizeof buf, pkt1, strlen(pkt1));
n = audiogetmsg(&r, buf, nb);
if(n < 0)
- sysfatal("testaudio_getfmt: unexpected error: %r\n");+ sysfatal("testaudiogetfmt: unexpected error: %r\n");if(n != 1042)
- sysfatal("testaudio_getfmt: len: want %d, got %d\n", 1042, n);+ sysfatal("testaudiogetfmt: len: want %d, got %d\n", 1042, n);if(r.type != Afmt)
- sysfatal("testaudio_getfmt: r.type: want 0x%x, got 0x%x\n",+ sysfatal("testaudiogetfmt: r.type: want 0x%x, got 0x%x\n",Afmt, r.type);
if(r.seq != 255)
- sysfatal("testaudio_getfmt: r.seq: want %ud, got %ud\n",+ sysfatal("testaudiogetfmt: r.seq: want %ud, got %ud\n",255, r.seq);
if(r.ver != 8)
- sysfatal("testaudio_getfmt: r.ver: want %ud, got %ud\n",+ sysfatal("testaudiogetfmt: r.ver: want %ud, got %ud\n",8, r.ver);
if(r.nfmt != 41)
- sysfatal("testaudio_getfmt: r.nfmt: want %ud, got %ud\n",+ sysfatal("testaudiogetfmt: r.nfmt: want %ud, got %ud\n",41, r.nfmt);
if(r.ndata != 1018)
- sysfatal("testaudio_getfmt: r.bdata: want %ud, got %ud\n",+ sysfatal("testaudiogetfmt: r.bdata: want %ud, got %ud\n",1018, r.ndata);
return 0;
}
static int
-testaudio_putfmt()
+testaudioputfmt()
{int n;
char *s, *want;
@@ -347,15 +347,15 @@
m.type = Afmt;
n = audioputmsg(buf, sizeof buf, &m);
if(n < 0)
- sysfatal("testaudio_putfmt: unexpected error: %r\n");+ sysfatal("testaudioputfmt: unexpected error: %r\n"); s = smprint("%.*H", n, buf);want = "07002600" "01000000" "FFFFFFFF" "00000100"
"00000100" "00050000" "01000200" "44AC0000"
"10B10200" "04001000" "0000";
if(strcmp(s, want) != 0)
- sysfatal("testaudio_putfmt: want %s, got %s", want, s);+ sysfatal("testaudioputfmt: want %s, got %s", want, s);if(n != strlen(want)/2)
- sysfatal("testaudio_putfmt: want %ld, got %d", strlen(want)/2, n);+ sysfatal("testaudioputfmt: want %ld, got %d", strlen(want)/2, n);return 0;
}
@@ -364,7 +364,7 @@
{ fmtinstall('H', encodefmt);- testaudio_getfmt();
- testaudio_putfmt();
+ testaudiogetfmt();
+ testaudioputfmt();
return 0;
}
--- a/egdi_test.c
+++ b/egdi_test.c
@@ -3,7 +3,7 @@
int egditests(void);
static int
-testegdi_nonstd(void)
+testegdinonstd(void)
{/*
* Non-standard order: Standard bit (bit 0) is not set.
@@ -16,12 +16,12 @@
memset(&up, 0, sizeof up);
n = getfupd(&up, pkt, sizeof pkt);
if(n != 0)
- sysfatal("testegdi_nonstd: consumed: want 0, got %d", n);+ sysfatal("testegdinonstd: consumed: want 0, got %d", n);return 0;
}
static int
-testegdi_scrblt(void)
+testegdiscrblt(void)
{/*
* ScrBlt primary order, NewOrder, SameClipping, all fields set.
@@ -51,20 +51,20 @@
memset(&up, 0, sizeof up);
n = getfupd(&up, pkt, sizeof pkt);
if(n != (int)sizeof pkt)
- sysfatal("testegdi_scrblt: consumed: want %d, got %d", (int)sizeof pkt, n);+ sysfatal("testegdiscrblt: consumed: want %d, got %d", (int)sizeof pkt, n);if(up.type != Uscrblt)
- sysfatal("testegdi_scrblt: type: want %d, got %d", Uscrblt, up.type);+ sysfatal("testegdiscrblt: type: want %d, got %d", Uscrblt, up.type);if(up.x != 10 || up.y != 20)
- sysfatal("testegdi_scrblt: pos: want (10,20), got (%d,%d)", up.x, up.y);+ sysfatal("testegdiscrblt: pos: want (10,20), got (%d,%d)", up.x, up.y);if(up.xsz != 100 || up.ysz != 100)
- sysfatal("testegdi_scrblt: size: want (100,100), got (%d,%d)", up.xsz, up.ysz);+ sysfatal("testegdiscrblt: size: want (100,100), got (%d,%d)", up.xsz, up.ysz);if(up.sx != 5 || up.sy != 15)
- sysfatal("testegdi_scrblt: src: want (5,15), got (%d,%d)", up.sx, up.sy);+ sysfatal("testegdiscrblt: src: want (5,15), got (%d,%d)", up.sx, up.sy);return 0;
}
static int
-testegdi_scrblt_clipped(void)
+testegdiscrblclip(void)
{/*
* ScrBlt with Clipped flag set.
@@ -98,20 +98,20 @@
memset(&up, 0, sizeof up);
n = getfupd(&up, pkt, sizeof pkt);
if(n != (int)sizeof pkt)
- sysfatal("testegdi_scrblt_clipped: consumed: want %d, got %d", (int)sizeof pkt, n);+ sysfatal("testegdiscrblclip: consumed: want %d, got %d", (int)sizeof pkt, n);if(up.type != Uscrblt)
- sysfatal("testegdi_scrblt_clipped: type: want %d, got %d", Uscrblt, up.type);+ sysfatal("testegdiscrblclip: type: want %d, got %d", Uscrblt, up.type);if(up.x != 10 || up.y != 20)
- sysfatal("testegdi_scrblt_clipped: pos: want (10,20), got (%d,%d)", up.x, up.y);+ sysfatal("testegdiscrblclip: pos: want (10,20), got (%d,%d)", up.x, up.y);if(up.xsz != 100 || up.ysz != 80)
- sysfatal("testegdi_scrblt_clipped: size: want (100,80), got (%d,%d)", up.xsz, up.ysz);+ sysfatal("testegdiscrblclip: size: want (100,80), got (%d,%d)", up.xsz, up.ysz);if(up.sx != 5 || up.sy != 15)
- sysfatal("testegdi_scrblt_clipped: src: want (5,15), got (%d,%d)", up.sx, up.sy);+ sysfatal("testegdiscrblclip: src: want (5,15), got (%d,%d)", up.sx, up.sy);return 0;
}
static int
-testegdi_memblt(void)
+testegdimemblt(void)
{/*
* MemBlt primary order, NewOrder, SameClipping, all fields set.
@@ -141,28 +141,28 @@
memset(&up, 0, sizeof up);
n = getfupd(&up, pkt, sizeof pkt);
if(n != (int)sizeof pkt)
- sysfatal("testegdi_memblt: consumed: want %d, got %d", (int)sizeof pkt, n);+ sysfatal("testegdimemblt: consumed: want %d, got %d", (int)sizeof pkt, n);if(up.type != Umemblt)
- sysfatal("testegdi_memblt: type: want %d, got %d", Umemblt, up.type);+ sysfatal("testegdimemblt: type: want %d, got %d", Umemblt, up.type);if(up.cid != 1)
- sysfatal("testegdi_memblt: cid: want 1, got %d", up.cid);+ sysfatal("testegdimemblt: cid: want 1, got %d", up.cid);if(up.coff != 5)
- sysfatal("testegdi_memblt: coff: want 5, got %d", up.coff);+ sysfatal("testegdimemblt: coff: want 5, got %d", up.coff);if(up.x != 50 || up.y != 60)
- sysfatal("testegdi_memblt: pos: want (50,60), got (%d,%d)", up.x, up.y);+ sysfatal("testegdimemblt: pos: want (50,60), got (%d,%d)", up.x, up.y);if(up.xm != 149 || up.ym != 159)
- sysfatal("testegdi_memblt: max: want (149,159), got (%d,%d)", up.xm, up.ym);+ sysfatal("testegdimemblt: max: want (149,159), got (%d,%d)", up.xm, up.ym);if(up.xsz != 100 || up.ysz != 100)
- sysfatal("testegdi_memblt: size: want (100,100), got (%d,%d)", up.xsz, up.ysz);+ sysfatal("testegdimemblt: size: want (100,100), got (%d,%d)", up.xsz, up.ysz);if(up.sx != 10 || up.sy != 20)
- sysfatal("testegdi_memblt: src: want (10,20), got (%d,%d)", up.sx, up.sy);+ sysfatal("testegdimemblt: src: want (10,20), got (%d,%d)", up.sx, up.sy);if(up.clipped != 0)
- sysfatal("testegdi_memblt: clipped: want 0, got %d", up.clipped);+ sysfatal("testegdimemblt: clipped: want 0, got %d", up.clipped);return 0;
}
static int
-testegdi_memblt_clipped(void)
+testegdimembltclip(void)
{/*
* MemBlt with Clipped flag set.
@@ -199,20 +199,20 @@
memset(&up, 0, sizeof up);
n = getfupd(&up, pkt, sizeof pkt);
if(n != (int)sizeof pkt)
- sysfatal("testegdi_memblt_clipped: consumed: want %d, got %d", (int)sizeof pkt, n);+ sysfatal("testegdimembltclip: consumed: want %d, got %d", (int)sizeof pkt, n);if(up.type != Umemblt)
- sysfatal("testegdi_memblt_clipped: type: want %d, got %d", Umemblt, up.type);+ sysfatal("testegdimembltclip: type: want %d, got %d", Umemblt, up.type);if(up.clipped != 1)
- sysfatal("testegdi_memblt_clipped: clipped: want 1, got %d", up.clipped);+ sysfatal("testegdimembltclip: clipped: want 1, got %d", up.clipped);if(up.cx != 0 || up.cy != 0)
- sysfatal("testegdi_memblt_clipped: clip pos: want (0,0), got (%d,%d)", up.cx, up.cy);+ sysfatal("testegdimembltclip: clip pos: want (0,0), got (%d,%d)", up.cx, up.cy);if(up.cxsz != 200 || up.cysz != 100)
- sysfatal("testegdi_memblt_clipped: clip size: want (200,100), got (%d,%d)", up.cxsz, up.cysz);+ sysfatal("testegdimembltclip: clip size: want (200,100), got (%d,%d)", up.cxsz, up.cysz);return 0;
}
static int
-testegdi_cmapcache(void)
+testegdicmapcache(void)
{/*
* CacheCmap secondary order: cache a 256-entry colour map.
@@ -240,20 +240,20 @@
memset(&up, 0, sizeof up);
n = getfupd(&up, pkt, sizeof pkt);
if(n != 1033)
- sysfatal("testegdi_cmapcache: consumed: want 1033, got %d", n);+ sysfatal("testegdicmapcache: consumed: want 1033, got %d", n);if(up.type != Umcache)
- sysfatal("testegdi_cmapcache: type: want %d, got %d", Umcache, up.type);+ sysfatal("testegdicmapcache: type: want %d, got %d", Umcache, up.type);if(up.cid != 3)
- sysfatal("testegdi_cmapcache: cid: want 3, got %d", up.cid);+ sysfatal("testegdicmapcache: cid: want 3, got %d", up.cid);if(up.nbytes != 1024)
- sysfatal("testegdi_cmapcache: nbytes: want 1024, got %d", up.nbytes);+ sysfatal("testegdicmapcache: nbytes: want 1024, got %d", up.nbytes);if(up.bytes != pkt+9)
- sysfatal("testegdi_cmapcache: bytes ptr: want pkt+9, got something else");+ sysfatal("testegdicmapcache: bytes ptr: want pkt+9, got something else");return 0;
}
static int
-testegdi_imgcache2(void)
+testegdiimgcache2(void)
{/*
* CacheImage2 secondary order (uncompressed, no persistent key).
@@ -285,26 +285,26 @@
memset(&up, 0, sizeof up);
n = getfupd(&up, pkt, sizeof pkt);
if(n != (int)sizeof pkt)
- sysfatal("testegdi_imgcache2: consumed: want %d, got %d", (int)sizeof pkt, n);+ sysfatal("testegdiimgcache2: consumed: want %d, got %d", (int)sizeof pkt, n);if(up.type != Uicache)
- sysfatal("testegdi_imgcache2: type: want %d, got %d", Uicache, up.type);+ sysfatal("testegdiimgcache2: type: want %d, got %d", Uicache, up.type);if(up.cid != 0)
- sysfatal("testegdi_imgcache2: cid: want 0, got %d", up.cid);+ sysfatal("testegdiimgcache2: cid: want 0, got %d", up.cid);if(up.coff != 2)
- sysfatal("testegdi_imgcache2: coff: want 2, got %d", up.coff);+ sysfatal("testegdiimgcache2: coff: want 2, got %d", up.coff);if(up.xsz != 8 || up.ysz != 8)
- sysfatal("testegdi_imgcache2: dim: want (8,8), got (%d,%d)", up.xsz, up.ysz);+ sysfatal("testegdiimgcache2: dim: want (8,8), got (%d,%d)", up.xsz, up.ysz);if(up.nbytes != 32)
- sysfatal("testegdi_imgcache2: nbytes: want 32, got %d", up.nbytes);+ sysfatal("testegdiimgcache2: nbytes: want 32, got %d", up.nbytes);if(up.bytes != pkt+10)
- sysfatal("testegdi_imgcache2: bytes ptr: want pkt+10, got something else");+ sysfatal("testegdiimgcache2: bytes ptr: want pkt+10, got something else");if(up.iscompr != 0)
- sysfatal("testegdi_imgcache2: iscompr: want 0, got %d", up.iscompr);+ sysfatal("testegdiimgcache2: iscompr: want 0, got %d", up.iscompr);return 0;
}
static int
-testegdi_secondary_unsupported(void)
+testegdisecunsup(void)
{/*
* Secondary order with an xorder value not present in auxtab
@@ -327,7 +327,7 @@
memset(&up, 0, sizeof up);
n = getfupd(&up, pkt, sizeof pkt);
if(n != 20)
- sysfatal("testegdi_secondary_unsupported: consumed: want 20, got %d", n);+ sysfatal("testegdisecunsup: consumed: want 20, got %d", n);return 0;
}
@@ -334,13 +334,13 @@
int
egditests(void)
{- testegdi_nonstd();
- testegdi_scrblt();
- testegdi_scrblt_clipped();
- testegdi_memblt();
- testegdi_memblt_clipped();
- testegdi_cmapcache();
- testegdi_imgcache2();
- testegdi_secondary_unsupported();
+ testegdinonstd();
+ testegdiscrblt();
+ testegdiscrblclip();
+ testegdimemblt();
+ testegdimembltclip();
+ testegdicmapcache();
+ testegdiimgcache2();
+ testegdisecunsup();
return 0;
}
--- a/mppc_test.c
+++ b/mppc_test.c
@@ -3,7 +3,7 @@
int mppctests(void);
static int
-testuncomp_preset(void)
+testuncomppreset(void)
{/* Preset with no Pcompress: history is reset and input returned unchanged */
uchar input[] = {0x12, 0x34};@@ -12,16 +12,16 @@
out = uncomp(input, 2, 0x80, &psize); /* flags=Preset */
if(out == nil)
- sysfatal("testuncomp_preset: unexpected error: %r");+ sysfatal("testuncomppreset: unexpected error: %r");if(out != input)
- sysfatal("testuncomp_preset: expected input buffer returned unchanged");+ sysfatal("testuncomppreset: expected input buffer returned unchanged");if(psize != 2)
- sysfatal("testuncomp_preset: psize: want 2, got %d", psize);+ sysfatal("testuncomppreset: psize: want 2, got %d", psize);return 0;
}
static int
-testuncomp_preset_lit7(void)
+testuncomppresetlit7(void)
{/*
* Preset + Pcompress: decompress two 7-bit literals.
@@ -33,16 +33,16 @@
out = uncomp(input, 2, 0x80|0x20, &psize); /* flags=Preset|Pcompress */
if(out == nil)
- sysfatal("testuncomp_preset_lit7: unexpected error: %r");+ sysfatal("testuncomppresetlit7: unexpected error: %r");if(psize != 2)
- sysfatal("testuncomp_preset_lit7: psize: want 2, got %d", psize);+ sysfatal("testuncomppresetlit7: psize: want 2, got %d", psize);if(out[0] != 'A' || out[1] != 'B')
- sysfatal("testuncomp_preset_lit7: data: want AB, got %c%c", out[0], out[1]);+ sysfatal("testuncomppresetlit7: data: want AB, got %c%c", out[0], out[1]);return 0;
}
static int
-testuncomp_lit8(void)
+testuncomplit8(void)
{/*
* Lit8 opcode (8K mode): value 0x80 encodes as the 9-bit sequence
@@ -54,16 +54,16 @@
out = uncomp(input, 2, 0x80|0x20, &psize); /* Preset|Pcompress */
if(out == nil)
- sysfatal("testuncomp_lit8: unexpected error: %r");+ sysfatal("testuncomplit8: unexpected error: %r");if(psize != 1)
- sysfatal("testuncomp_lit8: psize: want 1, got %d", psize);+ sysfatal("testuncomplit8: psize: want 1, got %d", psize);if(out[0] != 0x80)
- sysfatal("testuncomp_lit8: out[0]: want 0x80, got 0x%02x", out[0]);+ sysfatal("testuncomplit8: out[0]: want 0x80, got 0x%02x", out[0]);return 0;
}
static int
-testuncomp_off6(void)
+testuncompoff6(void)
{/*
* Off6 opcode (8K mode): 4 Lit7 'A' literals set up 4 bytes of history,
@@ -77,17 +77,17 @@
out = uncomp(input, 6, 0x80|0x20, &psize); /* Preset|Pcompress */
if(out == nil)
- sysfatal("testuncomp_off6: unexpected error: %r");+ sysfatal("testuncompoff6: unexpected error: %r");if(psize != 7)
- sysfatal("testuncomp_off6: psize: want 7, got %d", psize);+ sysfatal("testuncompoff6: psize: want 7, got %d", psize);for(i = 0; i < psize; i++)
if(out[i] != 'A')
- sysfatal("testuncomp_off6: out[%d]: want 'A', got 0x%02x", i, out[i]);+ sysfatal("testuncompoff6: out[%d]: want 'A', got 0x%02x", i, out[i]);return 0;
}
static int
-testuncomp_off8(void)
+testuncompoff8(void)
{/*
* Off8 opcode (8K mode): 64 Lit7 'A' literals fill 64 bytes of history,
@@ -104,17 +104,17 @@
input[65] = 0x00;
out = uncomp(input, 66, 0x80|0x20, &psize); /* Preset|Pcompress */
if(out == nil)
- sysfatal("testuncomp_off8: unexpected error: %r");+ sysfatal("testuncompoff8: unexpected error: %r");if(psize != 67)
- sysfatal("testuncomp_off8: psize: want 67, got %d", psize);+ sysfatal("testuncompoff8: psize: want 67, got %d", psize);for(i = 0; i < psize; i++)
if(out[i] != 'A')
- sysfatal("testuncomp_off8: out[%d]: want 'A', got 0x%02x", i, out[i]);+ sysfatal("testuncompoff8: out[%d]: want 'A', got 0x%02x", i, out[i]);return 0;
}
static int
-testuncomp_off13(void)
+testuncompoff13(void)
{/*
* Off13 opcode (8K mode): 320 Lit7 'A' literals fill 320 bytes of history,
@@ -135,17 +135,17 @@
input[322] = 0x00;
out = uncomp(input, 323, 0x80|0x20, &psize); /* Preset|Pcompress */
if(out == nil)
- sysfatal("testuncomp_off13: unexpected error: %r");+ sysfatal("testuncompoff13: unexpected error: %r");if(psize != 323)
- sysfatal("testuncomp_off13: psize: want 323, got %d", psize);+ sysfatal("testuncompoff13: psize: want 323, got %d", psize);for(i = 0; i < psize; i++)
if(out[i] != 'A')
- sysfatal("testuncomp_off13: out[%d]: want 'A', got 0x%02x", i, out[i]);+ sysfatal("testuncompoff13: out[%d]: want 'A', got 0x%02x", i, out[i]);return 0;
}
static int
-testuncomp_off11(void)
+testuncompoff11(void)
{/*
* Off11 opcode (64K mode): 320 Lit7 'A' literals fill 320 bytes of history,
@@ -165,17 +165,17 @@
input[321] = 0x00;
out = uncomp(input, 322, 0x80|0x20|0x01, &psize); /* Preset|Pcompress|Pbulk64 */
if(out == nil)
- sysfatal("testuncomp_off11: unexpected error: %r");+ sysfatal("testuncompoff11: unexpected error: %r");if(psize != 323)
- sysfatal("testuncomp_off11: psize: want 323, got %d", psize);+ sysfatal("testuncompoff11: psize: want 323, got %d", psize);for(i = 0; i < psize; i++)
if(out[i] != 'A')
- sysfatal("testuncomp_off11: out[%d]: want 'A', got 0x%02x", i, out[i]);+ sysfatal("testuncompoff11: out[%d]: want 'A', got 0x%02x", i, out[i]);return 0;
}
static int
-testuncomp_off16(void)
+testuncompoff16(void)
{/*
* Off16 opcode (64K mode): 2368 Lit7 'A' literals fill 2368 bytes of history,
@@ -192,7 +192,7 @@
input = malloc(2371);
if(input == nil)
- sysfatal("testuncomp_off16: malloc: %r");+ sysfatal("testuncompoff16: malloc: %r");memset(input, 0x41, 2368);
input[2368] = 0xC0;
input[2369] = 0x00;
@@ -200,17 +200,17 @@
out = uncomp(input, 2371, 0x80|0x20|0x01, &psize); /* Preset|Pcompress|Pbulk64 */
free(input);
if(out == nil)
- sysfatal("testuncomp_off16: unexpected error: %r");+ sysfatal("testuncompoff16: unexpected error: %r");if(psize != 2371)
- sysfatal("testuncomp_off16: psize: want 2371, got %d", psize);+ sysfatal("testuncompoff16: psize: want 2371, got %d", psize);for(i = 0; i < psize; i++)
if(out[i] != 'A')
- sysfatal("testuncomp_off16: out[%d]: want 'A', got 0x%02x", i, out[i]);+ sysfatal("testuncompoff16: out[%d]: want 'A', got 0x%02x", i, out[i]);return 0;
}
static int
-testuncomp_pfront(void)
+testuncomppfront(void)
{/*
* Pfront flag: resets the history write index to zero without clearing
@@ -224,22 +224,22 @@
out = uncomp(input1, 2, 0x80|0x20, &psize); /* Preset|Pcompress */
if(out == nil)
- sysfatal("testuncomp_pfront: call1: unexpected error: %r");+ sysfatal("testuncomppfront: call1: unexpected error: %r");if(psize != 2)
- sysfatal("testuncomp_pfront: call1: psize: want 2, got %d", psize);+ sysfatal("testuncomppfront: call1: psize: want 2, got %d", psize);psize = -1;
out = uncomp(input2, 2, 0x40|0x20, &psize); /* Pfront|Pcompress */
if(out == nil)
- sysfatal("testuncomp_pfront: call2: unexpected error: %r");+ sysfatal("testuncomppfront: call2: unexpected error: %r");if(psize != 2)
- sysfatal("testuncomp_pfront: call2: psize: want 2, got %d", psize);+ sysfatal("testuncomppfront: call2: psize: want 2, got %d", psize);if(out[0] != 'B' || out[1] != 'B')
- sysfatal("testuncomp_pfront: call2: data: want BB, got %c%c", out[0], out[1]);+ sysfatal("testuncomppfront: call2: data: want BB, got %c%c", out[0], out[1]);return 0;
}
static int
-testuncomp_eof_err(void)
+testuncompeof(void)
{/*
* Eof error: the compressed stream ends while decoding a Lit8 opcode.
@@ -252,12 +252,12 @@
out = uncomp(input, 1, 0x80|0x20, &psize); /* Preset|Pcompress */
if(out != nil)
- sysfatal("testuncomp_eof_err: expected nil on truncated input, got non-nil");+ sysfatal("testuncompeof: expected nil on truncated input, got non-nil");return 0;
}
static int
-testuncomp_bad_length(void)
+testuncompbadlen(void)
{/*
* Bad length: Off6 with offset=0 followed by 12 consecutive 1-bits
@@ -271,7 +271,7 @@
out = uncomp(input, 3, 0x80|0x20, &psize); /* Preset|Pcompress */
if(out != nil)
- sysfatal("testuncomp_bad_length: expected nil on bad length, got non-nil");+ sysfatal("testuncompbadlen: expected nil on bad length, got non-nil");return 0;
}
@@ -278,16 +278,16 @@
int
mppctests(void)
{- testuncomp_preset();
- testuncomp_preset_lit7();
- testuncomp_lit8();
- testuncomp_off6();
- testuncomp_off8();
- testuncomp_off13();
- testuncomp_off11();
- testuncomp_off16();
- testuncomp_pfront();
- testuncomp_eof_err();
- testuncomp_bad_length();
+ testuncomppreset();
+ testuncomppresetlit7();
+ testuncomplit8();
+ testuncompoff6();
+ testuncompoff8();
+ testuncompoff13();
+ testuncompoff11();
+ testuncompoff16();
+ testuncomppfront();
+ testuncompeof();
+ testuncompbadlen();
return 0;
}
--- a/msg_test.c
+++ b/msg_test.c
@@ -1,7 +1,7 @@
#include "msg.c"
static int
-testputmsg_xconnect(void){+testputmsgxconnect(void){int n;
char *s, *want;
uchar buf[1042];
@@ -12,11 +12,11 @@
n = putmsg(buf, sizeof buf, &m);
if(n < 0)
- sysfatal("testputmsg_xconnect: unexpected error: %r\n");+ sysfatal("testputmsgxconnect: unexpected error: %r\n"); s = smprint("%.*H", n, buf);want = "0300002722E00000000000436F6F6B69653A206D737473686173683D780D0A0100080001000000";
if(strcmp(s, want) != 0)
- sysfatal("testputmsg_xconnect: want %s, got %s", want, s);+ sysfatal("testputmsgxconnect: want %s, got %s", want, s);free(s);
return 0;
@@ -23,7 +23,7 @@
}
static int
-testputmsg_xhangup(void){+testputmsgxhangup(void){int n;
char *s, *want;
uchar buf[1042];
@@ -33,10 +33,10 @@
n = putmsg(buf, sizeof buf, &m);
if(n < 0)
- sysfatal("testputmsg_xhangup: unexpected error: %r\n");+ sysfatal("testputmsgxhangup: unexpected error: %r\n"); s = smprint("%.*H", n, buf);if(strcmp(s, want = "03000007028080") != 0)
- sysfatal("testputmsg_xhangup: want %s, got %s", want, s);+ sysfatal("testputmsgxhangup: want %s, got %s", want, s);free(s);
return 0;
@@ -43,7 +43,7 @@
}
static int
-testputmsg_mattach(void){+testputmsgmattach(void){int n;
char *s, *want;
uchar buf[1042];
@@ -53,10 +53,10 @@
n = putmsg(buf, sizeof buf, &m);
if(n < 0)
- sysfatal("testputmsg_mattach: unexpected error: %r\n");+ sysfatal("testputmsgmattach: unexpected error: %r\n"); s = smprint("%.*H", n, buf);if(strcmp(s, want = "0300000802F08028") != 0)
- sysfatal("testputmsg_mattach: want %s, got %s", want, s);+ sysfatal("testputmsgmattach: want %s, got %s", want, s);free(s);
return 0;
@@ -63,7 +63,7 @@
}
static int
-testputmsg_mjoin(void){+testputmsgmjoin(void){int n;
char *s, *want;
uchar buf[1042];
@@ -75,10 +75,10 @@
n = putmsg(buf, sizeof buf, &m);
if(n < 0)
- sysfatal("testputmsg_mjoin: unexpected error: %r\n");+ sysfatal("testputmsgmjoin: unexpected error: %r\n"); s = smprint("%.*H", n, buf);if(strcmp(s, want = "0300000C02F08038DEADBEEF") != 0)
- sysfatal("testputmsg_mjoin: want %s, got %s", want, s);+ sysfatal("testputmsgmjoin: want %s, got %s", want, s);free(s);
return 0;
@@ -85,7 +85,7 @@
}
static int
-testputmsg_merectdom(void){+testputmsgmerectdom(void){int n;
char *s, *want;
uchar buf[1042];
@@ -94,11 +94,11 @@
m.type = Merectdom;
n = putmsg(buf, sizeof buf, &m);
if(n < 0)
- sysfatal("testputmsg_merectdom: unexpected error: %r\n");+ sysfatal("testputmsgmerectdom: unexpected error: %r\n"); s = smprint("%.*H", n, buf);if(strcmp(s, want = "0300000C02F0800400010001") != 0)
- sysfatal("testputmsg_merectdom: want %s, got %s", want, s);+ sysfatal("testputmsgmerectdom: want %s, got %s", want, s);free(s);
return 0;
@@ -106,7 +106,7 @@
static int
-testputmsg_mconnect(void){+testputmsgmconnect(void){int n;
char *s, *want;
uchar buf[1024];
@@ -129,14 +129,14 @@
n = putmsg(buf, sizeof buf, &m);
if(n < 0)
- sysfatal("testputmsg_mconnect: unexpected error: %r\n");+ sysfatal("testputmsgmconnect: unexpected error: %r\n");want = "030001A602F0807F6582019A0401010401010101FF30200202002202020002020200000202000102020000020200010202FFFF020200023020020200010202000102020001020200010202000002020001020204200202000230200202FFFF0202FFFF0202FFFF0202000102020000020200010202FFFF0202000204820127000500147C0001811E000800100001C00044756361811001C0D800040008000004000301CA03AA09040000280A00005400530043004C00490045004E0054002D00540045005300540000000000000004000000000000000C0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001CA01000000000018000F0003000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000007000100000002C00C00000000000000000004C00C00090000000000000003C0200002000000434C49505244520080000000524450445200000080000000";
s = smprint("%.*H", n, buf); if(strcmp(s, want) != 0){- fprint(2, "testputmsg_mconnect: want '%s', got '%s'\n", want, s);
- sysfatal("testputmsg_mconnect");+ fprint(2, "testputmsgmconnect: want '%s', got '%s'\n", want, s);
+ sysfatal("testputmsgmconnect");}
free(s);
return 0;
@@ -144,7 +144,7 @@
}
static int
-testputmsg_dclientinfo(void){+testputmsgdclientinfo(void){int n;
char *s, *want;
uchar buf[4*1024];
@@ -161,14 +161,14 @@
n = putmsg(buf, sizeof buf, &m);
if(n < 0)
- sysfatal("testputmsg_dclientinfo: unexpected error: %r\n");+ sysfatal("testputmsgdclientinfo: unexpected error: %r\n");want = "0300013302F08064BEEF03EB7081244000000000000000BB0300000E0010000C0018000600540045005300540044004F004D00000074006500730074007500730065007200000073006500630072006500740000006500780070006C006F007200650072002E00650078006500000043003A005C00000002000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000CE000000";
s = smprint("%.*H", n, buf); if(strcmp(s, want) != 0){- fprint(2, "testputmsg_dclientinfo: want '%s', got '%s'\n", want, s);
- sysfatal("testputmsg_dclientinfo");+ fprint(2, "testputmsgdclientinfo: want '%s', got '%s'\n", want, s);
+ sysfatal("testputmsgdclientinfo");}
free(s);
return 0;
@@ -176,7 +176,7 @@
}
static int
-testputmsg_mactivated(void){+testputmsgmactivated(void){int n;
char *s, *want;
uchar buf[1042];
@@ -191,14 +191,14 @@
n = putmsg(buf, sizeof buf, &m);
if(n < 0)
- sysfatal("testputmsg_mactivated: unexpected error: %r\n");+ sysfatal("testputmsgmactivated: unexpected error: %r\n");want = "0300018402F08064BBBB03EB70817575011300BBBBCCCC0000AAAA07005E01506C616E2039000800000001001800000000000002000200000504000000000000000002001E000000010001000100000458020000010001000000010000000002030058000000000000000000000000000000000000000000010014000000010000006A000000010100000000000000000000000000000000000000000000000000000000A1060000000000000084030000000000E40004001300280000000003780000007800000050010000000000000000000000000000000000000000000008000800000014000D005800110000000904000004000000000000000C000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000C00080000000000140008000000000010003400FE000400FE000400FE000800FE000800FE001000FE002000FE004000FE008000FE000001400000080001000100000000";
s = smprint("%.*H", n, buf); if(strcmp(s, want) != 0){- fprint(2, "testputmsg_mactivated: want '%s', got '%s'\n", want, s);
- sysfatal("testputmsg_mactivated");+ fprint(2, "testputmsgmactivated: want '%s', got '%s'\n", want, s);
+ sysfatal("testputmsgmactivated");}
free(s);
return 0;
@@ -206,7 +206,7 @@
}
static int
-testputmsg_mvchan(void){+testputmsgmvchan(void){int n;
char *s, *want;
uchar buf[1042];
@@ -227,19 +227,19 @@
n = putmsg(buf, sizeof buf, &m);
if(n < 0)
- sysfatal("testputmsg_mvchan: unexpected error: %r\n");+ sysfatal("testputmsgmvchan: unexpected error: %r\n");want = "0300001E02F080641111222270800F070000001300000061626364656667";
s = smprint("%.*H", n, buf);if(strcmp(s, want) != 0)
- sysfatal("testputmsg_mvchan: want '%s', got '%s'", want, s);+ sysfatal("testputmsgmvchan: want '%s', got '%s'", want, s);free(s);
return 0;
}
static int
-testputmsg_async(void){+testputmsgasync(void){int n;
char *s, *want;
uchar buf[512];
@@ -252,19 +252,19 @@
n = putmsg(buf, sizeof buf, &m);
if(n < 0)
- sysfatal("testputmsg_async: unexpected error: %r\n");+ sysfatal("testputmsgasync: unexpected error: %r\n");want = "0300002502F08064222203EB70801616001700222233330000000116001F00000001001111";
s = smprint("%.*H", n, buf);if(strcmp(s, want) != 0)
- sysfatal("testputmsg_async: want '%s', got '%s'", want, s);+ sysfatal("testputmsgasync: want '%s', got '%s'", want, s);free(s);
return 0;
}
static int
-testputmsg_actl_cooperate(void){+testputmsgactlcoop(void){int n;
char *s, *want;
uchar buf[1024];
@@ -272,19 +272,19 @@
n = putmsg(buf, sizeof buf, &m);
if(n < 0)
- sysfatal("testputmsg_actl_cooperate: unexpected error: %r\n");+ sysfatal("testputmsgactlcoop: unexpected error: %r\n");want = "0300002902F08064111103EB70801A1A00170011112222000000011A00140000000400000000000000";
s = smprint("%.*H", n, buf);if(strcmp(s, want) != 0)
- sysfatal("testputmsg_actl_cooperate: want '%s', got '%s'", want, s);+ sysfatal("testputmsgactlcoop: want '%s', got '%s'", want, s);free(s);
return 0;
}
static int
-testputmsg_actl_reqctl(void){+testputmsgactlreqctl(void){int n;
char *s, *want;
uchar buf[1024];
@@ -292,19 +292,19 @@
n = putmsg(buf, sizeof buf, &m);
if(n < 0)
- sysfatal("testputmsg_actl_reqctl: unexpected error: %r\n");+ sysfatal("testputmsgactlreqctl: unexpected error: %r\n");want = "0300002902F08064333303EB70801A1A00170033334444000000011A00140000000100000000000000";
s = smprint("%.*H", n, buf);if(strcmp(s, want) != 0)
- sysfatal("testputmsg_actl_reqctl: want '%s', got '%s'", want, s);+ sysfatal("testputmsgactlreqctl: want '%s', got '%s'", want, s);free(s);
return 0;
}
static int
-testputmsg_afontls(void){+testputmsgafontls(void){int n;
char *s, *want;
uchar buf[1024];
@@ -312,19 +312,19 @@
n = putmsg(buf, sizeof buf, &m);
if(n < 0)
- sysfatal("testputmsg_afontls: unexpected error: %r\n");+ sysfatal("testputmsgafontls: unexpected error: %r\n");want = "0300002902F08064444403EB70801A1A00170044445555000000011A00270000000000000003003200";
s = smprint("%.*H", n, buf);if(strcmp(s, want) != 0)
- sysfatal("testputmsg_afontls: want '%s', got '%s'", want, s);+ sysfatal("testputmsgafontls: want '%s', got '%s'", want, s);free(s);
return 0;
}
static int
-testputmsg_ainput_sync(void){+testputmsgainputsync(void){int n;
char *s, *want;
uchar buf[1042];
@@ -341,13 +341,13 @@
n = putmsg(buf, sizeof buf, &m);
if(n < 0)
- sysfatal("testputmsg_ainput_sync: unexpected error: %r\n");+ sysfatal("testputmsgainputsync: unexpected error: %r\n");want = "0300003102F08064111103EB70802222001700111122220000000122001C00000001000000000000000000000000000000";
s = smprint("%.*H", n, buf);if(strcmp(s, want) != 0)
- sysfatal("testputmsg_ainput_sync: want '%s', got '%s'", want, s);+ sysfatal("testputmsgainputsync: want '%s', got '%s'", want, s);free(s);
return 0;
@@ -354,7 +354,7 @@
}
static int
-testputmsg_ainput_keycode(void){+testputmsgainputkey(void){int n;
char *s, *want;
uchar buf[1042];
@@ -374,13 +374,13 @@
n = putmsg(buf, sizeof buf, &m);
if(n < 0)
- sysfatal("testputmsg_ainput_keycode: unexpected error: %r\n");+ sysfatal("testputmsgainputkey: unexpected error: %r\n");want = "0300003102F08064111103EB70802222001700111122220000000122001C0000000100000033330000040044002A000000";
s = smprint("%.*H", n, buf);if(strcmp(s, want) != 0)
- sysfatal("testputmsg_ainput_keycode: want '%s', got '%s'", want, s);+ sysfatal("testputmsgainputkey: want '%s', got '%s'", want, s);free(s);
return 0;
@@ -387,7 +387,7 @@
}
static int
-testputmsg_lreq(void){+testputmsglreq(void){int n;
char *s, *want;
uchar buf[2*1024];
@@ -396,7 +396,7 @@
n = putmsg(buf, sizeof buf, &m);
if(n < 0)
- sysfatal("testputmsg_lreq: unexpected error: %r\n");+ sysfatal("testputmsglreq: unexpected error: %r\n");want =
// TPKT header
@@ -450,8 +450,8 @@
s = smprint("%.*H", n, buf); if(strcmp(s, want) != 0){- fprint(2, "testputmsg_lreq: want '%s', got '%s'\n", want, s);
- sysfatal("testputmsg_lreq");+ fprint(2, "testputmsglreq: want '%s', got '%s'\n", want, s);
+ sysfatal("testputmsglreq");}
free(s);
return 0;
@@ -458,7 +458,7 @@
}
static int
-testputmsg_lnolicense(void){+testputmsglnolicense(void){int n;
char *s, *want;
uchar buf[1024];
@@ -466,7 +466,7 @@
n = putmsg(buf, sizeof buf, &m);
if(n < 0)
- sysfatal("testputmsg_lnolicense: unexpected error: %r\n");+ sysfatal("testputmsglnolicense: unexpected error: %r\n");want =
"0300002302F08064111103EB70801480000000FF031000020000000100000004000000";
@@ -473,13 +473,13 @@
s = smprint("%.*H", n, buf);if(strcmp(s, want) != 0)
- sysfatal("testputmsg_lnolicense: want '%s', got '%s'", want, s);+ sysfatal("testputmsglnolicense: want '%s', got '%s'", want, s);free(s);
return 0;
}
static int
-testputmsg_dsupress(void){+testputmsgdsupress(void){int n;
char *s, *want;
uchar buf[512];
@@ -494,7 +494,7 @@
n = putmsg(buf, sizeof buf, &m);
if(n < 0)
- sysfatal("testputmsg_dsupress: unexpected error: %r\n");+ sysfatal("testputmsgdsupress: unexpected error: %r\n");want =
"0300002D02F08064222203EB70801E1E00170022223333000000011E00230000000100000000000000FF041F03";
@@ -501,7 +501,7 @@
s = smprint("%.*H", n, buf);if(strcmp(s, want) != 0)
- sysfatal("testputmsg_dsupress: want '%s', got '%s'", want, s);+ sysfatal("testputmsgdsupress: want '%s', got '%s'", want, s);free(s);
return 0;
}
@@ -508,7 +508,7 @@
static int
-testgetmsg_fp2(void)
+testgetmsgfp2(void)
{/* Fast-path update: 2-byte length header */
int n, nb;
@@ -519,18 +519,18 @@
nb = dec16(buf, sizeof buf, hex, strlen(hex));
n = getmsg(&m, buf, nb);
if(n <= 0)
- sysfatal("testgetmsg_fp2: unexpected error: %r");+ sysfatal("testgetmsgfp2: unexpected error: %r");if(m.type != Aupdate)
- sysfatal("testgetmsg_fp2: type: want %d, got %d", Aupdate, m.type);+ sysfatal("testgetmsgfp2: type: want %d, got %d", Aupdate, m.type);if(m.ndata != 4)
- sysfatal("testgetmsg_fp2: ndata: want 4, got %d", m.ndata);+ sysfatal("testgetmsgfp2: ndata: want 4, got %d", m.ndata);if(m.getshare != getshareF)
- sysfatal("testgetmsg_fp2: getshare: expected getshareF");+ sysfatal("testgetmsgfp2: getshare: expected getshareF");return 0;
}
static int
-testgetmsg_fp3(void)
+testgetmsgfp3(void)
{/* Fast-path update: 3-byte length header */
int n, nb;
@@ -541,18 +541,18 @@
nb = dec16(buf, sizeof buf, hex, strlen(hex));
n = getmsg(&m, buf, nb);
if(n <= 0)
- sysfatal("testgetmsg_fp3: unexpected error: %r");+ sysfatal("testgetmsgfp3: unexpected error: %r");if(m.type != Aupdate)
- sysfatal("testgetmsg_fp3: type: want %d, got %d", Aupdate, m.type);+ sysfatal("testgetmsgfp3: type: want %d, got %d", Aupdate, m.type);if(m.ndata != 3)
- sysfatal("testgetmsg_fp3: ndata: want 3, got %d", m.ndata);+ sysfatal("testgetmsgfp3: ndata: want 3, got %d", m.ndata);if(m.getshare != getshareF)
- sysfatal("testgetmsg_fp3: getshare: expected getshareF");+ sysfatal("testgetmsgfp3: getshare: expected getshareF");return 0;
}
static int
-testgetmsg_xconnected_tls(void)
+testgetmsgxconntls(void)
{/* X.224 connection confirm with TLS negotiation response */
int n, nb;
@@ -563,16 +563,16 @@
nb = dec16(buf, sizeof buf, hex, strlen(hex));
n = getmsg(&m, buf, nb);
if(n <= 0)
- sysfatal("testgetmsg_xconnected_tls: unexpected error: %r");+ sysfatal("testgetmsgxconntls: unexpected error: %r");if(m.type != Xconnected)
- sysfatal("testgetmsg_xconnected_tls: type: want %d, got %d", Xconnected, m.type);+ sysfatal("testgetmsgxconntls: type: want %d, got %d", Xconnected, m.type);if(m.negproto != ProtoTLS)
- sysfatal("testgetmsg_xconnected_tls: negproto: want %d (ProtoTLS), got %d", ProtoTLS, m.negproto);+ sysfatal("testgetmsgxconntls: negproto: want %d (ProtoTLS), got %d", ProtoTLS, m.negproto);return 0;
}
static int
-testgetmsg_xconnected_nonego(void)
+testgetmsgxconnnonego(void)
{/* X.224 connection confirm with non-matching nego type: negproto stays 0 */
int n, nb;
@@ -583,16 +583,16 @@
nb = dec16(buf, sizeof buf, hex, strlen(hex));
n = getmsg(&m, buf, nb);
if(n <= 0)
- sysfatal("testgetmsg_xconnected_nonego: unexpected error: %r");+ sysfatal("testgetmsgxconnnonego: unexpected error: %r");if(m.type != Xconnected)
- sysfatal("testgetmsg_xconnected_nonego: type: want %d, got %d", Xconnected, m.type);+ sysfatal("testgetmsgxconnnonego: type: want %d, got %d", Xconnected, m.type);if(m.negproto != 0)
- sysfatal("testgetmsg_xconnected_nonego: negproto: want 0, got %d", m.negproto);+ sysfatal("testgetmsgxconnnonego: negproto: want 0, got %d", m.negproto);return 0;
}
static int
-testgetmsg_mattached_uid(void)
+testgetmsgmattacheduid(void)
{/* MCS Attach User Confirm with userId present */
int n, nb;
@@ -603,16 +603,16 @@
nb = dec16(buf, sizeof buf, hex, strlen(hex));
n = getmsg(&m, buf, nb);
if(n <= 0)
- sysfatal("testgetmsg_mattached_uid: unexpected error: %r");+ sysfatal("testgetmsgmattacheduid: unexpected error: %r");if(m.type != Mattached)
- sysfatal("testgetmsg_mattached_uid: type: want %d, got %d", Mattached, m.type);+ sysfatal("testgetmsgmattacheduid: type: want %d, got %d", Mattached, m.type);if(m.mcsuid != 0xBEEF)
- sysfatal("testgetmsg_mattached_uid: mcsuid: want 0xBEEF, got 0x%X", m.mcsuid);+ sysfatal("testgetmsgmattacheduid: mcsuid: want 0xBEEF, got 0x%X", m.mcsuid);return 0;
}
static int
-testgetmsg_mattached_nouid(void)
+testgetmsgmattachednouid(void)
{/* MCS Attach User Confirm without userId */
int n, nb;
@@ -623,16 +623,16 @@
nb = dec16(buf, sizeof buf, hex, strlen(hex));
n = getmsg(&m, buf, nb);
if(n <= 0)
- sysfatal("testgetmsg_mattached_nouid: unexpected error: %r");+ sysfatal("testgetmsgmattachednouid: unexpected error: %r");if(m.type != Mattached)
- sysfatal("testgetmsg_mattached_nouid: type: want %d, got %d", Mattached, m.type);+ sysfatal("testgetmsgmattachednouid: type: want %d, got %d", Mattached, m.type);if(m.mcsuid != 0)
- sysfatal("testgetmsg_mattached_nouid: mcsuid: want 0, got 0x%X", m.mcsuid);+ sysfatal("testgetmsgmattachednouid: mcsuid: want 0, got 0x%X", m.mcsuid);return 0;
}
static int
-testgetmsg_mjoined(void)
+testgetmsgmjoined(void)
{/* MCS Channel Join Confirm */
int n, nb;
@@ -643,14 +643,14 @@
nb = dec16(buf, sizeof buf, hex, strlen(hex));
n = getmsg(&m, buf, nb);
if(n <= 0)
- sysfatal("testgetmsg_mjoined: unexpected error: %r");+ sysfatal("testgetmsgmjoined: unexpected error: %r");if(m.type != Mjoined)
- sysfatal("testgetmsg_mjoined: type: want %d, got %d", Mjoined, m.type);+ sysfatal("testgetmsgmjoined: type: want %d, got %d", Mjoined, m.type);return 0;
}
static int
-testgetmsg_mclosing(void)
+testgetmsgmclosing(void)
{/* Disconnect Provider Ultimatum */
int n, nb;
@@ -661,14 +661,14 @@
nb = dec16(buf, sizeof buf, hex, strlen(hex));
n = getmsg(&m, buf, nb);
if(n <= 0)
- sysfatal("testgetmsg_mclosing: unexpected error: %r");+ sysfatal("testgetmsgmclosing: unexpected error: %r");if(m.type != Mclosing)
- sysfatal("testgetmsg_mclosing: type: want %d, got %d", Mclosing, m.type);+ sysfatal("testgetmsgmclosing: type: want %d, got %d", Mclosing, m.type);return 0;
}
static int
-testgetmsg_mvchan(void)
+testgetmsgmvchan(void)
{/* MCS virtual channel data (non-global channel) */
int n, nb;
@@ -679,24 +679,24 @@
nb = dec16(buf, sizeof buf, hex, strlen(hex));
n = getmsg(&m, buf, nb);
if(n <= 0)
- sysfatal("testgetmsg_mvchan: unexpected error: %r");+ sysfatal("testgetmsgmvchan: unexpected error: %r");if(m.type != Mvchan)
- sysfatal("testgetmsg_mvchan: type: want %d, got %d", Mvchan, m.type);+ sysfatal("testgetmsgmvchan: type: want %d, got %d", Mvchan, m.type);if(m.chanid != 0x2222)
- sysfatal("testgetmsg_mvchan: chanid: want 0x2222, got 0x%X", m.chanid);+ sysfatal("testgetmsgmvchan: chanid: want 0x2222, got 0x%X", m.chanid);if(m.len != 7)
- sysfatal("testgetmsg_mvchan: len: want 7, got %d", m.len);+ sysfatal("testgetmsgmvchan: len: want 7, got %d", m.len);if(m.flags != 0x13)
- sysfatal("testgetmsg_mvchan: flags: want 0x13, got 0x%lX", m.flags);+ sysfatal("testgetmsgmvchan: flags: want 0x13, got 0x%lX", m.flags);if(m.ndata != 7)
- sysfatal("testgetmsg_mvchan: ndata: want 7, got %d", m.ndata);+ sysfatal("testgetmsgmvchan: ndata: want 7, got %d", m.ndata);if(memcmp(m.data, "abcdefg", 7) != 0)
- sysfatal("testgetmsg_mvchan: data mismatch");+ sysfatal("testgetmsgmvchan: data mismatch");return 0;
}
static int
-testgetmsg_sp_update(void)
+testgetmsgspupdate(void)
{/* Slow-path update on global channel */
int n, nb;
@@ -707,18 +707,18 @@
nb = dec16(buf, sizeof buf, hex, strlen(hex));
n = getmsg(&m, buf, nb);
if(n <= 0)
- sysfatal("testgetmsg_sp_update: unexpected error: %r");+ sysfatal("testgetmsgspupdate: unexpected error: %r");if(m.type != Aupdate)
- sysfatal("testgetmsg_sp_update: type: want %d, got %d", Aupdate, m.type);+ sysfatal("testgetmsgspupdate: type: want %d, got %d", Aupdate, m.type);if(m.ndata != 4)
- sysfatal("testgetmsg_sp_update: ndata: want 4, got %d", m.ndata);+ sysfatal("testgetmsgspupdate: ndata: want 4, got %d", m.ndata);if(m.getshare != getshareT)
- sysfatal("testgetmsg_sp_update: getshare: expected getshareT");+ sysfatal("testgetmsgspupdate: getshare: expected getshareT");return 0;
}
static int
-testgetmsg_mattach_err(void)
+testgetmsgmattacherr(void)
{/* Error: MCS Attach User Confirm with non-zero error result */
int n, nb;
@@ -729,12 +729,12 @@
nb = dec16(buf, sizeof buf, hex, strlen(hex));
n = getmsg(&m, buf, nb);
if(n >= 0)
- sysfatal("testgetmsg_mattach_err: expected error, got %d", n);+ sysfatal("testgetmsgmattacherr: expected error, got %d", n);return 0;
}
static int
-testgetmsg_mjoin_err(void)
+testgetmsgmjoinerr(void)
{/* Error: MCS Channel Join Confirm with non-zero error result */
int n, nb;
@@ -745,12 +745,12 @@
nb = dec16(buf, sizeof buf, hex, strlen(hex));
n = getmsg(&m, buf, nb);
if(n >= 0)
- sysfatal("testgetmsg_mjoin_err: expected error, got %d", n);+ sysfatal("testgetmsgmjoinerr: expected error, got %d", n);return 0;
}
static int
-testgetmsg_fp_encr_err(void)
+testgetmsgfpencr(void)
{/* Error: legacy encryption in fast-path PDU */
int n, nb;
@@ -761,12 +761,12 @@
nb = dec16(buf, sizeof buf, hex, strlen(hex));
n = getmsg(&m, buf, nb);
if(n >= 0)
- sysfatal("testgetmsg_fp_encr_err: expected error, got %d", n);+ sysfatal("testgetmsgfpencr: expected error, got %d", n);return 0;
}
static int
-testgetmsg_aflow(void)
+testgetmsgaflow(void)
{/* Flow PDU on global channel (isflowpdu): GSHORT = 0x8000 → Aflow */
int n, nb;
@@ -777,14 +777,14 @@
nb = dec16(buf, sizeof buf, hex, strlen(hex));
n = getmsg(&m, buf, nb);
if(n <= 0)
- sysfatal("testgetmsg_aflow: unexpected error: %r");+ sysfatal("testgetmsgaflow: unexpected error: %r");if(m.type != Aflow)
- sysfatal("testgetmsg_aflow: type: want %d (Aflow), got %d", Aflow, m.type);+ sysfatal("testgetmsgaflow: type: want %d (Aflow), got %d", Aflow, m.type);return 0;
}
static int
-testgetmsg_licensepk_sctlv1(void)
+testgetmsglicpksctlv1(void)
{/*
* Slow-path on global channel with Slicensepk flag but sctlver==1.
@@ -799,18 +799,18 @@
nb = dec16(buf, sizeof buf, hex, strlen(hex));
n = getmsg(&m, buf, nb);
if(n <= 0)
- sysfatal("testgetmsg_licensepk_sctlv1: unexpected error: %r");+ sysfatal("testgetmsglicpksctlv1: unexpected error: %r");if(m.type != Aupdate)
- sysfatal("testgetmsg_licensepk_sctlv1: type: want %d (Aupdate), got %d", Aupdate, m.type);+ sysfatal("testgetmsglicpksctlv1: type: want %d (Aupdate), got %d", Aupdate, m.type);if(m.ndata != 4)
- sysfatal("testgetmsg_licensepk_sctlv1: ndata: want 4, got %d", m.ndata);+ sysfatal("testgetmsglicpksctlv1: ndata: want 4, got %d", m.ndata);if(m.getshare != getshareT)
- sysfatal("testgetmsg_licensepk_sctlv1: getshare: expected getshareT");+ sysfatal("testgetmsglicpksctlv1: getshare: expected getshareT");return 0;
}
static int
-testgetmsg_ldone(void)
+testgetmsgldone(void)
{/* License PDU with Notify (0xFF) type → Ldone */
int n, nb;
@@ -821,14 +821,14 @@
nb = dec16(buf, sizeof buf, hex, strlen(hex));
n = getmsg(&m, buf, nb);
if(n <= 0)
- sysfatal("testgetmsg_ldone: unexpected error: %r");+ sysfatal("testgetmsgldone: unexpected error: %r");if(m.type != Ldone)
- sysfatal("testgetmsg_ldone: type: want %d (Ldone), got %d", Ldone, m.type);+ sysfatal("testgetmsgldone: type: want %d (Ldone), got %d", Ldone, m.type);return 0;
}
static int
-testgetmsg_lneedlicense(void)
+testgetmsglneedlicense(void)
{/* License PDU with SNeedLicense (0x01) type → Lneedlicense */
int n, nb;
@@ -839,14 +839,14 @@
nb = dec16(buf, sizeof buf, hex, strlen(hex));
n = getmsg(&m, buf, nb);
if(n <= 0)
- sysfatal("testgetmsg_lneedlicense: unexpected error: %r");+ sysfatal("testgetmsglneedlicense: unexpected error: %r");if(m.type != Lneedlicense)
- sysfatal("testgetmsg_lneedlicense: type: want %d (Lneedlicense), got %d", Lneedlicense, m.type);+ sysfatal("testgetmsglneedlicense: type: want %d (Lneedlicense), got %d", Lneedlicense, m.type);return 0;
}
static int
-testgetmsg_lhavechal(void)
+testgetmsglhavechal(void)
{/* License PDU with SHaveChal (0x02) type → Lhavechal */
int n, nb;
@@ -857,14 +857,14 @@
nb = dec16(buf, sizeof buf, hex, strlen(hex));
n = getmsg(&m, buf, nb);
if(n <= 0)
- sysfatal("testgetmsg_lhavechal: unexpected error: %r");+ sysfatal("testgetmsglhavechal: unexpected error: %r");if(m.type != Lhavechal)
- sysfatal("testgetmsg_lhavechal: type: want %d (Lhavechal), got %d", Lhavechal, m.type);+ sysfatal("testgetmsglhavechal: type: want %d (Lhavechal), got %d", Lhavechal, m.type);return 0;
}
static int
-testgetmsg_sp_deactivate(void)
+testgetmsgspdeactivate(void)
{/*
* Slow-path Deactivate All PDU (PDUdeactivate=6) on global channel:
@@ -885,21 +885,21 @@
nb = dec16(buf, sizeof buf, hex, strlen(hex));
n = getmsg(&m, buf, nb);
if(n <= 0)
- sysfatal("testgetmsg_sp_deactivate: getmsg: unexpected error: %r");+ sysfatal("testgetmsgspdeactivate: getmsg: unexpected error: %r");if(m.type != Aupdate)
- sysfatal("testgetmsg_sp_deactivate: type: want Aupdate, got %d", m.type);+ sysfatal("testgetmsgspdeactivate: type: want Aupdate, got %d", m.type);if(m.getshare != getshareT)
- sysfatal("testgetmsg_sp_deactivate: getshare: expected getshareT");+ sysfatal("testgetmsgspdeactivate: getshare: expected getshareT");n = m.getshare(&u, m.data, m.ndata);
if(n <= 0)
- sysfatal("testgetmsg_sp_deactivate: getshare: unexpected error: %r");+ sysfatal("testgetmsgspdeactivate: getshare: unexpected error: %r");if(u.type != ShDeactivate)
- sysfatal("testgetmsg_sp_deactivate: share type: want ShDeactivate (%d), got %d", ShDeactivate, u.type);+ sysfatal("testgetmsgspdeactivate: share type: want ShDeactivate (%d), got %d", ShDeactivate, u.type);return 0;
}
static int
-testgetmsg_sp_einfo(void)
+testgetmsgspeinfo(void)
{/*
* Slow-path Set Error Info PDU (ADerrx=47) on global channel:
@@ -924,23 +924,23 @@
nb = dec16(buf, sizeof buf, hex, strlen(hex));
n = getmsg(&m, buf, nb);
if(n <= 0)
- sysfatal("testgetmsg_sp_einfo: getmsg: unexpected error: %r");+ sysfatal("testgetmsgspeinfo: getmsg: unexpected error: %r");if(m.type != Aupdate)
- sysfatal("testgetmsg_sp_einfo: type: want Aupdate, got %d", m.type);+ sysfatal("testgetmsgspeinfo: type: want Aupdate, got %d", m.type);if(m.getshare != getshareT)
- sysfatal("testgetmsg_sp_einfo: getshare: expected getshareT");+ sysfatal("testgetmsgspeinfo: getshare: expected getshareT");n = m.getshare(&u, m.data, m.ndata);
if(n <= 0)
- sysfatal("testgetmsg_sp_einfo: getshare: unexpected error: %r");+ sysfatal("testgetmsgspeinfo: getshare: unexpected error: %r");if(u.type != ShEinfo)
- sysfatal("testgetmsg_sp_einfo: share type: want ShEinfo (%d), got %d", ShEinfo, u.type);+ sysfatal("testgetmsgspeinfo: share type: want ShEinfo (%d), got %d", ShEinfo, u.type);if(u.err != 0x1234)
- sysfatal("testgetmsg_sp_einfo: err: want 0x1234, got 0x%X", u.err);+ sysfatal("testgetmsgspeinfo: err: want 0x1234, got 0x%X", u.err);return 0;
}
static int
-testgetmsg_sp_orders(void)
+testgetmsgsporders(void)
{/*
* Slow-path Drawing Orders update (ADdraw/UpdOrders=0) on global channel:
@@ -965,23 +965,23 @@
nb = dec16(buf, sizeof buf, hex, strlen(hex));
n = getmsg(&m, buf, nb);
if(n <= 0)
- sysfatal("testgetmsg_sp_orders: getmsg: unexpected error: %r");+ sysfatal("testgetmsgsporders: getmsg: unexpected error: %r");if(m.type != Aupdate)
- sysfatal("testgetmsg_sp_orders: type: want Aupdate, got %d", m.type);+ sysfatal("testgetmsgsporders: type: want Aupdate, got %d", m.type);if(m.getshare != getshareT)
- sysfatal("testgetmsg_sp_orders: getshare: expected getshareT");+ sysfatal("testgetmsgsporders: getshare: expected getshareT");n = m.getshare(&u, m.data, m.ndata);
if(n <= 0)
- sysfatal("testgetmsg_sp_orders: getshare: unexpected error: %r");+ sysfatal("testgetmsgsporders: getshare: unexpected error: %r");if(u.type != ShUorders)
- sysfatal("testgetmsg_sp_orders: share type: want ShUorders (%d), got %d", ShUorders, u.type);+ sysfatal("testgetmsgsporders: share type: want ShUorders (%d), got %d", ShUorders, u.type);if(u.nr != 3)
- sysfatal("testgetmsg_sp_orders: nr: want 3, got %d", u.nr);+ sysfatal("testgetmsgsporders: nr: want 3, got %d", u.nr);return 0;
}
static int
-testgetmsg_sp_bitmap(void)
+testgetmsgspbitmap(void)
{/*
* Slow-path Bitmap Update (ADdraw/UpdBitmap=1) on global channel:
@@ -1006,23 +1006,23 @@
nb = dec16(buf, sizeof buf, hex, strlen(hex));
n = getmsg(&m, buf, nb);
if(n <= 0)
- sysfatal("testgetmsg_sp_bitmap: getmsg: unexpected error: %r");+ sysfatal("testgetmsgspbitmap: getmsg: unexpected error: %r");if(m.type != Aupdate)
- sysfatal("testgetmsg_sp_bitmap: type: want Aupdate, got %d", m.type);+ sysfatal("testgetmsgspbitmap: type: want Aupdate, got %d", m.type);if(m.getshare != getshareT)
- sysfatal("testgetmsg_sp_bitmap: getshare: expected getshareT");+ sysfatal("testgetmsgspbitmap: getshare: expected getshareT");n = m.getshare(&u, m.data, m.ndata);
if(n <= 0)
- sysfatal("testgetmsg_sp_bitmap: getshare: unexpected error: %r");+ sysfatal("testgetmsgspbitmap: getshare: unexpected error: %r");if(u.type != ShUimg)
- sysfatal("testgetmsg_sp_bitmap: share type: want ShUimg (%d), got %d", ShUimg, u.type);+ sysfatal("testgetmsgspbitmap: share type: want ShUimg (%d), got %d", ShUimg, u.type);if(u.nr != 2)
- sysfatal("testgetmsg_sp_bitmap: nr: want 2, got %d", u.nr);+ sysfatal("testgetmsgspbitmap: nr: want 2, got %d", u.nr);return 0;
}
static int
-testgetmsg_sp_cmap(void)
+testgetmsgspcmap(void)
{/*
* Slow-path Color Table Cache Update (ADdraw/UpdCmap=2) on global channel:
@@ -1047,21 +1047,21 @@
nb = dec16(buf, sizeof buf, hex, strlen(hex));
n = getmsg(&m, buf, nb);
if(n <= 0)
- sysfatal("testgetmsg_sp_cmap: getmsg: unexpected error: %r");+ sysfatal("testgetmsgspcmap: getmsg: unexpected error: %r");if(m.type != Aupdate)
- sysfatal("testgetmsg_sp_cmap: type: want Aupdate, got %d", m.type);+ sysfatal("testgetmsgspcmap: type: want Aupdate, got %d", m.type);if(m.getshare != getshareT)
- sysfatal("testgetmsg_sp_cmap: getshare: expected getshareT");+ sysfatal("testgetmsgspcmap: getshare: expected getshareT");n = m.getshare(&u, m.data, m.ndata);
if(n <= 0)
- sysfatal("testgetmsg_sp_cmap: getshare: unexpected error: %r");+ sysfatal("testgetmsgspcmap: getshare: unexpected error: %r");if(u.type != ShUcmap)
- sysfatal("testgetmsg_sp_cmap: share type: want ShUcmap (%d), got %d", ShUcmap, u.type);+ sysfatal("testgetmsgspcmap: share type: want ShUcmap (%d), got %d", ShUcmap, u.type);return 0;
}
static int
-testgetmsg_sp_warp(void)
+testgetmsgspwarp(void)
{/*
* Slow-path Pointer Position Update (ADcursor/PDUcursorwarp=3) on global channel:
@@ -1086,25 +1086,25 @@
nb = dec16(buf, sizeof buf, hex, strlen(hex));
n = getmsg(&m, buf, nb);
if(n <= 0)
- sysfatal("testgetmsg_sp_warp: getmsg: unexpected error: %r");+ sysfatal("testgetmsgspwarp: getmsg: unexpected error: %r");if(m.type != Aupdate)
- sysfatal("testgetmsg_sp_warp: type: want Aupdate, got %d", m.type);+ sysfatal("testgetmsgspwarp: type: want Aupdate, got %d", m.type);if(m.getshare != getshareT)
- sysfatal("testgetmsg_sp_warp: getshare: expected getshareT");+ sysfatal("testgetmsgspwarp: getshare: expected getshareT");n = m.getshare(&u, m.data, m.ndata);
if(n <= 0)
- sysfatal("testgetmsg_sp_warp: getshare: unexpected error: %r");+ sysfatal("testgetmsgspwarp: getshare: unexpected error: %r");if(u.type != ShUwarp)
- sysfatal("testgetmsg_sp_warp: share type: want ShUwarp (%d), got %d", ShUwarp, u.type);+ sysfatal("testgetmsgspwarp: share type: want ShUwarp (%d), got %d", ShUwarp, u.type);if(u.x != 100)
- sysfatal("testgetmsg_sp_warp: x: want 100, got %d", u.x);+ sysfatal("testgetmsgspwarp: x: want 100, got %d", u.x);if(u.y != 200)
- sysfatal("testgetmsg_sp_warp: y: want 200, got %d", u.y);+ sysfatal("testgetmsgspwarp: y: want 200, got %d", u.y);return 0;
}
static int
-testgetmsg_fp_orders(void)
+testgetmsgfporders(void)
{/*
* Fast-path Drawing Orders update (FUpdOrders=0):
@@ -1120,23 +1120,23 @@
nb = dec16(buf, sizeof buf, hex, strlen(hex));
n = getmsg(&m, buf, nb);
if(n <= 0)
- sysfatal("testgetmsg_fp_orders: getmsg: unexpected error: %r");+ sysfatal("testgetmsgfporders: getmsg: unexpected error: %r");if(m.type != Aupdate)
- sysfatal("testgetmsg_fp_orders: type: want Aupdate, got %d", m.type);+ sysfatal("testgetmsgfporders: type: want Aupdate, got %d", m.type);if(m.getshare != getshareF)
- sysfatal("testgetmsg_fp_orders: getshare: expected getshareF");+ sysfatal("testgetmsgfporders: getshare: expected getshareF");n = m.getshare(&u, m.data, m.ndata);
if(n <= 0)
- sysfatal("testgetmsg_fp_orders: getshare: unexpected error: %r");+ sysfatal("testgetmsgfporders: getshare: unexpected error: %r");if(u.type != ShUorders)
- sysfatal("testgetmsg_fp_orders: share type: want ShUorders (%d), got %d", ShUorders, u.type);+ sysfatal("testgetmsgfporders: share type: want ShUorders (%d), got %d", ShUorders, u.type);if(u.nr != 5)
- sysfatal("testgetmsg_fp_orders: nr: want 5, got %d", u.nr);+ sysfatal("testgetmsgfporders: nr: want 5, got %d", u.nr);return 0;
}
static int
-testgetmsg_fp_bitmap(void)
+testgetmsgfpbitmap(void)
{/*
* Fast-path Bitmap Update (FUpdBitmap=1):
@@ -1152,23 +1152,23 @@
nb = dec16(buf, sizeof buf, hex, strlen(hex));
n = getmsg(&m, buf, nb);
if(n <= 0)
- sysfatal("testgetmsg_fp_bitmap: getmsg: unexpected error: %r");+ sysfatal("testgetmsgfpbitmap: getmsg: unexpected error: %r");if(m.type != Aupdate)
- sysfatal("testgetmsg_fp_bitmap: type: want Aupdate, got %d", m.type);+ sysfatal("testgetmsgfpbitmap: type: want Aupdate, got %d", m.type);if(m.getshare != getshareF)
- sysfatal("testgetmsg_fp_bitmap: getshare: expected getshareF");+ sysfatal("testgetmsgfpbitmap: getshare: expected getshareF");n = m.getshare(&u, m.data, m.ndata);
if(n <= 0)
- sysfatal("testgetmsg_fp_bitmap: getshare: unexpected error: %r");+ sysfatal("testgetmsgfpbitmap: getshare: unexpected error: %r");if(u.type != ShUimg)
- sysfatal("testgetmsg_fp_bitmap: share type: want ShUimg (%d), got %d", ShUimg, u.type);+ sysfatal("testgetmsgfpbitmap: share type: want ShUimg (%d), got %d", ShUimg, u.type);if(u.nr != 3)
- sysfatal("testgetmsg_fp_bitmap: nr: want 3, got %d", u.nr);+ sysfatal("testgetmsgfpbitmap: nr: want 3, got %d", u.nr);return 0;
}
static int
-testgetmsg_fp_cmap(void)
+testgetmsgfpcmap(void)
{/*
* Fast-path Color Table Cache Update (FUpdCmap=2):
@@ -1184,21 +1184,21 @@
nb = dec16(buf, sizeof buf, hex, strlen(hex));
n = getmsg(&m, buf, nb);
if(n <= 0)
- sysfatal("testgetmsg_fp_cmap: getmsg: unexpected error: %r");+ sysfatal("testgetmsgfpcmap: getmsg: unexpected error: %r");if(m.type != Aupdate)
- sysfatal("testgetmsg_fp_cmap: type: want Aupdate, got %d", m.type);+ sysfatal("testgetmsgfpcmap: type: want Aupdate, got %d", m.type);if(m.getshare != getshareF)
- sysfatal("testgetmsg_fp_cmap: getshare: expected getshareF");+ sysfatal("testgetmsgfpcmap: getshare: expected getshareF");n = m.getshare(&u, m.data, m.ndata);
if(n <= 0)
- sysfatal("testgetmsg_fp_cmap: getshare: unexpected error: %r");+ sysfatal("testgetmsgfpcmap: getshare: unexpected error: %r");if(u.type != ShUcmap)
- sysfatal("testgetmsg_fp_cmap: share type: want ShUcmap (%d), got %d", ShUcmap, u.type);+ sysfatal("testgetmsgfpcmap: share type: want ShUcmap (%d), got %d", ShUcmap, u.type);return 0;
}
static int
-testgetmsg_fp_warp(void)
+testgetmsgfpwarp(void)
{/*
* Fast-path Pointer Position Update (FUpdWarp=8):
@@ -1214,25 +1214,25 @@
nb = dec16(buf, sizeof buf, hex, strlen(hex));
n = getmsg(&m, buf, nb);
if(n <= 0)
- sysfatal("testgetmsg_fp_warp: getmsg: unexpected error: %r");+ sysfatal("testgetmsgfpwarp: getmsg: unexpected error: %r");if(m.type != Aupdate)
- sysfatal("testgetmsg_fp_warp: type: want Aupdate, got %d", m.type);+ sysfatal("testgetmsgfpwarp: type: want Aupdate, got %d", m.type);if(m.getshare != getshareF)
- sysfatal("testgetmsg_fp_warp: getshare: expected getshareF");+ sysfatal("testgetmsgfpwarp: getshare: expected getshareF");n = m.getshare(&u, m.data, m.ndata);
if(n <= 0)
- sysfatal("testgetmsg_fp_warp: getshare: unexpected error: %r");+ sysfatal("testgetmsgfpwarp: getshare: unexpected error: %r");if(u.type != ShUwarp)
- sysfatal("testgetmsg_fp_warp: share type: want ShUwarp (%d), got %d", ShUwarp, u.type);+ sysfatal("testgetmsgfpwarp: share type: want ShUwarp (%d), got %d", ShUwarp, u.type);if(u.x != 100)
- sysfatal("testgetmsg_fp_warp: x: want 100, got %d", u.x);+ sysfatal("testgetmsgfpwarp: x: want 100, got %d", u.x);if(u.y != 200)
- sysfatal("testgetmsg_fp_warp: y: want 200, got %d", u.y);+ sysfatal("testgetmsgfpwarp: y: want 200, got %d", u.y);return 0;
}
static int
-testgetcaps_general_bitmap(void)
+testgetcapsgenbmp(void)
{/*
* Server Demand Active PDU containing two capability sets:
@@ -1270,33 +1270,33 @@
nb = dec16(buf, sizeof buf, hex, strlen(hex));
n = getmsg(&m, buf, nb);
if(n <= 0)
- sysfatal("testgetcaps_general_bitmap: getmsg: unexpected error: %r");+ sysfatal("testgetcapsgenbmp: getmsg: unexpected error: %r");if(m.type != Aupdate)
- sysfatal("testgetcaps_general_bitmap: type: want Aupdate, got %d", m.type);+ sysfatal("testgetcapsgenbmp: type: want Aupdate, got %d", m.type);if(m.getshare != getshareT)
- sysfatal("testgetcaps_general_bitmap: getshare: expected getshareT");+ sysfatal("testgetcapsgenbmp: getshare: expected getshareT");n = m.getshare(&as, m.data, m.ndata);
if(n <= 0)
- sysfatal("testgetcaps_general_bitmap: getshare: unexpected error: %r");+ sysfatal("testgetcapsgenbmp: getshare: unexpected error: %r");if(as.type != ShActivate)
- sysfatal("testgetcaps_general_bitmap: share type: want ShActivate, got %d", as.type);+ sysfatal("testgetcapsgenbmp: share type: want ShActivate, got %d", as.type);n = getcaps(&caps, as.data, as.ndata);
if(n < 0)
- sysfatal("testgetcaps_general_bitmap: getcaps: unexpected error: %r");+ sysfatal("testgetcapsgenbmp: getcaps: unexpected error: %r");if(!caps.general)
- sysfatal("testgetcaps_general_bitmap: caps.general: want 1, got 0");+ sysfatal("testgetcapsgenbmp: caps.general: want 1, got 0");if(caps.canrefresh != 1)
- sysfatal("testgetcaps_general_bitmap: canrefresh: want 1, got %d", caps.canrefresh);+ sysfatal("testgetcapsgenbmp: canrefresh: want 1, got %d", caps.canrefresh);if(caps.cansupress != 1)
- sysfatal("testgetcaps_general_bitmap: cansupress: want 1, got %d", caps.cansupress);+ sysfatal("testgetcapsgenbmp: cansupress: want 1, got %d", caps.cansupress);if(!caps.bitmap)
- sysfatal("testgetcaps_general_bitmap: caps.bitmap: want 1, got 0");+ sysfatal("testgetcapsgenbmp: caps.bitmap: want 1, got 0");if(caps.depth != 32)
- sysfatal("testgetcaps_general_bitmap: depth: want 32, got %d", caps.depth);+ sysfatal("testgetcapsgenbmp: depth: want 32, got %d", caps.depth);if(caps.xsz != 1024)
- sysfatal("testgetcaps_general_bitmap: xsz: want 1024, got %d", caps.xsz);+ sysfatal("testgetcapsgenbmp: xsz: want 1024, got %d", caps.xsz);if(caps.ysz != 768)
- sysfatal("testgetcaps_general_bitmap: ysz: want 768, got %d", caps.ysz);+ sysfatal("testgetcapsgenbmp: ysz: want 768, got %d", caps.ysz);return 0;
}
@@ -1304,52 +1304,52 @@
msgtests(void)
{ fmtinstall('H', encodefmt);- testputmsg_xconnect();
- testputmsg_xhangup();
- testputmsg_mattach();
- testputmsg_mjoin();
- testputmsg_merectdom();
- testputmsg_mconnect();
- testputmsg_dclientinfo();
- testputmsg_mactivated();
- testputmsg_mvchan();
- testputmsg_async();
- testputmsg_actl_cooperate();
- testputmsg_actl_reqctl();
- testputmsg_afontls();
- testputmsg_ainput_sync();
- testputmsg_ainput_keycode();
- testputmsg_lreq();
- testputmsg_lnolicense();
- testputmsg_dsupress();
- testgetmsg_fp2();
- testgetmsg_fp3();
- testgetmsg_xconnected_tls();
- testgetmsg_xconnected_nonego();
- testgetmsg_mattached_uid();
- testgetmsg_mattached_nouid();
- testgetmsg_mjoined();
- testgetmsg_mclosing();
- testgetmsg_mvchan();
- testgetmsg_sp_update();
- testgetmsg_mattach_err();
- testgetmsg_mjoin_err();
- testgetmsg_fp_encr_err();
- testgetmsg_aflow();
- testgetmsg_licensepk_sctlv1();
- testgetmsg_ldone();
- testgetmsg_lneedlicense();
- testgetmsg_lhavechal();
- testgetmsg_sp_deactivate();
- testgetmsg_sp_einfo();
- testgetmsg_sp_orders();
- testgetmsg_sp_bitmap();
- testgetmsg_sp_cmap();
- testgetmsg_sp_warp();
- testgetmsg_fp_orders();
- testgetmsg_fp_bitmap();
- testgetmsg_fp_cmap();
- testgetmsg_fp_warp();
- testgetcaps_general_bitmap();
+ testputmsgxconnect();
+ testputmsgxhangup();
+ testputmsgmattach();
+ testputmsgmjoin();
+ testputmsgmerectdom();
+ testputmsgmconnect();
+ testputmsgdclientinfo();
+ testputmsgmactivated();
+ testputmsgmvchan();
+ testputmsgasync();
+ testputmsgactlcoop();
+ testputmsgactlreqctl();
+ testputmsgafontls();
+ testputmsgainputsync();
+ testputmsgainputkey();
+ testputmsglreq();
+ testputmsglnolicense();
+ testputmsgdsupress();
+ testgetmsgfp2();
+ testgetmsgfp3();
+ testgetmsgxconntls();
+ testgetmsgxconnnonego();
+ testgetmsgmattacheduid();
+ testgetmsgmattachednouid();
+ testgetmsgmjoined();
+ testgetmsgmclosing();
+ testgetmsgmvchan();
+ testgetmsgspupdate();
+ testgetmsgmattacherr();
+ testgetmsgmjoinerr();
+ testgetmsgfpencr();
+ testgetmsgaflow();
+ testgetmsglicpksctlv1();
+ testgetmsgldone();
+ testgetmsglneedlicense();
+ testgetmsglhavechal();
+ testgetmsgspdeactivate();
+ testgetmsgspeinfo();
+ testgetmsgsporders();
+ testgetmsgspbitmap();
+ testgetmsgspcmap();
+ testgetmsgspwarp();
+ testgetmsgfporders();
+ testgetmsgfpbitmap();
+ testgetmsgfpcmap();
+ testgetmsgfpwarp();
+ testgetcapsgenbmp();
return 0;
}
--- a/rle_test.c
+++ b/rle_test.c
@@ -3,7 +3,7 @@
int rletests(void);
static int
-testmemfill_repeat(void)
+testmemfillrepeat(void)
{/* Fill with a pattern shorter than the destination (pattern repeats) */
uchar dst[6];
@@ -14,12 +14,12 @@
memfill(dst, sizeof dst, pat, sizeof pat);
for(i = 0; i < (int)sizeof dst; i++)
if(dst[i] != want[i])
- sysfatal("testmemfill_repeat: dst[%d]: want 0x%x, got 0x%x", i, want[i], dst[i]);+ sysfatal("testmemfillrepeat: dst[%d]: want 0x%x, got 0x%x", i, want[i], dst[i]);return 0;
}
static int
-testmemfill_exact(void)
+testmemfillexact(void)
{/* Fill with a pattern equal in length to the destination */
uchar dst[4];
@@ -29,12 +29,12 @@
memfill(dst, sizeof dst, pat, sizeof pat);
for(i = 0; i < (int)sizeof dst; i++)
if(dst[i] != pat[i])
- sysfatal("testmemfill_exact: dst[%d]: want 0x%x, got 0x%x", i, pat[i], dst[i]);+ sysfatal("testmemfillexact: dst[%d]: want 0x%x, got 0x%x", i, pat[i], dst[i]);return 0;
}
static int
-testmemfill_onebyte(void)
+testmemfill1byte(void)
{/* Fill a single byte with a single-byte pattern */
uchar dst[1] = {0x00};@@ -42,12 +42,12 @@
memfill(dst, sizeof dst, pat, sizeof pat);
if(dst[0] != 0x42)
- sysfatal("testmemfill_onebyte: dst[0]: want 0x42, got 0x%x", dst[0]);+ sysfatal("testmemfill1byte: dst[0]: want 0x42, got 0x%x", dst[0]);return 0;
}
static int
-testmemfill_empty(void)
+testmemfillempty(void)
{/* Zero-length destination: no bytes written, returns a1 */
uchar dst[1] = {0x99};@@ -56,14 +56,14 @@
ret = memfill(dst, 0, pat, sizeof pat);
if(ret != dst)
- sysfatal("testmemfill_empty: return value: want dst, got something else");+ sysfatal("testmemfillempty: return value: want dst, got something else");if(dst[0] != 0x99)
- sysfatal("testmemfill_empty: dst[0]: want 0x99, got 0x%x", dst[0]);+ sysfatal("testmemfillempty: dst[0]: want 0x99, got 0x%x", dst[0]);return 0;
}
static int
-testmemxor_basic(void)
+testmemxorbasic(void)
{/* Basic XOR of two equal-length arrays */
uchar a[] = {0xFF, 0x0F, 0xAA};@@ -74,12 +74,12 @@
memxor(a, b, sizeof a);
for(i = 0; i < (int)sizeof a; i++)
if((uchar)a[i] != want[i])
- sysfatal("testmemxor_basic: a[%d]: want 0x%x, got 0x%x", i, want[i], (uchar)a[i]);+ sysfatal("testmemxorbasic: a[%d]: want 0x%x, got 0x%x", i, want[i], (uchar)a[i]);return 0;
}
static int
-testmemxor_empty(void)
+testmemxorempty(void)
{/* XOR with zero-length: no bytes modified */
uchar a[] = {0xAB, 0xCD};@@ -87,12 +87,12 @@
memxor(a, b, 0);
if(a[0] != 0xAB || a[1] != 0xCD)
- sysfatal("testmemxor_empty: unexpected modification: got 0x%x 0x%x", a[0], a[1]);+ sysfatal("testmemxorempty: unexpected modification: got 0x%x 0x%x", a[0], a[1]);return 0;
}
static int
-testmemxor_self(void)
+testmemxorself(void)
{/* XOR with self yields all zeros */
uchar a[] = {0x12, 0x34, 0x56};@@ -101,12 +101,12 @@
memxor(a, a, sizeof a);
for(i = 0; i < (int)sizeof a; i++)
if(a[i] != 0)
- sysfatal("testmemxor_self: a[%d]: want 0, got 0x%x", i, a[i]);+ sysfatal("testmemxorself: a[%d]: want 0, got 0x%x", i, a[i]);return 0;
}
static int
-testmemxor_zeros(void)
+testmemxorzero(void)
{/* XOR with all-zero array leaves original unchanged */
uchar a[] = {0xDE, 0xAD, 0xBE, 0xEF};@@ -117,12 +117,12 @@
memxor(a, z, sizeof a);
for(i = 0; i < (int)sizeof a; i++)
if(a[i] != orig[i])
- sysfatal("testmemxor_zeros: a[%d]: want 0x%x, got 0x%x", i, orig[i], a[i]);+ sysfatal("testmemxorzero: a[%d]: want 0x%x, got 0x%x", i, orig[i], a[i]);return 0;
}
static int
-testunrle_bpix(void)
+testunrlebpix(void)
{/* Bpix extended opcode (0xFE): sets the current pixel to zero */
uchar src[] = {0xFE};@@ -131,16 +131,16 @@
end = unrle(dst, sizeof dst, src, sizeof src, 2, 1);
if(end == nil)
- sysfatal("testunrle_bpix: unexpected error: %r");+ sysfatal("testunrlebpix: unexpected error: %r");if(end - dst != 1)
- sysfatal("testunrle_bpix: length: want 1, got %d", (int)(end - dst));+ sysfatal("testunrlebpix: length: want 1, got %d", (int)(end - dst));if(dst[0] != 0)
- sysfatal("testunrle_bpix: pixel: want 0, got %d", dst[0]);+ sysfatal("testunrlebpix: pixel: want 0, got %d", dst[0]);return 0;
}
static int
-testunrle_bg_firstline(void)
+testunrlebg1(void)
{/*
* Bg opcode on the first scan line (no previous line):
@@ -153,16 +153,16 @@
end = unrle(dst, sizeof dst, src, sizeof src, 4, 1);
if(end == nil)
- sysfatal("testunrle_bg_firstline: unexpected error: %r");+ sysfatal("testunrlebg1: unexpected error: %r");if(end - dst != 1)
- sysfatal("testunrle_bg_firstline: length: want 1, got %d", (int)(end - dst));+ sysfatal("testunrlebg1: length: want 1, got %d", (int)(end - dst));if(dst[0] != 0)
- sysfatal("testunrle_bg_firstline: pixel: want 0, got %d", dst[0]);+ sysfatal("testunrlebg1: pixel: want 0, got %d", dst[0]);return 0;
}
static int
-testunrle_mix_zeromask(void)
+testunrlemixzero(void)
{/*
* Mix opcode on the first scan line with an all-zero mask byte:
@@ -178,17 +178,17 @@
memset(dst, 0xFF, sizeof dst);
end = unrle(dst, sizeof dst, src, sizeof src, 10, 1);
if(end == nil)
- sysfatal("testunrle_mix_zeromask: unexpected error: %r");+ sysfatal("testunrlemixzero: unexpected error: %r");if(end - dst != 8)
- sysfatal("testunrle_mix_zeromask: length: want 8, got %d", (int)(end - dst));+ sysfatal("testunrlemixzero: length: want 8, got %d", (int)(end - dst));for(i = 0; i < 8; i++)
if(dst[i] != 0)
- sysfatal("testunrle_mix_zeromask: dst[%d]: want 0, got %d", i, dst[i]);+ sysfatal("testunrlemixzero: dst[%d]: want 0, got %d", i, dst[i]);return 0;
}
static int
-testunrle_lit(void)
+testunrlelit(void)
{/*
* Lit opcode: code=8, bits=Bits5=31, raw_len=3 → len=3 pixels.
@@ -200,17 +200,17 @@
end = unrle(dst, sizeof dst, src, sizeof src, 10, 1);
if(end == nil)
- sysfatal("testunrle_lit: unexpected error: %r");+ sysfatal("testunrlelit: unexpected error: %r");if(end - dst != 3)
- sysfatal("testunrle_lit: length: want 3, got %d", (int)(end - dst));+ sysfatal("testunrlelit: length: want 3, got %d", (int)(end - dst));if(dst[0] != 0xAA || dst[1] != 0xBB || dst[2] != 0xCC)
- sysfatal("testunrle_lit: pixels: want AA BB CC, got %02x %02x %02x",+ sysfatal("testunrlelit: pixels: want AA BB CC, got %02x %02x %02x",dst[0], dst[1], dst[2]);
return 0;
}
static int
-testunrle_fg_firstline(void)
+testunrlefg1(void)
{/*
* Fg opcode on the first scan line (no previous line):
@@ -225,17 +225,17 @@
memset(dst, 0, sizeof dst);
end = unrle(dst, sizeof dst, src, sizeof src, 10, 1);
if(end == nil)
- sysfatal("testunrle_fg_firstline: unexpected error: %r");+ sysfatal("testunrlefg1: unexpected error: %r");if(end - dst != 4)
- sysfatal("testunrle_fg_firstline: length: want 4, got %d", (int)(end - dst));+ sysfatal("testunrlefg1: length: want 4, got %d", (int)(end - dst));for(i = 0; i < 4; i++)
if(dst[i] != 0xFF)
- sysfatal("testunrle_fg_firstline: dst[%d]: want 0xFF, got 0x%02x", i, dst[i]);+ sysfatal("testunrlefg1: dst[%d]: want 0xFF, got 0x%02x", i, dst[i]);return 0;
}
static int
-testunrle_fgs(void)
+testunrlefgs(void)
{/*
* FgS opcode: code=12, bits=Bits4=15, raw_len=1 → len=1 pixel.
@@ -248,16 +248,16 @@
end = unrle(dst, sizeof dst, src, sizeof src, 10, 1);
if(end == nil)
- sysfatal("testunrle_fgs: unexpected error: %r");+ sysfatal("testunrlefgs: unexpected error: %r");if(end - dst != 1)
- sysfatal("testunrle_fgs: length: want 1, got %d", (int)(end - dst));+ sysfatal("testunrlefgs: length: want 1, got %d", (int)(end - dst));if(dst[0] != 0x42)
- sysfatal("testunrle_fgs: pixel: want 0x42, got 0x%02x", dst[0]);+ sysfatal("testunrlefgs: pixel: want 0x42, got 0x%02x", dst[0]);return 0;
}
static int
-testunrle_fill(void)
+testunrlefill(void)
{/*
* Fill opcode: code=6, bits=Bits5=31, raw_len=3 → len=3 pixels.
@@ -271,17 +271,17 @@
memset(dst, 0, sizeof dst);
end = unrle(dst, sizeof dst, src, sizeof src, 10, 1);
if(end == nil)
- sysfatal("testunrle_fill: unexpected error: %r");+ sysfatal("testunrlefill: unexpected error: %r");if(end - dst != 3)
- sysfatal("testunrle_fill: length: want 3, got %d", (int)(end - dst));+ sysfatal("testunrlefill: length: want 3, got %d", (int)(end - dst));for(i = 0; i < 3; i++)
if(dst[i] != 0x55)
- sysfatal("testunrle_fill: dst[%d]: want 0x55, got 0x%02x", i, dst[i]);+ sysfatal("testunrlefill: dst[%d]: want 0x55, got 0x%02x", i, dst[i]);return 0;
}
static int
-testunrle_dith(void)
+testunrledith(void)
{/*
* Dith opcode: code=14, bits=Bits4=15, raw_len=1 → len=1 (×pixelsize).
@@ -295,16 +295,16 @@
memset(dst, 0, sizeof dst);
end = unrle(dst, sizeof dst, src, sizeof src, 10, 1);
if(end == nil)
- sysfatal("testunrle_dith: unexpected error: %r");+ sysfatal("testunrledith: unexpected error: %r");if(end - dst != 2)
- sysfatal("testunrle_dith: length: want 2, got %d", (int)(end - dst));+ sysfatal("testunrledith: length: want 2, got %d", (int)(end - dst));if(dst[0] != 0xAA || dst[1] != 0xBB)
- sysfatal("testunrle_dith: pixels: want AA BB, got %02x %02x", dst[0], dst[1]);+ sysfatal("testunrledith: pixels: want AA BB, got %02x %02x", dst[0], dst[1]);return 0;
}
static int
-testunrle_wpix(void)
+testunrlewpix(void)
{/*
* Wpix extended opcode (0xFD): sets the current pixel to DWhite (0xFF).
@@ -316,16 +316,16 @@
dst[0] = 0;
end = unrle(dst, sizeof dst, src, sizeof src, 2, 1);
if(end == nil)
- sysfatal("testunrle_wpix: unexpected error: %r");+ sysfatal("testunrlewpix: unexpected error: %r");if(end - dst != 1)
- sysfatal("testunrle_wpix: length: want 1, got %d", (int)(end - dst));+ sysfatal("testunrlewpix: length: want 1, got %d", (int)(end - dst));if(dst[0] != 0xFF)
- sysfatal("testunrle_wpix: pixel: want 0xFF, got 0x%02x", dst[0]);+ sysfatal("testunrlewpix: pixel: want 0xFF, got 0x%02x", dst[0]);return 0;
}
static int
-testunrle_mix_nontrivial(void)
+testunrlemixmask(void)
{/*
* Mix opcode with non-trivial mask (0xAA = 10101010):
@@ -342,18 +342,18 @@
memset(dst, 0x55, sizeof dst);
end = unrle(dst, sizeof dst, src, sizeof src, 10, 1);
if(end == nil)
- sysfatal("testunrle_mix_nontrivial: unexpected error: %r");+ sysfatal("testunrlemixmask: unexpected error: %r");if(end - dst != 8)
- sysfatal("testunrle_mix_nontrivial: length: want 8, got %d", (int)(end - dst));+ sysfatal("testunrlemixmask: length: want 8, got %d", (int)(end - dst));for(i = 0; i < 8; i++)
if(dst[i] != want[i])
- sysfatal("testunrle_mix_nontrivial: dst[%d]: want 0x%02x, got 0x%02x",+ sysfatal("testunrlemixmask: dst[%d]: want 0x%02x, got 0x%02x",i, want[i], dst[i]);
return 0;
}
static int
-testunrle_mixs(void)
+testunrlemixs(void)
{/*
* MixS opcode: code=13, bits=Bits4=15, raw_len=1 → len=8 pixels.
@@ -368,17 +368,17 @@
memset(dst, 0, sizeof dst);
end = unrle(dst, sizeof dst, src, sizeof src, 10, 1);
if(end == nil)
- sysfatal("testunrle_mixs: unexpected error: %r");+ sysfatal("testunrlemixs: unexpected error: %r");if(end - dst != 8)
- sysfatal("testunrle_mixs: length: want 8, got %d", (int)(end - dst));+ sysfatal("testunrlemixs: length: want 8, got %d", (int)(end - dst));for(i = 0; i < 8; i++)
if(dst[i] != 0x42)
- sysfatal("testunrle_mixs: dst[%d]: want 0x42, got 0x%02x", i, dst[i]);+ sysfatal("testunrlemixs: dst[%d]: want 0x42, got 0x%02x", i, dst[i]);return 0;
}
static int
-testunrle_mix3(void)
+testunrlemix3(void)
{/*
* Mix3 extended opcode (0xF9): fixed bitmask sreg=3 (00000011).
@@ -394,18 +394,18 @@
memset(dst, 0x55, sizeof dst);
end = unrle(dst, sizeof dst, src, sizeof src, 10, 1);
if(end == nil)
- sysfatal("testunrle_mix3: unexpected error: %r");+ sysfatal("testunrlemix3: unexpected error: %r");if(end - dst != 8)
- sysfatal("testunrle_mix3: length: want 8, got %d", (int)(end - dst));+ sysfatal("testunrlemix3: length: want 8, got %d", (int)(end - dst));for(i = 0; i < 8; i++)
if(dst[i] != want[i])
- sysfatal("testunrle_mix3: dst[%d]: want 0x%02x, got 0x%02x",+ sysfatal("testunrlemix3: dst[%d]: want 0x%02x, got 0x%02x",i, want[i], dst[i]);
return 0;
}
static int
-testunrle_mix5(void)
+testunrlemix5(void)
{/*
* Mix5 extended opcode (0xFA): fixed bitmask sreg=5 (00000101).
@@ -421,18 +421,18 @@
memset(dst, 0x55, sizeof dst);
end = unrle(dst, sizeof dst, src, sizeof src, 10, 1);
if(end == nil)
- sysfatal("testunrle_mix5: unexpected error: %r");+ sysfatal("testunrlemix5: unexpected error: %r");if(end - dst != 8)
- sysfatal("testunrle_mix5: length: want 8, got %d", (int)(end - dst));+ sysfatal("testunrlemix5: length: want 8, got %d", (int)(end - dst));for(i = 0; i < 8; i++)
if(dst[i] != want[i])
- sysfatal("testunrle_mix5: dst[%d]: want 0x%02x, got 0x%02x",+ sysfatal("testunrlemix5: dst[%d]: want 0x%02x, got 0x%02x",i, want[i], dst[i]);
return 0;
}
static int
-testunrle_bg_secondline(void)
+testunrlebg2(void)
{/*
* Bg on second scan line: copies pixels from the previous scan line.
@@ -449,18 +449,18 @@
memset(dst, 0, sizeof dst);
end = unrle(dst, sizeof dst, src, sizeof src, 4, 1);
if(end == nil)
- sysfatal("testunrle_bg_secondline: unexpected error: %r");+ sysfatal("testunrlebg2: unexpected error: %r");if(end - dst != 8)
- sysfatal("testunrle_bg_secondline: length: want 8, got %d", (int)(end - dst));+ sysfatal("testunrlebg2: length: want 8, got %d", (int)(end - dst));for(i = 0; i < 4; i++)
if(dst[4+i] != dst[i])
- sysfatal("testunrle_bg_secondline: dst[%d]: want 0x%02x, got 0x%02x",+ sysfatal("testunrlebg2: dst[%d]: want 0x%02x, got 0x%02x",4+i, dst[i], dst[4+i]);
return 0;
}
static int
-testunrle_fg_secondline(void)
+testunrlefg2(void)
{/*
* Fg on second scan line: fills with pen (DWhite) then XORs with
@@ -479,18 +479,18 @@
memset(dst, 0, sizeof dst);
end = unrle(dst, sizeof dst, src, sizeof src, 4, 1);
if(end == nil)
- sysfatal("testunrle_fg_secondline: unexpected error: %r");+ sysfatal("testunrlefg2: unexpected error: %r");if(end - dst != 8)
- sysfatal("testunrle_fg_secondline: length: want 8, got %d", (int)(end - dst));+ sysfatal("testunrlefg2: length: want 8, got %d", (int)(end - dst));for(i = 0; i < 4; i++)
if(dst[4+i] != want[i])
- sysfatal("testunrle_fg_secondline: dst[%d]: want 0x%02x, got 0x%02x",+ sysfatal("testunrlefg2: dst[%d]: want 0x%02x, got 0x%02x",4+i, want[i], dst[4+i]);
return 0;
}
static int
-testunrle_fgs_secondline(void)
+testunrlefgs2(void)
{/*
* FgS on second scan line: sets a new pen (0xF0) then XORs with
@@ -509,18 +509,18 @@
memset(dst, 0, sizeof dst);
end = unrle(dst, sizeof dst, src, sizeof src, 4, 1);
if(end == nil)
- sysfatal("testunrle_fgs_secondline: unexpected error: %r");+ sysfatal("testunrlefgs2: unexpected error: %r");if(end - dst != 8)
- sysfatal("testunrle_fgs_secondline: length: want 8, got %d", (int)(end - dst));+ sysfatal("testunrlefgs2: length: want 8, got %d", (int)(end - dst));for(i = 0; i < 4; i++)
if(dst[4+i] != want[i])
- sysfatal("testunrle_fgs_secondline: dst[%d]: want 0x%02x, got 0x%02x",+ sysfatal("testunrlefgs2: dst[%d]: want 0x%02x, got 0x%02x",4+i, want[i], dst[4+i]);
return 0;
}
static int
-testunrle_bg_consecutive(void)
+testunrlebgcons(void)
{/*
* Consecutive Bg runs (wasbg flag): after a Bg run sets wasbg=1, the
@@ -537,19 +537,19 @@
memset(dst, 0, sizeof dst);
end = unrle(dst, sizeof dst, src, sizeof src, 4, 1);
if(end == nil)
- sysfatal("testunrle_bg_consecutive: unexpected error: %r");+ sysfatal("testunrlebgcons: unexpected error: %r");if(end - dst != 12)
- sysfatal("testunrle_bg_consecutive: length: want 12, got %d", (int)(end - dst));+ sysfatal("testunrlebgcons: length: want 12, got %d", (int)(end - dst));if(dst[8] != 0xEE)
- sysfatal("testunrle_bg_consecutive: dst[8]: want 0xEE, got 0x%02x", dst[8]);+ sysfatal("testunrlebgcons: dst[8]: want 0xEE, got 0x%02x", dst[8]);if(dst[9] != 0x22 || dst[10] != 0x33 || dst[11] != 0x44)
- sysfatal("testunrle_bg_consecutive: dst[9..11]: want 22 33 44, got %02x %02x %02x",+ sysfatal("testunrlebgcons: dst[9..11]: want 22 33 44, got %02x %02x %02x",dst[9], dst[10], dst[11]);
return 0;
}
static int
-testunrle_overrun(void)
+testunrleoverrun(void)
{/*
* Overrun detection: output buffer is smaller than the decoded data.
@@ -561,12 +561,12 @@
end = unrle(dst, sizeof dst, src, sizeof src, 10, 1);
if(end != nil)
- sysfatal("testunrle_overrun: expected nil return on overrun, got non-nil");+ sysfatal("testunrleoverrun: expected nil return on overrun, got non-nil");return 0;
}
static int
-testunrle_extbg(void)
+testunrleextbg(void)
{/*
* Extended Bg opcode (0xF0): len taken from following 2-byte little-
@@ -580,17 +580,17 @@
memset(dst, 0xFF, sizeof dst);
end = unrle(dst, sizeof dst, src, sizeof src, 10, 1);
if(end == nil)
- sysfatal("testunrle_extbg: unexpected error: %r");+ sysfatal("testunrleextbg: unexpected error: %r");if(end - dst != 4)
- sysfatal("testunrle_extbg: length: want 4, got %d", (int)(end - dst));+ sysfatal("testunrleextbg: length: want 4, got %d", (int)(end - dst));for(i = 0; i < 4; i++)
if(dst[i] != 0)
- sysfatal("testunrle_extbg: dst[%d]: want 0, got 0x%02x", i, dst[i]);+ sysfatal("testunrleextbg: dst[%d]: want 0, got 0x%02x", i, dst[i]);return 0;
}
static int
-testunrle_extfg(void)
+testunrleextfg(void)
{/*
* Extended Fg opcode (0xF1): len from 2-byte field.
@@ -605,17 +605,17 @@
memset(dst, 0, sizeof dst);
end = unrle(dst, sizeof dst, src, sizeof src, 10, 1);
if(end == nil)
- sysfatal("testunrle_extfg: unexpected error: %r");+ sysfatal("testunrleextfg: unexpected error: %r");if(end - dst != 3)
- sysfatal("testunrle_extfg: length: want 3, got %d", (int)(end - dst));+ sysfatal("testunrleextfg: length: want 3, got %d", (int)(end - dst));for(i = 0; i < 3; i++)
if(dst[i] != 0xFF)
- sysfatal("testunrle_extfg: dst[%d]: want 0xFF, got 0x%02x", i, dst[i]);+ sysfatal("testunrleextfg: dst[%d]: want 0xFF, got 0x%02x", i, dst[i]);return 0;
}
static int
-testunrle_extlit(void)
+testunrleextlit(void)
{/*
* Extended Lit opcode (0xF4): len from 2-byte field.
@@ -628,17 +628,17 @@
memset(dst, 0, sizeof dst);
end = unrle(dst, sizeof dst, src, sizeof src, 10, 1);
if(end == nil)
- sysfatal("testunrle_extlit: unexpected error: %r");+ sysfatal("testunrleextlit: unexpected error: %r");if(end - dst != 3)
- sysfatal("testunrle_extlit: length: want 3, got %d", (int)(end - dst));+ sysfatal("testunrleextlit: length: want 3, got %d", (int)(end - dst));if(dst[0] != 0xAA || dst[1] != 0xBB || dst[2] != 0xCC)
- sysfatal("testunrle_extlit: pixels: want AA BB CC, got %02x %02x %02x",+ sysfatal("testunrleextlit: pixels: want AA BB CC, got %02x %02x %02x",dst[0], dst[1], dst[2]);
return 0;
}
static int
-testunrle_extfill_32bpp(void)
+testunrleextfill32(void)
{/*
* Extended Fill opcode (0xF3) with pixelsize=4 (32-bpp):
@@ -654,12 +654,12 @@
memset(dst, 0, sizeof dst);
end = unrle(dst, sizeof dst, src, sizeof src, 8, 4);
if(end == nil)
- sysfatal("testunrle_extfill_32bpp: unexpected error: %r");+ sysfatal("testunrleextfill32: unexpected error: %r");if(end - dst != 8)
- sysfatal("testunrle_extfill_32bpp: length: want 8, got %d", (int)(end - dst));+ sysfatal("testunrleextfill32: length: want 8, got %d", (int)(end - dst));for(i = 0; i < 8; i++)
if(dst[i] != want[i])
- sysfatal("testunrle_extfill_32bpp: dst[%d]: want 0x%02x, got 0x%02x",+ sysfatal("testunrleextfill32: dst[%d]: want 0x%02x, got 0x%02x",i, want[i], dst[i]);
return 0;
}
@@ -667,35 +667,35 @@
int
rletests(void)
{- testmemfill_repeat();
- testmemfill_exact();
- testmemfill_onebyte();
- testmemfill_empty();
- testmemxor_basic();
- testmemxor_empty();
- testmemxor_self();
- testmemxor_zeros();
- testunrle_bpix();
- testunrle_bg_firstline();
- testunrle_mix_zeromask();
- testunrle_lit();
- testunrle_fg_firstline();
- testunrle_fgs();
- testunrle_fill();
- testunrle_dith();
- testunrle_wpix();
- testunrle_mix_nontrivial();
- testunrle_mixs();
- testunrle_mix3();
- testunrle_mix5();
- testunrle_bg_secondline();
- testunrle_fg_secondline();
- testunrle_fgs_secondline();
- testunrle_bg_consecutive();
- testunrle_overrun();
- testunrle_extbg();
- testunrle_extfg();
- testunrle_extlit();
- testunrle_extfill_32bpp();
+ testmemfillrepeat();
+ testmemfillexact();
+ testmemfill1byte();
+ testmemfillempty();
+ testmemxorbasic();
+ testmemxorempty();
+ testmemxorself();
+ testmemxorzero();
+ testunrlebpix();
+ testunrlebg1();
+ testunrlemixzero();
+ testunrlelit();
+ testunrlefg1();
+ testunrlefgs();
+ testunrlefill();
+ testunrledith();
+ testunrlewpix();
+ testunrlemixmask();
+ testunrlemixs();
+ testunrlemix3();
+ testunrlemix5();
+ testunrlebg2();
+ testunrlefg2();
+ testunrlefgs2();
+ testunrlebgcons();
+ testunrleoverrun();
+ testunrleextbg();
+ testunrleextfg();
+ testunrleextlit();
+ testunrleextfill32();
return 0;
}
--- a/utf16_test.c
+++ b/utf16_test.c
@@ -6,7 +6,7 @@
int utf16tests(void);
static int
-testtoutf16_ascii(void)
+testtoutf16ascii(void)
{/* Single ASCII character 'A' → UTF-16LE: 41 00 */
char s[] = "A";
@@ -15,15 +15,15 @@
n = toutf16(buf, sizeof buf, s, 1);
if(n != 2)
- sysfatal("testtoutf16_ascii: len: want 2, got %d", n);+ sysfatal("testtoutf16ascii: len: want 2, got %d", n);if(buf[0] != 0x41 || buf[1] != 0x00)
- sysfatal("testtoutf16_ascii: bytes: want 41 00, got %02x %02x",+ sysfatal("testtoutf16ascii: bytes: want 41 00, got %02x %02x",buf[0], buf[1]);
return 0;
}
static int
-testtoutf16_crlf(void)
+testtoutf16crlf(void)
{/*
* Newline '\n' → CR LF pair in UTF-16LE: 0D 00 0A 00.
@@ -35,15 +35,15 @@
n = toutf16(buf, sizeof buf, s, 1);
if(n != 4)
- sysfatal("testtoutf16_crlf: len: want 4, got %d", n);+ sysfatal("testtoutf16crlf: len: want 4, got %d", n);if(buf[0]!=0x0D || buf[1]!=0x00 || buf[2]!=0x0A || buf[3]!=0x00)
- sysfatal("testtoutf16_crlf: bytes: want 0D 00 0A 00, got %02x %02x %02x %02x",+ sysfatal("testtoutf16crlf: bytes: want 0D 00 0A 00, got %02x %02x %02x %02x",buf[0], buf[1], buf[2], buf[3]);
return 0;
}
static int
-testtoutf16_empty(void)
+testtoutf16empty(void)
{/* Empty string (ns=0) → 0 bytes written */
uchar buf[2];
@@ -51,12 +51,12 @@
n = toutf16(buf, sizeof buf, "", 0);
if(n != 0)
- sysfatal("testtoutf16_empty: len: want 0, got %d", n);+ sysfatal("testtoutf16empty: len: want 0, got %d", n);return 0;
}
static int
-testtoutf16_buftoosmall(void)
+testtoutf16small(void)
{/* Buffer too small (1 byte) to hold a UTF-16 unit → 0 bytes written */
char s[] = "A";
@@ -65,12 +65,12 @@
n = toutf16(buf, sizeof buf, s, 1);
if(n != 0)
- sysfatal("testtoutf16_buftoosmall: len: want 0, got %d", n);+ sysfatal("testtoutf16small: len: want 0, got %d", n);return 0;
}
static int
-testtoutf16_bmp(void)
+testtoutf16bmp(void)
{/*
* Non-ASCII BMP character U+00E9 'é' (UTF-8: C3 A9)
@@ -82,15 +82,15 @@
n = toutf16(buf, sizeof buf, (char*)s, 2);
if(n != 2)
- sysfatal("testtoutf16_bmp: len: want 2, got %d", n);+ sysfatal("testtoutf16bmp: len: want 2, got %d", n);if(buf[0] != 0xE9 || buf[1] != 0x00)
- sysfatal("testtoutf16_bmp: bytes: want E9 00, got %02x %02x",+ sysfatal("testtoutf16bmp: bytes: want E9 00, got %02x %02x",buf[0], buf[1]);
return 0;
}
static int
-testtoutf16_surrogate(void)
+testtoutf16surrogate(void)
{/*
* U+1F600 😀 (UTF-8: F0 9F 98 80) is outside the BMP and encodes
@@ -102,15 +102,15 @@
n = toutf16(buf, sizeof buf, (char*)s, 4);
if(n != 4)
- sysfatal("testtoutf16_surrogate: len: want 4, got %d", n);+ sysfatal("testtoutf16surrogate: len: want 4, got %d", n);if(buf[0]!=0x3D || buf[1]!=0xD8 || buf[2]!=0x00 || buf[3]!=0xDE)
- sysfatal("testtoutf16_surrogate: bytes: want 3D D8 00 DE, got %02x %02x %02x %02x",+ sysfatal("testtoutf16surrogate: bytes: want 3D D8 00 DE, got %02x %02x %02x %02x",buf[0], buf[1], buf[2], buf[3]);
return 0;
}
static int
-testfromutf16_ascii(void)
+testfromutf16ascii(void)
{/* UTF-16LE 41 00 → ASCII 'A' */
uchar ws[] = {0x41, 0x00};@@ -119,14 +119,14 @@
n = fromutf16(buf, sizeof buf, ws, 2);
if(n != 1)
- sysfatal("testfromutf16_ascii: len: want 1, got %d", n);+ sysfatal("testfromutf16ascii: len: want 1, got %d", n);if(buf[0] != 'A')
- sysfatal("testfromutf16_ascii: byte: want 'A', got %02x", (uchar)buf[0]);+ sysfatal("testfromutf16ascii: byte: want 'A', got %02x", (uchar)buf[0]);return 0;
}
static int
-testfromutf16_crlf(void)
+testfromutf16crlf(void)
{/*
* CR LF in UTF-16LE (0D 00 0A 00): fromutf16 discards CR,
@@ -138,14 +138,14 @@
n = fromutf16(buf, sizeof buf, ws, 4);
if(n != 1)
- sysfatal("testfromutf16_crlf: len: want 1, got %d", n);+ sysfatal("testfromutf16crlf: len: want 1, got %d", n);if(buf[0] != '\n')
- sysfatal("testfromutf16_crlf: byte: want '\\n', got %02x", (uchar)buf[0]);+ sysfatal("testfromutf16crlf: byte: want '\\n', got %02x", (uchar)buf[0]);return 0;
}
static int
-testfromutf16_empty(void)
+testfromutf16empty(void)
{/* Empty input (nw=0) → 0 bytes written */
uchar ws[1];
@@ -154,12 +154,12 @@
n = fromutf16(buf, sizeof buf, ws, 0);
if(n != 0)
- sysfatal("testfromutf16_empty: len: want 0, got %d", n);+ sysfatal("testfromutf16empty: len: want 0, got %d", n);return 0;
}
static int
-testfromutf16_buftoosmall(void)
+testfromutf16small(void)
{/*
* Output buffer too small for all input: 'A' 'B' in UTF-16LE
@@ -171,14 +171,14 @@
n = fromutf16(buf, sizeof buf, ws, 4);
if(n != 1)
- sysfatal("testfromutf16_buftoosmall: len: want 1, got %d", n);+ sysfatal("testfromutf16small: len: want 1, got %d", n);if(buf[0] != 'A')
- sysfatal("testfromutf16_buftoosmall: byte: want 'A', got %02x", (uchar)buf[0]);+ sysfatal("testfromutf16small: byte: want 'A', got %02x", (uchar)buf[0]);return 0;
}
static int
-testfromutf16_bmp(void)
+testfromutf16bmp(void)
{/*
* Non-ASCII BMP character: UTF-16LE E9 00 → U+00E9 'é' (UTF-8: C3 A9)
@@ -189,15 +189,15 @@
n = fromutf16((char*)buf, sizeof buf, ws, 2);
if(n != 2)
- sysfatal("testfromutf16_bmp: len: want 2, got %d", n);+ sysfatal("testfromutf16bmp: len: want 2, got %d", n);if(buf[0] != 0xC3 || buf[1] != 0xA9)
- sysfatal("testfromutf16_bmp: bytes: want C3 A9, got %02x %02x",+ sysfatal("testfromutf16bmp: bytes: want C3 A9, got %02x %02x",buf[0], buf[1]);
return 0;
}
static int
-testfromutf16_surrogate(void)
+testfromutf16surrogate(void)
{/*
* Surrogate pair 3D D8 00 DE → U+1F600 😀 (UTF-8: F0 9F 98 80)
@@ -208,9 +208,9 @@
n = fromutf16((char*)buf, sizeof buf, ws, 4);
if(n != 4)
- sysfatal("testfromutf16_surrogate: len: want 4, got %d", n);+ sysfatal("testfromutf16surrogate: len: want 4, got %d", n);if(buf[0]!=0xF0 || buf[1]!=0x9F || buf[2]!=0x98 || buf[3]!=0x80)
- sysfatal("testfromutf16_surrogate: bytes: want F0 9F 98 80, got %02x %02x %02x %02x",+ sysfatal("testfromutf16surrogate: bytes: want F0 9F 98 80, got %02x %02x %02x %02x",buf[0], buf[1], buf[2], buf[3]);
return 0;
}
@@ -218,17 +218,17 @@
int
utf16tests(void)
{- testtoutf16_ascii();
- testtoutf16_crlf();
- testtoutf16_empty();
- testtoutf16_buftoosmall();
- testtoutf16_bmp();
- testtoutf16_surrogate();
- testfromutf16_ascii();
- testfromutf16_crlf();
- testfromutf16_empty();
- testfromutf16_buftoosmall();
- testfromutf16_bmp();
- testfromutf16_surrogate();
+ testtoutf16ascii();
+ testtoutf16crlf();
+ testtoutf16empty();
+ testtoutf16small();
+ testtoutf16bmp();
+ testtoutf16surrogate();
+ testfromutf16ascii();
+ testfromutf16crlf();
+ testfromutf16empty();
+ testfromutf16small();
+ testfromutf16bmp();
+ testfromutf16surrogate();
return 0;
}
--
⑨