wmii

commit 8b20e63cd8675ef920511c6c2a3e45b3af16602f
parent d93bdf055810bc59ca61e2b4ea64abf6e86adf6b
Author: Anselm R. Garbe <garbeam@wmii.de>
Date:   Thu, 19 Jan 2006 19:43:48 +0200

forget some other occurences


Diffstat:
libixp/ixp.h
 | 
2
+-
libixp/ramfs.c
 | 
12
++++++------
libixp/server.c
 | 
2
+-
liblitz/draw.c
 | 
12
++++++------

4 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/libixp/ixp.h b/libixp/ixp.h
@@ -12,7 +12,7 @@
 #define DEAD_SERVER  "server closed connection unexpectedly"
 #define MAX_SEEN_SHUTDOWN   3
 
-#define _MAX(x,y) ((x) > (y) ? (x) : (y))
+#define xMAX(x,y) ((x) > (y) ? (x) : (y))
 
 /* 9P message types */
 enum {
diff --git a/libixp/ramfs.c b/libixp/ramfs.c
@@ -77,7 +77,7 @@ static int comp_file_name(const void *f1, const void *f2)
 	return strcmp(*(char **) f->name, *(char **) p->name);
 }
 
-static char *_ls(File * f)
+static char *xls(File * f)
 {
 	File *p;
 	char *result = 0;
@@ -143,7 +143,7 @@ ixp_read(IXPServer * s, int fd, size_t offset, void *out_buf,
 	if (f->before_read)
 		f->before_read(s, f);
 	if (is_directory(f)) {
-		result = _ls(f->content);
+		result = xls(f->content);
 		res_len = strlen(result);
 	} else if (f->size) {
 		result = f->content;
@@ -202,17 +202,17 @@ ixp_write(IXPServer * s, int fd, size_t offset, void *content,
 		f->after_write(s, f);
 }
 
-static void _ixp_remove(IXPServer * s, File * f)
+static void xremove(IXPServer * s, File * f)
 {
 	if (!f)
 		return;
 	if (f->next) {
-		_ixp_remove(s, f->next);
+		xremove(s, f->next);
 		if (s->errstr)
 			return;
 	}
 	if (!f->bind && is_directory(f)) {
-		_ixp_remove(s, f->content);
+		xremove(s, f->content);
 		if (s->errstr)
 			return;
 	}
@@ -251,7 +251,7 @@ void ixp_remove_file(IXPServer * s, File * f)
 		}
 	}
 	/* remove now */
-	_ixp_remove(s, f);
+	xremove(s, f);
 }
 
 
diff --git a/libixp/server.c b/libixp/server.c
@@ -166,7 +166,7 @@ static void update_conns(IXPServer * s)
 	FD_ZERO(&s->wr);
 	for (i = 0; i < MAX_CONN; i++) {
 		if (s->conn[i].fd >= 0) {
-			s->nfds = _MAX(s->nfds, s->conn[i].fd);
+			s->nfds = xMAX(s->nfds, s->conn[i].fd);
 			if (s->conn[i].read && !s->conn[i].mode
 				&& (!s->conn[i].len || s->conn[i].remain)) {
 				FD_SET(s->conn[i].fd, &s->rd);
diff --git a/liblitz/draw.c b/liblitz/draw.c
@@ -56,7 +56,7 @@ static void draw_bg(Display * dpy, Draw * d)
 	XFillRectangles(dpy, d->drawable, d->gc, rect, 4);
 }
 
-static void _draw_border(Display * dpy, Draw * d)
+static void xdraw_border(Display * dpy, Draw * d)
 {
 	XPoint points[5];
 
@@ -141,7 +141,7 @@ void blitz_drawmeter(Display * dpy, Draw * d)
 
 	val = blitz_strtonum(&d->data[3], 0, 100);
 	draw_bg(dpy, d);
-	_draw_border(dpy, d);
+	xdraw_border(dpy, d);
 
 	/* draw bg gradient */
 	mh = ((d->rect.height - 4) * val) / 100;
@@ -150,7 +150,7 @@ void blitz_drawmeter(Display * dpy, Draw * d)
 	XFillRectangle(dpy, d->drawable, d->gc, d->rect.x + 2, offy, w, mh);
 }
 
-static void _draw_label(Display * dpy, Draw * d)
+static void xdraw_label(Display * dpy, Draw * d)
 {
 	draw_bg(dpy, d);
 	if (d->data)
@@ -160,11 +160,11 @@ static void _draw_label(Display * dpy, Draw * d)
 /* draws label */
 void blitz_drawlabel(Display * dpy, Draw * d)
 {
-	_draw_label(dpy, d);
-	_draw_border(dpy, d);
+	xdraw_label(dpy, d);
+	xdraw_border(dpy, d);
 }
 
 void blitz_drawlabelnoborder(Display * dpy, Draw * d)
 {
-	_draw_label(dpy, d);
+	xdraw_label(dpy, d);
 }