diff options
-rw-r--r-- | psgeom.c | 6 | ||||
-rw-r--r-- | utils.c | 14 | ||||
-rw-r--r-- | utils.h | 5 |
3 files changed, 3 insertions, 22 deletions
@@ -409,9 +409,9 @@ CrackXLFDName(const char *name, FontStuff *stuff) if ((name == NULL) || (stuff == NULL)) return False; if (name[0] == '-') - tmp = uStringDup(&name[1]); + tmp = strdup(&name[1]); else - tmp = uStringDup(name); + tmp = strdup(name); if (tmp == NULL) return False; stuff->foundry = tmp; @@ -1019,7 +1019,7 @@ PSDoodad(FILE *out, PSState *state, XkbDoodadPtr doodad) char *tmp, *buf, *end; int offset = (leading * 8 / 10); - tmp = buf = uStringDup(doodad->text.text); + tmp = buf = strdup(doodad->text.text); while (tmp != NULL) { end = strchr(tmp, '\n'); if (end != NULL) @@ -147,20 +147,6 @@ uInternalError(const char *s, ...) /***====================================================================***/ -#ifndef HAVE_STRDUP -char * -uStringDup(const char *str) -{ - char *rtrn; - - if (str == NULL) - return NULL; - rtrn = (char *) malloc(strlen(str) + 1); - strcpy(rtrn, str); - return rtrn; -} -#endif - #ifndef HAVE_STRCASECMP int uStrCaseCmp(const char *str1, const char *str2) @@ -99,11 +99,6 @@ extern void uInternalError(const char *s, ...); extern int uStrCaseCmp(const char * /* s1 */ , const char * /* s2 */); #endif -#ifdef HAVE_STRDUP -#define uStringDup(s1) (strdup(s1)) -#else -extern char *uStringDup(const char * /* s1 */); -#endif /***====================================================================***/ |