1.1 --- a/main.c	Mon Aug 21 07:31:15 2006 +0200
     1.2 +++ b/main.c	Mon Aug 21 07:33:18 2006 +0200
     1.3 @@ -63,7 +63,7 @@
     1.4  }
     1.5  
     1.6  static int
     1.7 -win_property(Window w, Atom a, Atom t, long l, unsigned char **prop)
     1.8 +winprop(Window w, Atom a, Atom t, long l, unsigned char **prop)
     1.9  {
    1.10  	int status, format;
    1.11  	unsigned long res, extra;
    1.12 @@ -116,7 +116,7 @@
    1.13  	long res;
    1.14  	Atom *protocols;
    1.15  
    1.16 -	res = win_property(w, wmatom[WMProtocols], XA_ATOM, 20L,
    1.17 +	res = winprop(w, wmatom[WMProtocols], XA_ATOM, 20L,
    1.18  			((unsigned char **)&protocols));
    1.19  	if(res <= 0) {
    1.20  		return protos;

     2.1 --- a/util.c	Mon Aug 21 07:31:15 2006 +0200
     2.2 +++ b/util.c	Mon Aug 21 07:33:18 2006 +0200
     2.3 @@ -12,7 +12,7 @@
     2.4  /* static */
     2.5  
     2.6  static void
     2.7 -bad_malloc(unsigned int size)
     2.8 +badmalloc(unsigned int size)
     2.9  {
    2.10  	eprint("fatal: could not malloc() %u bytes\n", size);
    2.11  }
    2.12 @@ -25,7 +25,7 @@
    2.13  	void *res = calloc(1, size);
    2.14  
    2.15  	if(!res)
    2.16 -		bad_malloc(size);
    2.17 +		badmalloc(size);
    2.18  	return res;
    2.19  }
    2.20  
    2.21 @@ -45,7 +45,7 @@
    2.22  {
    2.23  	void *res = realloc(ptr, size);
    2.24  	if(!res)
    2.25 -		bad_malloc(size);
    2.26 +		badmalloc(size);
    2.27  	return res;
    2.28  }
    2.29