Trivial changes: whitespace and modes.

Remote whitespace at the ends of lines.
Remove blank lines from the ends of files.
Change modes on source files so that they
are not executable.

Signed-off-by: Dan Cross <cross@gajendra.net>

27 files changed, 76 insertions, 85 deletions

diff --git a/src/libdraw/allocimagemix.c b/src/libdraw/allocimagemix.c
index 09d60ec9..6d2b2d15 100644
--- a/src/libdraw/allocimagemix.c
+++ b/src/libdraw/allocimagemix.c
@@ -10,7 +10,7 @@ allocimagemix(Display *d, u32int color1, u32int color3)
 
 	if(qmask == nil)
 		qmask = allocimage(d, Rect(0,0,1,1), GREY8, 1, 0x3F3F3FFF);
-		
+
 	if(d->screenimage->depth <= 8){	/* create a 2×2 texture */
 		t = allocimage(d, Rect(0,0,1,1), d->screenimage->chan, 0, color1);
 		if(t == nil)
diff --git a/src/libdraw/arith.c b/src/libdraw/arith.c
index 1b19fc1c..d7c067a3 100644
--- a/src/libdraw/arith.c
+++ b/src/libdraw/arith.c
@@ -201,4 +201,3 @@ Pfmt(Fmt *f)
 	p = va_arg(f->args, Point);
 	return fmtprint(f, "[%d %d]", p.x, p.y);
 }
-
diff --git a/src/libdraw/buildfont.c b/src/libdraw/buildfont.c
index 02d976e1..5425ad44 100644
--- a/src/libdraw/buildfont.c
+++ b/src/libdraw/buildfont.c
@@ -154,7 +154,7 @@ freefont(Font *f)
 			f->display->firstfont = f->next;
 	}
 
-	if(f->lodpi != f)	
+	if(f->lodpi != f)
 		freefont(f->lodpi);
 	if(f->hidpi != f)
 		freefont(f->hidpi);
diff --git a/src/libdraw/chan.c b/src/libdraw/chan.c
index 5e94b016..0cf2b668 100644
--- a/src/libdraw/chan.c
+++ b/src/libdraw/chan.c
@@ -42,7 +42,7 @@ strtochan(char *s)
 		p++;
 
 	while(*p && !isspace((uchar)*p)){
-		if((q = strchr(channames, p[0])) == nil) 
+		if((q = strchr(channames, p[0])) == nil)
 			return 0;
 		t = q-channames;
 		if(p[1] < '0' || p[1] > '9')
diff --git a/src/libdraw/computil.c b/src/libdraw/computil.c
index 30a3d11e..b1dc2999 100644
--- a/src/libdraw/computil.c
+++ b/src/libdraw/computil.c
@@ -3,7 +3,7 @@
 #include <draw.h>
 
 /*
- * compressed data are seuences of byte codes.  
+ * compressed data are seuences of byte codes.
  * if the first byte b has the 0x80 bit set, the next (b^0x80)+1 bytes
  * are data.  otherwise, it's two bytes specifying a previous string to repeat.
  */
diff --git a/src/libdraw/draw.c b/src/libdraw/draw.c
index d3f83e88..f72d35df 100644
--- a/src/libdraw/draw.c
+++ b/src/libdraw/draw.c
@@ -15,7 +15,7 @@ _setdrawop(Display *d, Drawop op)
 		a[1] = op;
 	}
 }
-		
+
 static void
 draw1(Image *dst, Rectangle *r, Image *src, Point *p0, Image *mask, Point *p1, Drawop op)
 {
diff --git a/src/libdraw/drawclient.c b/src/libdraw/drawclient.c
index f0b1d388..ef0356b8 100644
--- a/src/libdraw/drawclient.c
+++ b/src/libdraw/drawclient.c
@@ -23,10 +23,10 @@ int
 _displayconnect(Display *d)
 {
 	int pid, p[2];
-	
+
 	fmtinstall('W', drawfcallfmt);
 	fmtinstall('H', encodefmt);
-	
+
 	if(pipe(p) < 0)
 		return -1;
 	if((pid=fork()) < 0){
@@ -84,7 +84,7 @@ _displaymux(Display *d)
 	d->mux->settag = drawsettag;
 	d->mux->aux = d;
 	muxinit(d->mux);
-	
+
 	return 0;
 }
 
@@ -94,7 +94,7 @@ drawsend(Mux *mux, void *vmsg)
 	int n;
 	uchar *msg;
 	Display *d;
-	
+
 	msg = vmsg;
 	GET(msg, n);
 	d = mux->aux;
@@ -148,7 +148,7 @@ drawgettag(Mux *mux, void *vmsg)
 {
 	uchar *msg;
 	USED(mux);
-	
+
 	msg = vmsg;
 	return msg[4];
 }
@@ -158,7 +158,7 @@ drawsettag(Mux *mux, void *vmsg, uint tag)
 {
 	uchar *msg;
 	USED(mux);
-	
+
 	msg = vmsg;
 	msg[4] = tag;
 	return 0;
@@ -169,7 +169,7 @@ displayrpc(Display *d, Wsysmsg *tx, Wsysmsg *rx, void **freep)
 {
 	int n, nn;
 	void *tpkt, *rpkt;
-	
+
 	n = sizeW2M(tx);
 	tpkt = malloc(n);
 	if(freep)
@@ -295,7 +295,7 @@ int
 _displaycursor(Display *d, Cursor *c, Cursor2 *c2)
 {
 	Wsysmsg tx, rx;
-	
+
 	tx.type = Tcursor2;
 	if(c == nil){
 		memset(&tx.cursor, 0, sizeof tx.cursor);
@@ -316,7 +316,7 @@ int
 _displaybouncemouse(Display *d, Mouse *m)
 {
 	Wsysmsg tx, rx;
-	
+
 	tx.type = Tbouncemouse;
 	tx.mouse = *m;
 	return displayrpc(d, &tx, &rx, nil);
@@ -326,7 +326,7 @@ int
 _displaylabel(Display *d, char *label)
 {
 	Wsysmsg tx, rx;
-	
+
 	tx.type = Tlabel;
 	tx.label = label;
 	return displayrpc(d, &tx, &rx, nil);
@@ -338,7 +338,7 @@ _displayrdsnarf(Display *d)
 	void *p;
 	char *s;
 	Wsysmsg tx, rx;
-	
+
 	tx.type = Trdsnarf;
 	if(displayrpc(d, &tx, &rx, &p) < 0)
 		return nil;
@@ -351,7 +351,7 @@ int
 _displaywrsnarf(Display *d, char *snarf)
 {
 	Wsysmsg tx, rx;
-	
+
 	tx.type = Twrsnarf;
 	tx.snarf = snarf;
 	return displayrpc(d, &tx, &rx, nil);
@@ -362,7 +362,7 @@ _displayrddraw(Display *d, void *v, int n)
 {
 	void *p;
 	Wsysmsg tx, rx;
-	
+
 	tx.type = Trddraw;
 	tx.count = n;
 	if(displayrpc(d, &tx, &rx, &p) < 0)
@@ -376,7 +376,7 @@ int
 _displaywrdraw(Display *d, void *v, int n)
 {
 	Wsysmsg tx, rx;
-	
+
 	tx.type = Twrdraw;
 	tx.count = n;
 	tx.data = v;
@@ -398,7 +398,7 @@ int
 _displayresize(Display *d, Rectangle r)
 {
 	Wsysmsg tx, rx;
-	
+
 	tx.type = Tresize;
 	tx.rect = r;
 	return displayrpc(d, &tx, &rx, nil);
@@ -409,7 +409,7 @@ canreadfd(int fd)
 {
 	fd_set rs, ws, xs;
 	struct timeval tv;
-	
+
 	FD_ZERO(&rs);
 	FD_ZERO(&ws);
 	FD_ZERO(&xs);
@@ -423,4 +423,3 @@ canreadfd(int fd)
 		return 1;
 	return 0;
 }
-
diff --git a/src/libdraw/drawfcall.c b/src/libdraw/drawfcall.c
index 09051bbc..c74b3faf 100644
--- a/src/libdraw/drawfcall.c
+++ b/src/libdraw/drawfcall.c
@@ -17,7 +17,7 @@ static int
 PUTSTRING(uchar *p, char *s)
 {
 	int n;
-	
+
 	if(s == nil)
 		s = "";
 	n = strlen(s);
@@ -30,14 +30,14 @@ static int
 GETSTRING(uchar *p, char **s)
 {
 	int n;
-	
+
 	GET(p, n);
 	memmove(p, p+4, n);
 	*s = (char*)p;
 	p[n] = 0;
 	return n+4;
 }
-	
+
 uint
 sizeW2M(Wsysmsg *m)
 {
@@ -96,7 +96,7 @@ uint
 convW2M(Wsysmsg *m, uchar *p, uint n)
 {
 	int nn;
-	
+
 	nn = sizeW2M(m);
 	if(n < nn || nn == 0 || n < 6)
 		return 0;
@@ -188,7 +188,7 @@ convW2M(Wsysmsg *m, uchar *p, uint n)
 		PUT(p+14, m->rect.max.x);
 		PUT(p+18, m->rect.max.y);
 		break;
-	}		
+	}
 	return nn;
 }
 
@@ -196,7 +196,7 @@ uint
 convM2W(uchar *p, uint n, Wsysmsg *m)
 {
 	int nn;
-	
+
 	if(n < 6)
 		return 0;
 	GET(p, nn);
@@ -288,7 +288,7 @@ convM2W(uchar *p, uint n, Wsysmsg *m)
 		GET(p+14, m->rect.max.x);
 		GET(p+18, m->rect.max.y);
 		break;
-	}	
+	}
 	return nn;
 }
 
@@ -313,7 +313,7 @@ int
 drawfcallfmt(Fmt *fmt)
 {
 	Wsysmsg *m;
-	
+
 	m = va_arg(fmt->args, Wsysmsg*);
 	fmtprint(fmt, "tag=%d ", m->tag);
 	switch(m->type){
@@ -325,7 +325,7 @@ drawfcallfmt(Fmt *fmt)
 		return fmtprint(fmt, "Trdmouse");
 	case Rrdmouse:
 		return fmtprint(fmt, "Rrdmouse x=%d y=%d buttons=%d msec=%d resized=%d",
-			m->mouse.xy.x, m->mouse.xy.y, 
+			m->mouse.xy.x, m->mouse.xy.y,
 			m->mouse.buttons, m->mouse.msec, m->resized);
 	case Tbouncemouse:
 		return fmtprint(fmt, "Tbouncemouse x=%d y=%d buttons=%d",
diff --git a/src/libdraw/drawrepl.c b/src/libdraw/drawrepl.c
index c72fee26..77c20d43 100644
--- a/src/libdraw/drawrepl.c
+++ b/src/libdraw/drawrepl.c
@@ -20,4 +20,3 @@ drawrepl(Rectangle r, Point p)
 	p.y = drawreplxy(r.min.y, r.max.y, p.y);
 	return p;
 }
-
diff --git a/src/libdraw/event.c b/src/libdraw/event.c
index b369c020..9d7e10c2 100644
--- a/src/libdraw/event.c
+++ b/src/libdraw/event.c
@@ -187,7 +187,7 @@ static Ebuf*
 newebuf(Slave *s, int n)
 {
 	Ebuf *eb;
-	
+
 	eb = malloc(sizeof(*eb) - sizeof(eb->u.buf) + n);
 	if(eb == nil)
 		drawerror(display, "events: out of memory");
@@ -205,7 +205,7 @@ startrpc(int type)
 {
 	uchar buf[100];
 	Wsysmsg w;
-	
+
 	w.type = type;
 	convW2M(&w, buf, sizeof buf);
 	return muxrpcstart(display->mux, buf);
@@ -217,7 +217,7 @@ finishrpc(Muxrpc *r, Wsysmsg *w)
 	uchar *p;
 	void *v;
 	int n;
-	
+
 	if(!muxrpccanfinish(r, &v))
 		return 0;
 	p = v;
@@ -245,9 +245,9 @@ extract(int canblock)
 	 * Also make sure that we don't interfere with app-specific locking.
 	 */
 	if(display->locking){
-		/* 
-		 * if locking is being done by program, 
-		 * this means it can't depend on automatic 
+		/*
+		 * if locking is being done by program,
+		 * this means it can't depend on automatic
 		 * flush in emouse() etc.
 		 */
 		if(canqlock(&display->qlock)){
@@ -311,7 +311,7 @@ extract(int canblock)
 				max = eslave[i].fd;
 		}
 	}
-	
+
 	if(!canblock){
 		tv.tv_sec = 0;
 		tv.tv_usec = 0;
@@ -437,4 +437,3 @@ ereadmouse(Mouse *m)
 		eresized(1);
 	return 1;
 }
-
diff --git a/src/libdraw/font.c b/src/libdraw/font.c
index c0235c4b..34121aaf 100644
--- a/src/libdraw/font.c
+++ b/src/libdraw/font.c
@@ -54,7 +54,7 @@ cachechars(Font *f, char **ss, Rune **rr, ushort *cp, int max, int *wp, char **s
 			c++;
 			h++;
 		}
-	
+
 		/*
 		 * Not found; toss out oldest entry
 		 */
@@ -91,7 +91,7 @@ cachechars(Font *f, char **ss, Rune **rr, ushort *cp, int max, int *wp, char **s
 			break;
 		}
 		c = &f->cache[h];	/* may have reallocated f->cache */
-	
+
 	    Found:
 		wid += c->width;
 		c->age = f->age;
diff --git a/src/libdraw/getsubfont.c b/src/libdraw/getsubfont.c
index ba675390..ec4ccfe3 100644
--- a/src/libdraw/getsubfont.c
+++ b/src/libdraw/getsubfont.c
@@ -73,14 +73,14 @@ scalesubfont(Subfont *f, int scale)
 	int y, x, x2, j;
 	uchar *src, *dst;
 	int srcn, dstn, n, mask, v, pack;
-	
+
 	r = f->bits->r;
 	r2 = r;
 	r2.min.x *= scale;
 	r2.min.y *= scale;
 	r2.max.x *= scale;
 	r2.max.y *= scale;
-	
+
 	srcn = bytesperline(r, f->bits->depth);
 	src = malloc(srcn);
 	dstn = bytesperline(r2, f->bits->depth);
@@ -111,7 +111,7 @@ scalesubfont(Subfont *f, int scale)
 	f->bits = i;
 	f->height *= scale;
 	f->ascent *= scale;
-	
+
 	for(j=0; j<f->n; j++) {
 		f->info[j].x *= scale;
 		f->info[j].top *= scale;
diff --git a/src/libdraw/icossin2.c b/src/libdraw/icossin2.c
index aa864e1a..c8cfebc8 100644
--- a/src/libdraw/icossin2.c
+++ b/src/libdraw/icossin2.c
@@ -3,7 +3,7 @@
 #include	<draw.h>
 
 /*
- * Sine and Cosine of arctangents, calculated by 
+ * Sine and Cosine of arctangents, calculated by
  *   (sin(atan(index/100.0))*1024.+0.5)
  *   (cos(atan(index/100.0))*1024.+0.5)
  * To use, get rational tangent between 0<=tan<=1, scale by 100,
diff --git a/src/libdraw/init.c b/src/libdraw/init.c
index 350365fe..31d90144 100644
--- a/src/libdraw/init.c
+++ b/src/libdraw/init.c
@@ -90,7 +90,7 @@ geninitdraw(char *devdir, void(*error)(Display*, char*), char *fontname, char *l
 	visibleclicks = p != nil && *p == '1';
 	if(visibleclicks) {
 		Font *f;
-		
+
 		f = display->defaultfont;
 		mousebuttons = allocimage(display, Rect(0,0,64,22), screen->chan, 0, DWhite);
 		border(mousebuttons, mousebuttons->r, 1, display->black, ZP);
@@ -129,7 +129,7 @@ getimage0(Display *d, Image *image)
 
 	/*
 	 * If there's an old screen, it has id 0.  The 'J' request below
-	 * will try to install the new screen as id 0, so the old one 
+	 * will try to install the new screen as id 0, so the old one
 	 * must be freed first.
 	 */
 	if(image){
@@ -172,7 +172,7 @@ getimage0(Display *d, Image *image)
 	image->clipr.min.y = atoi(info+9*12);
 	image->clipr.max.x = atoi(info+10*12);
 	image->clipr.max.y = atoi(info+11*12);
-	
+
 	a = bufimage(d, 3);
 	a[0] = 'q';
 	a[1] = 1;
@@ -193,9 +193,9 @@ getwindow(Display *d, int ref)
 {
 	Image *i, *oi;
 	Font *f;
-	
+
 	/* XXX check for destroyed? */
-	
+
 	/*
 	 * Libdraw promises not to change the value of "screen",
 	 * so we have to reuse the image structure
@@ -262,7 +262,7 @@ _initdisplay(void (*error)(Display*, char*), char *label)
 		free(disp->buf);
 		goto Error2;
 	}
-	
+
 	if(_displaymux(disp) < 0
 	|| _displayconnect(disp) < 0
 	|| _displayinit(disp, label, winsize) < 0)
@@ -276,7 +276,7 @@ _initdisplay(void (*error)(Display*, char*), char *label)
 	image = getimage0(disp, nil);
 	if(image == nil)
 		goto Error4;
-	
+
 	disp->image = image;
 	disp->white = allocimage(disp, Rect(0, 0, 1, 1), GREY1, 1, DWhite);
 	disp->black = allocimage(disp, Rect(0, 0, 1, 1), GREY1, 1, DBlack);
@@ -285,7 +285,7 @@ _initdisplay(void (*error)(Display*, char*), char *label)
 		free(disp->black);
 		goto Error4;
 	}
-	
+
 	disp->opaque = disp->white;
 	disp->transparent = disp->black;
 
@@ -390,7 +390,7 @@ flushimage(Display *d, int visible)
 		r = rectaddpt(r, _drawmouse.xy);
 		r = rectaddpt(r, Pt(-Dx(mousebuttons->r)/2, -Dy(mousebuttons->r)-3));
 		drawop(mousesave, mousesave->r, screen, nil, r.min, S);
-		
+
 		r1 = rectaddpt(Rect(0, 0, 22, 22), r.min);
 		if(_drawmouse.buttons & 1)
 			drawop(screen, r1, mousebuttons, nil, ZP, S);
@@ -404,7 +404,7 @@ flushimage(Display *d, int visible)
 		drawop(screen, r, mousesave, nil, ZP, S);
 		return ret;
 	}
-	
+
 	if(visible){
 		*d->bufp++ = 'v';	/* five bytes always reserved for this */
 		if(d->_isnewdisplay){
diff --git a/src/libdraw/iprint.c b/src/libdraw/iprint.c
index 206044e7..58654868 100644
--- a/src/libdraw/iprint.c
+++ b/src/libdraw/iprint.c
@@ -4,7 +4,7 @@
 
 int
 iprint(char *fmt, ...)
-{	
+{
 	va_list arg;
 
 	va_start(arg, fmt);
diff --git a/src/libdraw/keyboard.c b/src/libdraw/keyboard.c
index 755ffbd3..ef7b5802 100644
--- a/src/libdraw/keyboard.c
+++ b/src/libdraw/keyboard.c
@@ -25,7 +25,7 @@ _ioproc(void *arg)
 {
 	Rune r;
 	Keyboardctl *kc;
-	
+
 	kc = arg;
 	threadsetname("kbdproc");
 	for(;;){
@@ -49,4 +49,3 @@ initkeyboard(char *file)
 	proccreate(_ioproc, kc, 32*1024);
 	return kc;
 }
-
diff --git a/src/libdraw/mouse.c b/src/libdraw/mouse.c
index fc486be4..64a7f73d 100644
--- a/src/libdraw/mouse.c
+++ b/src/libdraw/mouse.c
@@ -93,4 +93,3 @@ setcursor2(Mousectl *mc, Cursor *c, Cursor2 *c2)
 {
 	_displaycursor(mc->display, c, c2);
 }
-
diff --git a/src/libdraw/newwindow.c b/src/libdraw/newwindow.c
index 88784adf..e77b54db 100644
--- a/src/libdraw/newwindow.c
+++ b/src/libdraw/newwindow.c
@@ -24,4 +24,3 @@ newwindow(char *str)
 		strcpy(buf, "new");
 	return mount(fd, -1, "/dev", MBEFORE, buf);
 }
-
diff --git a/src/libdraw/openfont.c b/src/libdraw/openfont.c
index 366664ae..9312eb43 100644
--- a/src/libdraw/openfont.c
+++ b/src/libdraw/openfont.c
@@ -10,7 +10,7 @@ parsefontscale(char *name, char **base)
 {
 	char *p;
 	int scale;
-	
+
 	p = name;
 	scale = 0;
 	while('0' <= *p && *p <= '9') {
@@ -24,7 +24,7 @@ parsefontscale(char *name, char **base)
 		scale = 1;
 	}
 	return scale;
-}	
+}
 
 extern char _defontfile[];
 
@@ -114,7 +114,7 @@ swapfont(Font *targ, Font **oldp, Font **newp)
 
 	if(targ != *oldp)
 		sysfatal("bad swapfont %p %p %p", targ, *oldp, *newp);
-	
+
 	old = *oldp;
 	new = *newp;
 
@@ -175,12 +175,12 @@ hidpiname(Font *f)
 {
 	char *p, *q;
 	int size;
-	
+
 	// If font name has form x,y return y.
 	p = strchr(f->namespec, ',');
 	if(p != nil)
 		return strdup(p+1);
-	
+
 	// If font name is /mnt/font/Name/Size/font, scale Size.
 	if(strncmp(f->name, "/mnt/font/", 10) == 0) {
 		p = strchr(f->name+10, '/');
@@ -191,9 +191,9 @@ hidpiname(Font *f)
 		while('0' <= *q && *q <= '9')
 			size = size*10 + *q++ - '0';
 		return smprint("%.*s%d%s", utfnlen(f->name, p-f->name), f->name, size*2, q);
-	}		
+	}
 
-	// Otherwise use pixel doubling.	
+	// Otherwise use pixel doubling.
 scale:
 	return smprint("%d*%s", f->scale*2, f->name);
 }
@@ -210,7 +210,7 @@ loadhidpi(Font *f)
 		swapfont(f, &f->lodpi, &f->hidpi);
 		return;
 	}
-	
+
 	name = hidpiname(f);
 	fnew = openfont1(f->display, name);
 	if(fnew == nil)
@@ -227,7 +227,7 @@ openfont(Display *d, char *name)
 	Font *f;
 	char *p;
 	char *namespec;
-	
+
 	// If font name has form x,y use x for lodpi, y for hidpi.
 	name = strdup(name);
 	namespec = strdup(name);
@@ -240,7 +240,7 @@ openfont(Display *d, char *name)
 	f->lodpi = f;
 	free(f->namespec);
 	f->namespec = namespec;
-	
+
 	/* add to display list for when dpi changes */
 	/* d can be nil when invoked from mc. */
 	if(d != nil) {
@@ -252,12 +252,12 @@ openfont(Display *d, char *name)
 		else
 			d->firstfont = f;
 		d->lastfont = f;
-	
+
 		/* if this is a hi-dpi display, find hi-dpi version and swap */
 		if(d->dpi >= DefaultDPI*3/2)
 			loadhidpi(f);
 	}
-	
+
 	free(name);
 
 	return f;
@@ -270,7 +270,7 @@ _fontpipe(char *name)
 	char c;
 	char buf[1024], *argv[10];
 	int nbuf, pid;
-	
+
 	if(pipe(p) < 0)
 		return -1;
 	pid = rfork(RFNOWAIT|RFFDG|RFPROC);
@@ -294,7 +294,7 @@ _fontpipe(char *name)
 		_exit(0);
 	}
 	close(p[1]);
-	
+
 	// success marked with leading \001.
 	// otherwise an error happened.
 	for(nbuf=0; nbuf<sizeof buf-1; nbuf++) {
diff --git a/src/libdraw/rgb.c b/src/libdraw/rgb.c
index e8f7f51b..b537533d 100644
--- a/src/libdraw/rgb.c
+++ b/src/libdraw/rgb.c
@@ -11,7 +11,7 @@
  * over the color map looking for the nearest point in RGB
  * space.  There is no visual psychology reason for that
  * criterion, but it's easy to implement and the results are
- * far more pleasing. 
+ * far more pleasing.
  *
 int
 rgb2cmap(int cr, int cg, int cb)
diff --git a/src/libdraw/scroll.c b/src/libdraw/scroll.c
index ea0aa25c..fa2f3d9f 100644
--- a/src/libdraw/scroll.c
+++ b/src/libdraw/scroll.c
@@ -25,5 +25,5 @@ mousescrollsize(int maxlines)
 
 	if(lines)
 		return lines;
-	return pcnt * maxlines/100.0;	
+	return pcnt * maxlines/100.0;
 }
diff --git a/src/libdraw/string.c b/src/libdraw/string.c
index 392a7e8a..5ba5016a 100644
--- a/src/libdraw/string.c
+++ b/src/libdraw/string.c
@@ -137,7 +137,7 @@ _string(Image *dst, Point pt, Image *src, Point sp, Font *f, char *s, Rune *r, i
 				else
 					break;
 			}
-			/* 
+			/*
 			 * must not free sf until cachechars has found it in the cache
 			 * and picked up its own reference.
 			 */
diff --git a/src/libdraw/stringwidth.c b/src/libdraw/stringwidth.c
index 522fbc01..52d9fd67 100644
--- a/src/libdraw/stringwidth.c
+++ b/src/libdraw/stringwidth.c
@@ -55,7 +55,7 @@ _stringnwidth(Font *f, char *s, Rune *r, int len)
 					else
 						break;
 				}
-				/* 
+				/*
 				 * must not free sf until cachechars has found it in the cache
 				 * and picked up its own reference.
 				 */
diff --git a/src/libdraw/subfont.c b/src/libdraw/subfont.c
index 9630a087..494cd574 100644
--- a/src/libdraw/subfont.c
+++ b/src/libdraw/subfont.c
@@ -20,9 +20,9 @@ allocsubfont(char *name, int n, int height, int ascent, Fontchar *info, Image *i
 	f->ref = 1;
 	if(name){
 		/*
-		 * if already caching this subfont, leave older 
+		 * if already caching this subfont, leave older
 		 * (and hopefully more widely used) copy in cache.
-		 * this case should not happen -- we got called 
+		 * this case should not happen -- we got called
 		 * because cachechars needed this subfont and it
 		 * wasn't in the cache.
 		 */
diff --git a/src/libdraw/subfontname.c b/src/libdraw/subfontname.c
index e6059d0e..d247cb61 100644
--- a/src/libdraw/subfontname.c
+++ b/src/libdraw/subfontname.c
@@ -11,7 +11,7 @@ subfontname(char *cfname, char *fname, int maxdepth)
 {
 	char *t, *u, *tmp1, *tmp2, *base;
 	int i, scale;
-	
+
 	scale = parsefontscale(fname, &base);
 
 	t = strdup(cfname);  /* t is the return string */
diff --git a/src/libdraw/unix.c b/src/libdraw/unix.c
index 76bc75d0..be45b75a 100644
--- a/src/libdraw/unix.c
+++ b/src/libdraw/unix.c
@@ -12,4 +12,3 @@ _drawflength(int fd)
 		return -1;
 	return s.st_size;
 }
-
diff --git a/src/libdraw/wsys.c b/src/libdraw/wsys.c
index d9632503..572bc1d2 100644
--- a/src/libdraw/wsys.c
+++ b/src/libdraw/wsys.c
@@ -27,4 +27,3 @@ drawresizewindow(Rectangle r)
 {
 	_displayresize(display, r);
 }
-