summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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;
}