--- a/project_files/frontlib/util/refcounter.c	Wed Jun 27 22:52:19 2012 +0200
+++ b/project_files/frontlib/util/refcounter.c	Thu Jul 05 00:33:24 2012 +0200
@@ -22,9 +22,7 @@
 #include "logging.h"
 
 void flib_retain(int *referenceCountPtr, const char *objName) {
-	if(!referenceCountPtr || !objName) {
-		flib_log_e("null parameter to flib_retain");
-	} else {
+	if(!log_badargs_if2(referenceCountPtr==NULL, objName==NULL)) {
 		if((*referenceCountPtr)  >= 0) {
 			(*referenceCountPtr)++;
 			flib_log_d("retaining %s, now %i references", objName, (*referenceCountPtr));
@@ -40,17 +38,17 @@
  */
 bool flib_release(int *referenceCountPtr, const char *objName) {
 	bool result = false;
-	if(!referenceCountPtr) {
-		flib_log_e("null parameter to flib_release");
-	} else if((*referenceCountPtr) > 0) {
-		if(--(*referenceCountPtr) == 0) {
-			flib_log_d("releasing and destroying %s", objName);
-			result = true;
-		} else {
-			flib_log_d("releasing %s, now %i references", objName, (*referenceCountPtr));
+	if(!log_badargs_if2(referenceCountPtr==NULL, objName==NULL)) {
+		if((*referenceCountPtr) > 0) {
+			if(--(*referenceCountPtr) == 0) {
+				flib_log_d("releasing and destroying %s", objName);
+				result = true;
+			} else {
+				flib_log_d("releasing %s, now %i references", objName, *referenceCountPtr);
+			}
+		} else if((*referenceCountPtr) == 0) {
+			flib_log_e("Attempt to release a %s with zero references!", objName);
 		}
-	} else if((*referenceCountPtr) == 0) {
-		flib_log_e("Attempt to release a %s with zero references!", objName);
 	}
 	return result;
 }