about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAnselm R.Garbe <arg@10ksloc.org>2006-08-21 07:33:18 +0200
committerAnselm R.Garbe <arg@10ksloc.org>2006-08-21 07:33:18 +0200
commit08d85d6d66bc4493414d76e470e473fa689c5990 (patch)
treeb2acefe4464fc9ec7883c3a1db3af6b264db171d
parentb43989207a949cbc17182b451aa527afe542c98f (diff)
downloaddwm-08d85d6d66bc4493414d76e470e473fa689c5990.tar.gz
small renamings of two static functions
-rw-r--r--main.c4
-rw-r--r--util.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/main.c b/main.c
index 1bc4068..4aad990 100644
--- a/main.c
+++ b/main.c
@@ -63,7 +63,7 @@ scan()
 }
 
 static int
-win_property(Window w, Atom a, Atom t, long l, unsigned char **prop)
+winprop(Window w, Atom a, Atom t, long l, unsigned char **prop)
 {
 	int status, format;
 	unsigned long res, extra;
@@ -116,7 +116,7 @@ getproto(Window w)
 	long res;
 	Atom *protocols;
 
-	res = win_property(w, wmatom[WMProtocols], XA_ATOM, 20L,
+	res = winprop(w, wmatom[WMProtocols], XA_ATOM, 20L,
 			((unsigned char **)&protocols));
 	if(res <= 0) {
 		return protos;
diff --git a/util.c b/util.c
index 2414b39..99d7beb 100644
--- a/util.c
+++ b/util.c
@@ -12,7 +12,7 @@
 /* static */
 
 static void
-bad_malloc(unsigned int size)
+badmalloc(unsigned int size)
 {
 	eprint("fatal: could not malloc() %u bytes\n", size);
 }
@@ -25,7 +25,7 @@ emallocz(unsigned int size)
 	void *res = calloc(1, size);
 
 	if(!res)
-		bad_malloc(size);
+		badmalloc(size);
 	return res;
 }
 
@@ -45,7 +45,7 @@ erealloc(void *ptr, unsigned int size)
 {
 	void *res = realloc(ptr, size);
 	if(!res)
-		bad_malloc(size);
+		badmalloc(size);
 	return res;
 }
 
ref='#n195'>195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245