libmemdraw: coding style (from drawterm)

4 files changed, 14 insertions, 13 deletions

diff --git a/sys/src/libmemdraw/draw.c b/sys/src/libmemdraw/draw.c
index d72715aad..4b6f09d12 100644
--- a/sys/src/libmemdraw/draw.c
+++ b/sys/src/libmemdraw/draw.c
@@ -1296,7 +1296,7 @@ readnbit(Param *p, uchar *buf, int y)
 	r = p->bytermin + y*p->bwidth;
 	bits = *r++;
 	nbits = 8;
-	if(i=x&(npack-1)){
+	if((i=x&(npack-1)) != 0){
 		bits <<= depth*i;
 		nbits -= depth*i;
 	}
@@ -1324,7 +1324,7 @@ readnbit(Param *p, uchar *buf, int y)
 	r = p->bytey0s + y*p->bwidth;
 	bits = *r++;
 	nbits = 8;
-	if(i=x&(npack-1)){
+	if((i=x&(npack-1)) != 0){
 		bits <<= depth*i;
 		nbits -= depth*i;
 	}
diff --git a/sys/src/libmemdraw/ellipse.c b/sys/src/libmemdraw/ellipse.c
index a475f4c2d..07b7c0b3d 100644
--- a/sys/src/libmemdraw/ellipse.c
+++ b/sys/src/libmemdraw/ellipse.c
@@ -124,7 +124,7 @@ memellipse(Memimage *dst, Point c, int a, int b, int t, Memimage *src, Point sp,
 	p.op = op;
 
 	u = (t<<1)*(a-b);
-	if(b<a && u>b*b || a<b && -u>a*a) {
+	if((b<a && u>b*b) || (a<b && -u>a*a)) {
 /*	if(b<a&&(t<<1)>b*b/a || a<b&&(t<<1)>a*a/b)	# very thick */
 		bellipse(b, newstate(&in, a, b), &p);
 		return;
@@ -207,7 +207,7 @@ erect(int x0, int y0, int x1, int y1, Param *p)
 {
 	Rectangle r;
 
-/*	print("R %d,%d %d,%d\n", x0, y0, x1, y1); /**/
+/*	print("R %d,%d %d,%d\n", x0, y0, x1, y1); */
 	r = Rect(p->c.x+x0, p->c.y+y0, p->c.x+x1+1, p->c.y+y1+1);
 	memdraw(p->dst, r, p->src, addpt(p->sp, r.min), memopaque, ZP, p->op);
 }
@@ -222,7 +222,7 @@ epoint(int x, int y, Param *p)
 	Point p0;
 	Rectangle r;
 
-/*	print("P%d %d,%d\n", p->t, x, y);	/**/
+/*	print("P%d %d,%d\n", p->t, x, y); */
 	p0 = Pt(p->c.x+x, p->c.y+y);
 	r = Rpt(addpt(p0, p->disc->r.min), addpt(p0, p->disc->r.max));
 	memdraw(p->dst, r, p->src, addpt(p->sp, r.min), p->disc, p->disc->r.min, p->op);
@@ -235,7 +235,7 @@ static
 void
 eline(int x0, int y0, int x1, int y1, Param *p)
 {
-/*	print("L%d %d,%d %d,%d\n", p->t, x0, y0, x1, y1); /**/
+/*	print("L%d %d,%d %d,%d\n", p->t, x0, y0, x1, y1); */
 	if(x1 > x0+1)
 		erect(x0+1, y0-p->t, x1-1, y1+p->t, p);
 	else if(y1 > y0+1)
diff --git a/sys/src/libmemdraw/line.c b/sys/src/libmemdraw/line.c
index 1898aa22f..6457417a4 100644
--- a/sys/src/libmemdraw/line.c
+++ b/sys/src/libmemdraw/line.c
@@ -13,23 +13,24 @@ enum
 
 static
 int
-lmin(int a, int b)
+lmax(int a, int b)
 {
-	if(a < b)
+	if(a > b)
 		return a;
 	return b;
 }
 
+#ifdef NOTUSED
+
 static
 int
-lmax(int a, int b)
+lmin(int a, int b)
 {
-	if(a > b)
+	if(a < b)
 		return a;
 	return b;
 }
 
-#ifdef NOTUSED
 /*
  * Rather than line clip, we run the Bresenham loop over the full line,
  * and clip on each pixel.  This is more expensive but means that
diff --git a/sys/src/libmemdraw/string.c b/sys/src/libmemdraw/string.c
index 7130bdb4f..c0a6dc2de 100644
--- a/sys/src/libmemdraw/string.c
+++ b/sys/src/libmemdraw/string.c
@@ -13,7 +13,7 @@ memimagestring(Memimage *b, Point p, Memimage *color, Point cp, Memsubfont *f, c
 	Fontchar *i;
 
 	s = (uchar*)cs;
-	for(; c=*s; p.x+=width, cp.x+=width){
+	for(; (c=*s) != 0; p.x+=width, cp.x+=width){
 		width = 0;
 		if(c < Runeself)
 			s++;
@@ -46,7 +46,7 @@ memsubfontwidth(Memsubfont *f, char *cs)
 
 	p = Pt(0, f->height);
 	s = (uchar*)cs;
-	for(; c=*s; p.x+=width){
+	for(; (c=*s) != 0; p.x+=width){
 		width = 0;
 		if(c < Runeself)
 			s++;