src/shared/util.c: cosmetic changes to more easily follow upstream

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>