GopherProxy

	Cosmetic modifications. - irc - Unnamed repository; edit this file 'description…
	git clone git://vernunftzentrum.de/irc.git
	Log
	Files
	Refs
	README
	---
	commit 7242e2cc4b68ca55086a26cb57139a9b29470bbf
	parent 61e93595f832ccc9a46428eaf398d776e482dfd2
	Author: Quentin Carbonneaux <[email protected]>
	Date: Sun, 11 Mar 2012 23:46:50 +0100

	Cosmetic modifications.

	Tried to beautify the code by aligning some related code and renaming lb
	in tgetch to l which is more consistent with the rest of the file.

	In tgetch, the invariant changed from len<=BufSz to len<=BufSz-1, this
	allows to trivially nul terminate the line being processed.

	Diffstat:
	irc.c \| 25 ++++++++++++-------------

	1 file changed, 12 insertions(+), 13 deletions(-)
	---
	diff --git a/irc.c b/irc.c
	@@ -365,7 +365,7 @@ tresize(void)
	static void
	tredraw(void)
	{
	- struct Chan * const c=&chl[ch];
	+ struct Chan *const c=&chl[ch];
	char q, p;
	int llen=0, nl=-1;

	@@ -408,14 +408,14 @@ tredraw(void)
	static void
	tgetch(void)
	{
	- static char lb[BufSz];
	+ static char l[BufSz];
	static size_t cu=0, len=0;
	size_t dirty=len+1, i;
	int c;

	c=wgetch(scr.iw);
	switch (c) {
	- case 0xe: ch=(ch+1)%nch; tredraw(); return;
	+ case 0xe: ch=(ch+1)%nch; tredraw(); return;
	case 0x10: ch=(ch+nch-1)%nch; tredraw(); return;
	case KEY_PPAGE:
	chl[ch].n+=SCROLL;
	@@ -426,7 +426,7 @@ tgetch(void)
	if (chl[ch].n<0) chl[ch].n=0;
	tredraw();
	return;
	- case 0x1: cu=0; break;
	+ case 0x1: cu=0; break;
	case 0x5: cu=len; break;
	case 0x2:
	case KEY_LEFT: if (cu) cu--; break;
	@@ -436,27 +436,26 @@ tgetch(void)
	case 0x15:
	if (cu==0) return;
	len-=cu;
	- memmove(lb, &lb[cu], len);
	+ memmove(l, &l[cu], len);
	dirty=cu=0;
	break;
	case KEY_BACKSPACE:
	if (cu==0) return;
	- memmove(&lb[cu-1], &lb[cu], len-cu);
	+ memmove(&l[cu-1], &l[cu], len-cu);
	dirty=--cu;
	len--;
	break;
	case '\n':
	- if (len==BufSz) len--;
	- lb[len]=0;
	- uparse(lb);
	+ l[len]=0;
	+ uparse(l);
	dirty=cu=len=0;
	break;
	default:
	- if (c>CHAR_MAX \|\| len>=BufSz) return; /* Skip other curses cod…
	- memmove(&lb[cu+1], &lb[cu], len-cu);
	+ if (c>CHAR_MAX \|\| len>=BufSz-1) return; /* Skip other curses c…
	+ memmove(&l[cu+1], &l[cu], len-cu);
	dirty=cu;
	len++;
	- lb[cu++]=c;
	+ l[cu++]=c;
	break;
	}
	/* TODO, add a cleverer printer to deal with long lines. */
	@@ -464,7 +463,7 @@ tgetch(void)
	wmove(scr.iw, 0, strlen(nick)+2+dirty);
	wclrtoeol(scr.iw);
	for (i=dirty; i<len; i++)
	- waddch(scr.iw, lb[i]);
	+ waddch(scr.iw, l[i]);
	}
	wmove(scr.iw, 0, strlen(nick)+2+cu);
	}