fi
fi
-AC_CHECK_FUNCS([strdup strcasecmp])
+AC_CHECK_FUNCS([strcasecmp])
XORG_CHECK_MALLOC_ZERO
XORG_CWARNFLAGS
if (merge == MergeDefault)
merge = MergeAugment;
- info->name = uStringDup(file->name);
+ info->name = _XkbDupString(file->name);
stmt = file->defs;
while (stmt)
{
}
if (old->value)
uFree(old->value);
- old->value = uStringDup(new->value);
+ old->value = _XkbDupString(new->value);
return True;
}
if (((old->defs.fileID == new->defs.fileID) && (warningLevel > 0))
if ((new = NextProperty(info)) == NULL)
return False;
new->defs.next = NULL;
- new->name = uStringDup(old->name);
- new->value = uStringDup(old->value);
+ new->name = _XkbDupString(old->name);
+ new->value = _XkbDupString(old->value);
return True;
}
return ReportBadType(typeName, field, ddText(di),
"string");
}
- di->logoName = uStringDup(tmp.str);
+ di->logoName = _XkbDupString(tmp.str);
return True;
}
return ReportBadField(typeName, field, ddText(di));
if (merge == MergeDefault)
merge = MergeAugment;
- info->name = uStringDup(file->name);
+ info->name = _XkbDupString(file->name);
stmt = file->defs;
while (stmt)
{
}
if (info.fontSpec != None)
geom->label_font =
- uStringDup(XkbcAtomGetString(info.fontSpec));
+ _XkbDupString(XkbcAtomGetString(info.fontSpec));
else
geom->label_font = FontFromParts(info.font, info.fontWeight,
info.fontSlant,
{
ParseCommon *stmt;
- info->name = uStringDup(file->name);
+ info->name = _XkbDupString(file->name);
stmt = file->defs;
while (stmt)
{
tok_TWO_LEVEL = XkbcInternAtom("TWO_LEVEL", False);
tok_ALPHABETIC = XkbcInternAtom("ALPHABETIC", False);
tok_KEYPAD = XkbcInternAtom("KEYPAD", False);
- info->name = uStringDup("default");
+ info->name = strdup("default");
info->errorCount = 0;
info->stdPresent = 0;
info->nTypes = 0;
{
ParseCommon *stmt;
- info->name = uStringDup(file->name);
+ info->name = _XkbDupString(file->name);
stmt = file->defs;
while (stmt)
{
incl = first = NULL;
file = map = NULL;
tmp = str;
- stmt = uStringDup(str);
+ stmt = _XkbDupString(str);
while ((tmp) && (*tmp))
{
if (XkbParseIncludeMap(&tmp, &file, &map, &nextop, &extra_data))
XkbcEnsureSafeMapName(name);
bzero(file, sizeof(XkbFile));
file->type = type;
- file->topName = uStringDup(name);
+ file->topName = _XkbDupString(name);
file->name = name;
file->defs = defs;
file->id = fileID++;
{
ParseCommon *stmt;
- info->name = uStringDup(file->name);
+ info->name = _XkbDupString(file->name);
stmt = file->defs;
while (stmt)
{
/***====================================================================***/
-#ifndef HAVE_STRDUP
-char *
-uStringDup(const char *str)
-{
- char *rtrn;
-
- if (str == NULL)
- return NULL;
- rtrn = (char *) uAlloc(strlen(str) + 1);
- strcpy(rtrn, str);
- return rtrn;
-}
-#endif
-
#ifndef HAVE_STRCASECMP
int
uStrCaseCmp(const char *str1, const char *str2)
extern int
uStrCasePrefix(const char *p, char *str);
#endif
-#ifdef HAVE_STRDUP
-#define uStringDup(s1) ((s1) ? strdup(s1) : NULL)
-#else
-extern char *
-uStringDup(const char *s);
-#endif
/***====================================================================***/
#include <limits.h>
#include "X11/extensions/XKBcommon.h"
#include <X11/extensions/XKM.h>
-#include "XKBcommonint.h"
#include "xkbcomp.h"
#include "parseutils.h"
#include "utils.h"
#include <X11/extensions/XKM.h>
#include "X11/extensions/XKBcommon.h"
+#include "XKBcommonint.h"
extern char *scanFile;
if (tmp != NULL)
{
*tmp++ = '\0';
- *extra_data = uStringDup(tmp);
+ *extra_data = _XkbDupString(tmp);
}
else
{
tmp = strchr(str, '(');
if (tmp == NULL)
{
- *file_rtrn = uStringDup(str);
+ *file_rtrn = _XkbDupString(str);
*map_rtrn = NULL;
}
else if (str[0] == '(')
else
{
*tmp++ = '\0';
- *file_rtrn = uStringDup(str);
+ *file_rtrn = _XkbDupString(str);
str = tmp;
tmp = strchr(str, ')');
if ((tmp == NULL) || (tmp[1] != '\0'))
return False;
}
*tmp++ = '\0';
- *map_rtrn = uStringDup(str);
+ *map_rtrn = _XkbDupString(str);
}
}
if (*nextop_rtrn == '\0')
buf[nInBuf++] = '\0';
if (scanStr)
uFree(scanStr);
- scanStr = (char *) uStringDup(buf);
+ scanStr = strdup(buf);
scanStrLine = lineNum;
return STRING;
}
buf[nInBuf++] = '\0';
if (scanStr)
uFree(scanStr);
- scanStr = (char *) uStringDup(buf);
+ scanStr = strdup(buf);
scanStrLine = lineNum;
return KEYNAME;
}
{
if (scanStr)
uFree(scanStr);
- scanStr = (char *) uStringDup(buf);
+ scanStr = strdup(buf);
scanStrLine = lineNum;
rtrn = IDENT;
}