SecBSD/xenocara
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sync with OpenBSD -current

Browse source
This commit is contained in:
purplerain 2024-04-29 00:35:41 +00:00
parent 5d45cd7ee8
commit 155eb8555e
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
5506 changed files with 1786257 additions and 1416034 deletions
Download patch file Download diff file Expand all files Collapse all files

22
app/xkbcomp/alias.c
View file

@ -76,8 +76,8 @@ HandleCollision(AliasInfo * old, AliasInfo * new)
}
static void
InitAliasInfo(AliasInfo * info,
unsigned merge, unsigned file_id, char *alias, char *real)
InitAliasInfo(AliasInfo *info, unsigned merge, unsigned file_id,
const char *alias, const char *real)
{
bzero(info, sizeof(AliasInfo));
info->def.merge = merge;
@ -88,8 +88,8 @@ InitAliasInfo(AliasInfo * info,
}
int
HandleAliasDef(KeyAliasDef * def,
unsigned merge, unsigned file_id, AliasInfo ** info_in)
HandleAliasDef(const KeyAliasDef *def,
unsigned merge, unsigned file_id, AliasInfo **info_in)
{
AliasInfo *info;
@ -103,7 +103,7 @@ HandleAliasDef(KeyAliasDef * def,
return True;
}
}
info = uTypedCalloc(1, AliasInfo);
info = calloc(1, sizeof(AliasInfo));
if (info == NULL)
{
WSGO("Allocation failure in HandleAliasDef\n");
@ -140,7 +140,7 @@ MergeAliases(AliasInfo ** into, AliasInfo ** merge, unsigned how_merge)
*merge = NULL;
return True;
}
bzero((char *) &def, sizeof(KeyAliasDef));
bzero(&def, sizeof(KeyAliasDef));
for (tmp = *merge; tmp != NULL; tmp = (AliasInfo *) tmp->def.next)
{
if (how_merge == MergeDefault)
@ -158,7 +158,7 @@ MergeAliases(AliasInfo ** into, AliasInfo ** merge, unsigned how_merge)
int
ApplyAliases(XkbDescPtr xkb, Bool toGeom, AliasInfo ** info_in)
{
register int i;
int i;
XkbKeyAliasPtr old, a;
AliasInfo *info;
int nNew, nOld;
@ -237,10 +237,10 @@ ApplyAliases(XkbDescPtr xkb, Bool toGeom, AliasInfo ** info_in)
{
if (!xkb->geom)
{
XkbGeometrySizesRec sizes;
bzero((char *) &sizes, sizeof(XkbGeometrySizesRec));
sizes.which = XkbGeomKeyAliasesMask;
sizes.num_key_aliases = nOld + nNew;
XkbGeometrySizesRec sizes = {
.which = XkbGeomKeyAliasesMask,
.num_key_aliases = nOld + nNew
};
status = XkbAllocGeometry(xkb, &sizes);
}
else