xkbcomp: Kill warnings about address always evaluating as true

src/xkbcomp/geometry.c

@@ -2536,7 +2536,7 @@ HandleOverlayDef(OverlayDef * def,
         {
             WSGO("Couldn't allocate OverlayKeyInfo\n");
             ACTION2("Overlay %s for section %s will be incomplete\n",
-                    oiText(&ol), scText(si));
+                    XkbcAtomText(ol.name), scText(si));
             return False;
         }
         strncpy(key->over, keyDef->over, XkbKeyNameLength);

src/xkbcomp/utils.h

@@ -237,7 +237,7 @@ uInformation(const char * /* s */ , ...
     );
 #endif
 #ifdef HAVE_STRDUP
-#define	uStringDup(s1)		((s1) ? strdup(s1) : NULL)
+#define	uStringDup(s1)		(strdup(s1))
 #else
      extern char *uStringDup(const char *       /* s1 */
     );