Remove redundant logic

There were several local strcmp functions that handled NULL input.
I removed the local functions and changed the code to use xstrcmp
from src/common/xstring.c instead. No changed in functionality.