This shouldn't need to be two functions.  Also, there is now a __FUNCTION__ in the compiler which means you don't have to explicitly pass the function name.