frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace deprecated bzero with memset 

Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Marcin Baczyński <marbacz@gmail.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
This commit is contained in:
Mikhail Gusarov 2010-06-04 15:35:31 +07:00
parent f9810ba914
commit 5a0fc0ad21
32 changed files with 132 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Xext/panoramiXprocs.c
View File

@ -1897,7 +1897,7 @@ int PanoramiXGetImage(ClientPtr client)
nlines = min(linesPerBuf, h - linesDone); nlines = min(linesPerBuf, h - linesDone);
if(pDraw->depth == 1) if(pDraw->depth == 1)
bzero(pBuf, nlines * widthBytesLine); memset(pBuf, 0, nlines * widthBytesLine);
XineramaGetImageData(drawables, x, y + linesDone, w, nlines, XineramaGetImageData(drawables, x, y + linesDone, w, nlines,
format, planemask, pBuf, widthBytesLine, isRoot); format, planemask, pBuf, widthBytesLine, isRoot);
@ -1914,7 +1914,7 @@ int PanoramiXGetImage(ClientPtr client)
while (h - linesDone > 0) { while (h - linesDone > 0) {
nlines = min(linesPerBuf, h - linesDone); nlines = min(linesPerBuf, h - linesDone);
bzero(pBuf, nlines * widthBytesLine); memset(pBuf, 0, nlines * widthBytesLine);
XineramaGetImageData(drawables, x, y + linesDone, w, XineramaGetImageData(drawables, x, y + linesDone, w,
nlines, format, plane, pBuf, nlines, format, plane, pBuf,

2
Xext/xace.c
View File

@ -321,7 +321,7 @@ XaceCensorImage(
/* Censoring was not completed above. To be safe, wipe out /* Censoring was not completed above. To be safe, wipe out
* all the image data so that nothing trusted gets out. * all the image data so that nothing trusted gets out.
*/ */
bzero(pBuf, (int)(widthBytesLine * h)); memset(pBuf, 0, (int)(widthBytesLine * h));
} }
if (pRects) free(pRects); if (pRects) free(pRects);
if (pScratchGC) FreeScratchGC(pScratchGC); if (pScratchGC) FreeScratchGC(pScratchGC);

12
dix/colormap.c
View File

@ -309,8 +309,8 @@ CreateColormap (Colormap mid, ScreenPtr pScreen, VisualPtr pVisual,
if ((class | DynamicClass) == DirectColor) if ((class | DynamicClass) == DirectColor)
size = NUMRED(pVisual); size = NUMRED(pVisual);
pmap->freeRed = size; pmap->freeRed = size;
bzero ((char *) pmap->red, (int)sizebytes); memset((char *) pmap->red, 0, (int)sizebytes);
bzero((char *) pmap->numPixelsRed, MAXCLIENTS * sizeof(int)); memset((char *) pmap->numPixelsRed, 0, MAXCLIENTS * sizeof(int));
for (pptr = &pmap->clientPixelsRed[MAXCLIENTS]; --pptr >= pmap->clientPixelsRed; ) for (pptr = &pmap->clientPixelsRed[MAXCLIENTS]; --pptr >= pmap->clientPixelsRed; )
*pptr = (Pixel *)NULL; *pptr = (Pixel *)NULL;
if (alloc == AllocAll) if (alloc == AllocAll)
@ -347,8 +347,8 @@ CreateColormap (Colormap mid, ScreenPtr pScreen, VisualPtr pVisual,
pmap->numPixelsBlue = (int *)((char *)pmap->clientPixelsBlue + pmap->numPixelsBlue = (int *)((char *)pmap->clientPixelsBlue +
(MAXCLIENTS * sizeof(Pixel *))); (MAXCLIENTS * sizeof(Pixel *)));
bzero ((char *) pmap->green, (int)sizebytes); memset((char *) pmap->green, 0, (int)sizebytes);
bzero ((char *) pmap->blue, (int)sizebytes); memset((char *) pmap->blue, 0, (int)sizebytes);
memmove((char *) pmap->clientPixelsGreen, memmove((char *) pmap->clientPixelsGreen,
(char *) pmap->clientPixelsRed, (char *) pmap->clientPixelsRed,
@ -356,8 +356,8 @@ CreateColormap (Colormap mid, ScreenPtr pScreen, VisualPtr pVisual,
memmove((char *) pmap->clientPixelsBlue, memmove((char *) pmap->clientPixelsBlue,
(char *) pmap->clientPixelsRed, (char *) pmap->clientPixelsRed,
MAXCLIENTS * sizeof(Pixel *)); MAXCLIENTS * sizeof(Pixel *));
bzero((char *) pmap->numPixelsGreen, MAXCLIENTS * sizeof(int)); memset((char *) pmap->numPixelsGreen, 0, MAXCLIENTS * sizeof(int));
bzero((char *) pmap->numPixelsBlue, MAXCLIENTS * sizeof(int)); memset((char *) pmap->numPixelsBlue, 0, MAXCLIENTS * sizeof(int));
/* If every cell is allocated, mark its refcnt */ /* If every cell is allocated, mark its refcnt */
if (alloc == AllocAll) if (alloc == AllocAll)

2
dix/dispatch.c
View File

@ -2971,7 +2971,7 @@ ProcCreateCursor (ClientPtr client)
else else
{ {
/* zeroing the (pad) bits helps some ddx cursor handling */ /* zeroing the (pad) bits helps some ddx cursor handling */
bzero((char *)mskbits, n); memset((char *)mskbits, 0, n);
(* msk->drawable.pScreen->GetImage)( (DrawablePtr)msk, 0, 0, width, (* msk->drawable.pScreen->GetImage)( (DrawablePtr)msk, 0, 0, width,
height, XYPixmap, 1, (pointer)mskbits); height, XYPixmap, 1, (pointer)mskbits);
} }

2
dix/dixfonts.c
View File

@ -1093,7 +1093,7 @@ doListFontsWithInfo(ClientPtr client, LFWIclosurePtr c)
} }
finish: finish:
length = sizeof(xListFontsWithInfoReply); length = sizeof(xListFontsWithInfoReply);
bzero((char *) &finalReply, sizeof(xListFontsWithInfoReply)); memset((char *) &finalReply, 0, sizeof(xListFontsWithInfoReply));
finalReply.type = X_Reply; finalReply.type = X_Reply;
finalReply.sequenceNumber = client->sequence; finalReply.sequenceNumber = client->sequence;
finalReply.length = bytes_to_int32(sizeof(xListFontsWithInfoReply) finalReply.length = bytes_to_int32(sizeof(xListFontsWithInfoReply)

4
dix/events.c
View File

@ -4310,7 +4310,7 @@ CoreEnterLeaveEvent(
xKeymapEvent ke; xKeymapEvent ke;
ClientPtr client = grab ? rClient(grab) : wClient(pWin); ClientPtr client = grab ? rClient(grab) : wClient(pWin);
if (XaceHook(XACE_DEVICE_ACCESS, client, keybd, DixReadAccess)) if (XaceHook(XACE_DEVICE_ACCESS, client, keybd, DixReadAccess))
bzero((char *)&ke.map[0], 31); memset((char *)&ke.map[0], 0, 31);
else else
memmove((char *)&ke.map[0], (char *)&keybd->key->down[1], 31); memmove((char *)&ke.map[0], (char *)&keybd->key->down[1], 31);
@ -4420,7 +4420,7 @@ CoreFocusEvent(DeviceIntPtr dev, int type, int mode, int detail, WindowPtr pWin)
xKeymapEvent ke; xKeymapEvent ke;
ClientPtr client = wClient(pWin); ClientPtr client = wClient(pWin);
if (XaceHook(XACE_DEVICE_ACCESS, client, dev, DixReadAccess)) if (XaceHook(XACE_DEVICE_ACCESS, client, dev, DixReadAccess))
bzero((char *)&ke.map[0], 31); memset((char *)&ke.map[0], 0, 31);
else else
memmove((char *)&ke.map[0], (char *)&dev->key->down[1], 31); memmove((char *)&ke.map[0], (char *)&dev->key->down[1], 31);

2
hw/vfb/InitOutput.c
View File

@ -570,7 +570,7 @@ vfbAllocateMmappedFramebuffer(vfbScreenInfoPtr pvfb)
/* Extend the file to be the proper size */ /* Extend the file to be the proper size */
bzero(dummyBuffer, DUMMY_BUFFER_SIZE); memset(dummyBuffer, 0, DUMMY_BUFFER_SIZE);
for (currentFileSize = 0; for (currentFileSize = 0;
currentFileSize < pvfb->sizeInBytes; currentFileSize < pvfb->sizeInBytes;
currentFileSize += writeThisTime) currentFileSize += writeThisTime)

2
hw/xfree86/common/xf86Bus.c
View File

@ -654,7 +654,7 @@ xf86AllocateEntityPrivateIndex(void)
nprivs = xnfrealloc(pEnt->entityPrivates, nprivs = xnfrealloc(pEnt->entityPrivates,
xf86EntityPrivateCount * sizeof(DevUnion)); xf86EntityPrivateCount * sizeof(DevUnion));
/* Zero the new private */ /* Zero the new private */
bzero(&nprivs[idx], sizeof(DevUnion)); memset(&nprivs[idx], 0, sizeof(DevUnion));
pEnt->entityPrivates = nprivs; pEnt->entityPrivates = nprivs;
} }
return idx; return idx;

8
hw/xfree86/common/xf86Config.c
View File

@ -1252,7 +1252,7 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout)
/* 5. Built-in default. */ /* 5. Built-in default. */
if (!foundPointer && !xf86Info.allowEmptyInput) { if (!foundPointer && !xf86Info.allowEmptyInput) {
bzero(&defPtr, sizeof(defPtr)); memset(&defPtr, 0, sizeof(defPtr));
defPtr.inp_identifier = strdup("<default pointer>"); defPtr.inp_identifier = strdup("<default pointer>");
defPtr.inp_driver = strdup("mouse"); defPtr.inp_driver = strdup("mouse");
confInput = &defPtr; confInput = &defPtr;
@ -1303,7 +1303,7 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout)
} }
if (!found && !xf86Info.allowEmptyInput) { if (!found && !xf86Info.allowEmptyInput) {
xf86Msg(X_INFO, "No default mouse found, adding one\n"); xf86Msg(X_INFO, "No default mouse found, adding one\n");
bzero(&defPtr, sizeof(defPtr)); memset(&defPtr, 0, sizeof(defPtr));
defPtr.inp_identifier = strdup("<default pointer>"); defPtr.inp_identifier = strdup("<default pointer>");
defPtr.inp_driver = strdup("mouse"); defPtr.inp_driver = strdup("mouse");
confInput = &defPtr; confInput = &defPtr;
@ -1392,7 +1392,7 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout)
/* 5. Built-in default. */ /* 5. Built-in default. */
if (!foundKeyboard && !xf86Info.allowEmptyInput) { if (!foundKeyboard && !xf86Info.allowEmptyInput) {
bzero(&defKbd, sizeof(defKbd)); memset(&defKbd, 0, sizeof(defKbd));
defKbd.inp_identifier = strdup("<default keyboard>"); defKbd.inp_identifier = strdup("<default keyboard>");
defKbd.inp_driver = strdup("kbd"); defKbd.inp_driver = strdup("kbd");
confInput = &defKbd; confInput = &defKbd;
@ -1851,7 +1851,7 @@ configScreen(confScreenPtr screenp, XF86ConfScreenPtr conf_screen, int scrnum,
if (!conf_screen->scrn_monitor) { if (!conf_screen->scrn_monitor) {
XF86ConfMonitorRec defMon; XF86ConfMonitorRec defMon;
bzero(&defMon, sizeof(defMon)); memset(&defMon, 0, sizeof(defMon));
defMon.mon_identifier = "<default monitor>"; defMon.mon_identifier = "<default monitor>";
if (!configMonitor(screenp->monitor, &defMon)) if (!configMonitor(screenp->monitor, &defMon))
return FALSE; return FALSE;

2
hw/xfree86/common/xf86Cursor.c
View File

@ -590,7 +590,7 @@ xf86InitOrigins(void)
/* need to have this set up with a config file option */ /* need to have this set up with a config file option */
HardEdges = FALSE; HardEdges = FALSE;
bzero(xf86ScreenLayout, MAXSCREENS * sizeof(xf86ScreenLayoutRec)); memset(xf86ScreenLayout, 0, MAXSCREENS * sizeof(xf86ScreenLayoutRec));
screensLeft = prevScreensLeft = (1 << xf86NumScreens) - 1; screensLeft = prevScreensLeft = (1 << xf86NumScreens) - 1;

2
hw/xfree86/common/xf86Helper.c
View File

@ -269,7 +269,7 @@ xf86AllocateScrnInfoPrivateIndex(void)
nprivs = xnfrealloc(pScr->privates, nprivs = xnfrealloc(pScr->privates,
xf86ScrnInfoPrivateCount * sizeof(DevUnion)); xf86ScrnInfoPrivateCount * sizeof(DevUnion));
/* Zero the new private */ /* Zero the new private */
bzero(&nprivs[idx], sizeof(DevUnion)); memset(&nprivs[idx], 0, sizeof(DevUnion));
pScr->privates = nprivs; pScr->privates = nprivs;
} }
return idx; return idx;

4
hw/xfree86/common/xf86Init.c
View File

@ -203,8 +203,8 @@ xf86PrintBanner(void)
struct tm t; struct tm t;
char buf[100]; char buf[100];
bzero(&t, sizeof(t)); memset(&t, 0, sizeof(t));
bzero(buf, sizeof(buf)); memset(buf, 0, sizeof(buf));
t.tm_mday = BUILD_DATE % 100; t.tm_mday = BUILD_DATE % 100;
t.tm_mon = (BUILD_DATE / 100) % 100 - 1; t.tm_mon = (BUILD_DATE / 100) % 100 - 1;
t.tm_year = BUILD_DATE / 10000 - 1900; t.tm_year = BUILD_DATE / 10000 - 1900;

2
hw/xfree86/os-support/solaris/sun_bell.c
View File

@ -64,7 +64,7 @@ xf86OSRingBell(int loudness, int pitch, int duration)
} }
lastFreq = 0; lastFreq = 0;
bzero(silence, sizeof(silence)); memset(silence, 0, sizeof(silence));
audioFD = open(AUDIO_DEVICE, O_WRONLY | O_NONBLOCK); audioFD = open(AUDIO_DEVICE, O_WRONLY | O_NONBLOCK);
if (audioFD == -1) { if (audioFD == -1) {

4
hw/xfree86/vbe/vbe.c
View File

@ -345,7 +345,7 @@ VBEGetVBEInfo(vbeInfoPtr pVbe)
char *str; char *str;
CARD16 major, *modes; CARD16 major, *modes;
bzero(pVbe->memory, sizeof(VbeInfoBlock)); memset(pVbe->memory, 0, sizeof(VbeInfoBlock));
/* /*
Input: Input:
@ -504,7 +504,7 @@ VBEGetModeInfo(vbeInfoPtr pVbe, int mode)
{ {
VbeModeInfoBlock *block = NULL; VbeModeInfoBlock *block = NULL;
bzero(pVbe->memory, sizeof(VbeModeInfoBlock)); memset(pVbe->memory, 0, sizeof(VbeModeInfoBlock));
/* /*
Input: Input:

4
mi/miarc.c
View File

@ -3135,9 +3135,9 @@ realFindSpan (int y)
free(finalSpans); free(finalSpans);
} }
if ((i = finalMiny - newMiny) > 0) if ((i = finalMiny - newMiny) > 0)
bzero ((char *)newSpans, i * sizeof (struct finalSpan *)); memset((char *)newSpans, 0, i * sizeof (struct finalSpan *));
if ((i = newMaxy - finalMaxy) > 0) if ((i = newMaxy - finalMaxy) > 0)
bzero ((char *)(newSpans + newSize - i), memset((char *)(newSpans + newSize - i), 0,
i * sizeof (struct finalSpan *)); i * sizeof (struct finalSpan *));
finalSpans = newSpans; finalSpans = newSpans;
finalMaxy = newMaxy; finalMaxy = newMaxy;

2
miext/cw/cw.c
View File

@ -325,7 +325,7 @@ cwCreateGC(GCPtr pGC)
ScreenPtr pScreen = pGC->pScreen; ScreenPtr pScreen = pGC->pScreen;
Bool ret; Bool ret;
bzero(pPriv, sizeof(cwGCRec)); memset(pPriv, 0, sizeof(cwGCRec));
SCREEN_PROLOGUE(pScreen, CreateGC); SCREEN_PROLOGUE(pScreen, CreateGC);
if ( (ret = (*pScreen->CreateGC)(pGC)) ) if ( (ret = (*pScreen->CreateGC)(pGC)) )

4
os/access.c
View File

@ -311,7 +311,7 @@ ifioctl (int fd, int cmd, char *arg)
struct strioctl ioc; struct strioctl ioc;
int ret; int ret;
bzero((char *) &ioc, sizeof(ioc)); memset((char *) &ioc, 0, sizeof(ioc));
ioc.ic_cmd = cmd; ioc.ic_cmd = cmd;
ioc.ic_timout = 0; ioc.ic_timout = 0;
if (cmd == SIOCGIFCONF) if (cmd == SIOCGIFCONF)
@ -1038,7 +1038,7 @@ ResetHosts (char *display)
len = sizeof(saddr.sa); len = sizeof(saddr.sa);
if (ConvertAddr (&saddr.sa, &len, (pointer *)&addr) == FamilyDECnet) if (ConvertAddr (&saddr.sa, &len, (pointer *)&addr) == FamilyDECnet)
{ {
bzero ((char *) &dnaddr, sizeof (dnaddr)); memset((char *) &dnaddr, 0, sizeof (dnaddr));
dnaddr.a_len = np->n_length; dnaddr.a_len = np->n_length;
acopy (np->n_addr, dnaddr.a_addr, np->n_length); acopy (np->n_addr, dnaddr.a_addr, np->n_length);
dnaddrp = &dnaddr; dnaddrp = &dnaddr;

2
os/connection.c
View File

@ -183,7 +183,7 @@ struct _ct_node *ct_head[256];
void InitConnectionTranslation(void) void InitConnectionTranslation(void)
{ {
bzero(ct_head, sizeof(ct_head)); memset(ct_head, 0, sizeof(ct_head));
} }
int GetConnectionTranslation(int conn) int GetConnectionTranslation(int conn)

4
os/utils.c
View File

@ -979,7 +979,7 @@ set_font_authorizations(char **authorizations, int *authlen, pointer client)
gethostname(hname, 1024); gethostname(hname, 1024);
#if defined(IPv6) && defined(AF_INET6) #if defined(IPv6) && defined(AF_INET6)
bzero(&hints, sizeof(hints)); memset(&hints, 0, sizeof(hints));
hints.ai_flags = AI_CANONNAME; hints.ai_flags = AI_CANONNAME;
if (getaddrinfo(hname, NULL, &hints, &ai) == 0) { if (getaddrinfo(hname, NULL, &hints, &ai) == 0) {
hnameptr = ai->ai_canonname; hnameptr = ai->ai_canonname;
@ -1178,7 +1178,7 @@ SmartScheduleInit (void)
if (SmartScheduleDisable) if (SmartScheduleDisable)
return TRUE; return TRUE;
bzero ((char *) &act, sizeof(struct sigaction)); memset((char *) &act, 0, sizeof(struct sigaction));
/* Set up the timer signal function */ /* Set up the timer signal function */
act.sa_handler = SmartScheduleTimer; act.sa_handler = SmartScheduleTimer;

2
os/xdmauth.c
View File

@ -139,7 +139,7 @@ HexToBinary (const char *in, char *out, int len)
void void
XdmAuthenticationInit (const char *cookie, int cookie_len) XdmAuthenticationInit (const char *cookie, int cookie_len)
{ {
bzero (privateKey.data, 8); memset(privateKey.data, 0, 8);
if (!strncmp (cookie, "0x", 2) || !strncmp (cookie, "0X", 2)) if (!strncmp (cookie, "0x", 2) || !strncmp (cookie, "0X", 2))
{ {
if (cookie_len > 2 + 2 * 8) if (cookie_len > 2 + 2 * 8)

6
os/xdmcp.c
View File

@ -338,7 +338,7 @@ XdmcpRegisterBroadcastAddress (const struct sockaddr_in *addr)
if (NumBroadcastAddresses >= MAX_BROADCAST) if (NumBroadcastAddresses >= MAX_BROADCAST)
return; return;
bcast = &BroadcastAddresses[NumBroadcastAddresses++]; bcast = &BroadcastAddresses[NumBroadcastAddresses++];
bzero (bcast, sizeof (struct sockaddr_in)); memset(bcast, 0, sizeof (struct sockaddr_in));
#ifdef BSD44SOCKETS #ifdef BSD44SOCKETS
bcast->sin_len = addr->sin_len; bcast->sin_len = addr->sin_len;
#endif #endif
@ -1483,7 +1483,7 @@ get_addr_by_name(
char *pport = portstr; char *pport = portstr;
int gaierr; int gaierr;
bzero(&hints, sizeof(hints)); memset(&hints, 0, sizeof(hints));
hints.ai_socktype = socktype; hints.ai_socktype = socktype;
if (port == 0) { if (port == 0) {
@ -1616,7 +1616,7 @@ get_mcast_options(int argc, char **argv, int i)
} else { } else {
FatalError("Xserver: port out of range: %d\n", xdm_udp_port); FatalError("Xserver: port out of range: %d\n", xdm_udp_port);
} }
bzero(&hints, sizeof(hints)); memset(&hints, 0, sizeof(hints));
hints.ai_socktype = SOCK_DGRAM; hints.ai_socktype = SOCK_DGRAM;
if ((gaierr = getaddrinfo(address, portstr, &hints, &firstai)) == 0) { if ((gaierr = getaddrinfo(address, portstr, &hints, &firstai)) == 0) {

6
record/record.c
View File

@ -1495,7 +1495,7 @@ RecordAllocIntervals(SetInfoPtr psi, int nIntervals)
malloc(nIntervals * sizeof(RecordSetInterval)); malloc(nIntervals * sizeof(RecordSetInterval));
if (!psi->intervals) if (!psi->intervals)
return BadAlloc; return BadAlloc;
bzero(psi->intervals, nIntervals * sizeof(RecordSetInterval)); memset(psi->intervals, 0, nIntervals * sizeof(RecordSetInterval));
psi->size = nIntervals; psi->size = nIntervals;
return Success; return Success;
} /* end RecordAllocIntervals */ } /* end RecordAllocIntervals */
@ -1669,7 +1669,7 @@ RecordRegisterClients(RecordContextPtr pContext, ClientPtr client, xRecordRegist
err = BadAlloc; err = BadAlloc;
goto bailout; goto bailout;
} }
bzero(si, sizeof(SetInfoRec) * maxSets); memset(si, 0, sizeof(SetInfoRec) * maxSets);
/* theoretically you must do this because NULL may not be all-bits-zero */ /* theoretically you must do this because NULL may not be all-bits-zero */
for (i = 0; i < maxSets; i++) for (i = 0; i < maxSets; i++)
@ -2053,7 +2053,7 @@ RecordAllocRanges(GetContextRangeInfoPtr pri, int nRanges)
pri->pRanges = pNewRange; pri->pRanges = pNewRange;
pri->size = newsize; pri->size = newsize;
bzero(&pri->pRanges[pri->size - SZINCR], SZINCR * sizeof(xRecordRange)); memset(&pri->pRanges[pri->size - SZINCR], 0, SZINCR * sizeof(xRecordRange));
if (pri->nRanges < nRanges) if (pri->nRanges < nRanges)
pri->nRanges = nRanges; pri->nRanges = nRanges;
return Success; return Success;

4
xkb/XKBAlloc.c
View File

@ -82,7 +82,7 @@ XkbSymInterpretRec *prev_interpret;
} }
compat->size_si= nSI; compat->size_si= nSI;
compat->num_si= 0; compat->num_si= 0;
bzero((char *)&compat->groups[0],XkbNumKbdGroups*sizeof(XkbModsRec)); memset((char *)&compat->groups[0], 0, XkbNumKbdGroups*sizeof(XkbModsRec));
xkb->compat= compat; xkb->compat= compat;
return Success; return Success;
} }
@ -99,7 +99,7 @@ register XkbCompatMapPtr compat;
if (freeMap) if (freeMap)
which= XkbAllCompatMask; which= XkbAllCompatMask;
if (which&XkbGroupCompatMask) if (which&XkbGroupCompatMask)
bzero((char *)&compat->groups[0],XkbNumKbdGroups*sizeof(XkbModsRec)); memset((char *)&compat->groups[0], 0, XkbNumKbdGroups*sizeof(XkbModsRec));
if (which&XkbSymInterpMask) { if (which&XkbSymInterpMask) {
if ((compat->sym_interpret)&&(compat->size_si>0)) if ((compat->sym_interpret)&&(compat->size_si>0))
free(compat->sym_interpret); free(compat->sym_interpret);

18
xkb/XKBGAlloc.c
View File

@ -478,7 +478,7 @@ _XkbGeomAlloc( void ** old,
if (*num>0) { if (*num>0) {
char *tmp= (char *)(*old); char *tmp= (char *)(*old);
bzero(&tmp[sz_elem*(*num)],(num_new*sz_elem)); memset(&tmp[sz_elem*(*num)], 0, (num_new*sz_elem));
} }
return Success; return Success;
} }
@ -701,7 +701,7 @@ register XkbKeyAliasPtr alias;
return NULL; return NULL;
for (i=0,alias=geom->key_aliases;i<geom->num_key_aliases;i++,alias++) { for (i=0,alias=geom->key_aliases;i<geom->num_key_aliases;i++,alias++) {
if (strncmp(alias->alias,aliasStr,XkbKeyNameLength)==0) { if (strncmp(alias->alias,aliasStr,XkbKeyNameLength)==0) {
bzero(alias->real,XkbKeyNameLength); memset(alias->real, 0, XkbKeyNameLength);
strncpy(alias->real,realStr,XkbKeyNameLength); strncpy(alias->real,realStr,XkbKeyNameLength);
return alias; return alias;
} }
@ -711,7 +711,7 @@ register XkbKeyAliasPtr alias;
return NULL; return NULL;
} }
alias= &geom->key_aliases[geom->num_key_aliases]; alias= &geom->key_aliases[geom->num_key_aliases];
bzero(alias,sizeof(XkbKeyAliasRec)); memset(alias, 0, sizeof(XkbKeyAliasRec));
strncpy(alias->alias,aliasStr,XkbKeyNameLength); strncpy(alias->alias,aliasStr,XkbKeyNameLength);
strncpy(alias->real,realStr,XkbKeyNameLength); strncpy(alias->real,realStr,XkbKeyNameLength);
geom->num_key_aliases++; geom->num_key_aliases++;
@ -758,7 +758,7 @@ XkbOutlinePtr outline;
return NULL; return NULL;
} }
outline= &shape->outlines[shape->num_outlines]; outline= &shape->outlines[shape->num_outlines];
bzero(outline,sizeof(XkbOutlineRec)); memset(outline, 0, sizeof(XkbOutlineRec));
if ((sz_points>0)&&(_XkbAllocPoints(outline,sz_points)!=Success)) if ((sz_points>0)&&(_XkbAllocPoints(outline,sz_points)!=Success))
return NULL; return NULL;
shape->num_outlines++; shape->num_outlines++;
@ -783,7 +783,7 @@ register int i;
(_XkbAllocShapes(geom,1)!=Success)) (_XkbAllocShapes(geom,1)!=Success))
return NULL; return NULL;
shape= &geom->shapes[geom->num_shapes]; shape= &geom->shapes[geom->num_shapes];
bzero(shape,sizeof(XkbShapeRec)); memset(shape, 0, sizeof(XkbShapeRec));
if ((sz_outlines>0)&&(_XkbAllocOutlines(shape,sz_outlines)!=Success)) if ((sz_outlines>0)&&(_XkbAllocOutlines(shape,sz_outlines)!=Success))
return NULL; return NULL;
shape->name= name; shape->name= name;
@ -801,7 +801,7 @@ XkbKeyPtr key;
if ((row->num_keys>=row->sz_keys)&&(_XkbAllocKeys(row,1)!=Success)) if ((row->num_keys>=row->sz_keys)&&(_XkbAllocKeys(row,1)!=Success))
return NULL; return NULL;
key= &row->keys[row->num_keys++]; key= &row->keys[row->num_keys++];
bzero(key,sizeof(XkbKeyRec)); memset(key, 0, sizeof(XkbKeyRec));
return key; return key;
} }
@ -816,7 +816,7 @@ XkbRowPtr row;
(_XkbAllocRows(section,1)!=Success)) (_XkbAllocRows(section,1)!=Success))
return NULL; return NULL;
row= &section->rows[section->num_rows]; row= &section->rows[section->num_rows];
bzero(row,sizeof(XkbRowRec)); memset(row, 0, sizeof(XkbRowRec));
if ((sz_keys>0)&&(_XkbAllocKeys(row,sz_keys)!=Success)) if ((sz_keys>0)&&(_XkbAllocKeys(row,sz_keys)!=Success))
return NULL; return NULL;
section->num_rows++; section->num_rows++;
@ -896,7 +896,7 @@ register int i,nDoodads;
return NULL; return NULL;
doodad= &geom->doodads[geom->num_doodads++]; doodad= &geom->doodads[geom->num_doodads++];
} }
bzero(doodad,sizeof(XkbDoodadRec)); memset(doodad, 0, sizeof(XkbDoodadRec));
doodad->any.name= name; doodad->any.name= name;
return doodad; return doodad;
} }
@ -960,7 +960,7 @@ XkbOverlayRowPtr row;
(_XkbAllocOverlayRows(overlay,1)!=Success)) (_XkbAllocOverlayRows(overlay,1)!=Success))
return NULL; return NULL;
row= &overlay->rows[overlay->num_rows]; row= &overlay->rows[overlay->num_rows];
bzero(row,sizeof(XkbOverlayRowRec)); memset(row, 0, sizeof(XkbOverlayRowRec));
if ((sz_keys>0)&&(_XkbAllocOverlayKeys(row,sz_keys)!=Success)) if ((sz_keys>0)&&(_XkbAllocOverlayKeys(row,sz_keys)!=Success))
return NULL; return NULL;
row->row_under= row_under; row->row_under= row_under;

40
xkb/XKBMAlloc.c
View File

@ -84,7 +84,7 @@ XkbClientMapPtr map;
return BadAlloc; return BadAlloc;
} }
map->size_types= nTotalTypes; map->size_types= nTotalTypes;
bzero(&map->types[map->num_types], memset(&map->types[map->num_types], 0,
((map->size_types-map->num_types)*sizeof(XkbKeyTypeRec))); ((map->size_types-map->num_types)*sizeof(XkbKeyTypeRec)));
} }
} }
@ -177,7 +177,7 @@ XkbServerMapPtr map;
return BadAlloc; return BadAlloc;
} }
map->size_acts= need; map->size_acts= need;
bzero(&map->acts[map->num_acts], memset(&map->acts[map->num_acts], 0,
((map->size_acts-map->num_acts)*sizeof(XkbAction))); ((map->size_acts-map->num_acts)*sizeof(XkbAction)));
} }
if (map->key_acts==NULL) { if (map->key_acts==NULL) {
@ -368,7 +368,7 @@ KeyCode matchingKeys[XkbMaxKeyCount],nMatchingKeys;
* The possibilities marked with '+' require us to examine the key types * The possibilities marked with '+' require us to examine the key types
* associated with each group for the key. * associated with each group for the key.
*/ */
bzero(matchingKeys,XkbMaxKeyCount*sizeof(KeyCode)); memset(matchingKeys, 0, XkbMaxKeyCount*sizeof(KeyCode));
nMatchingKeys= 0; nMatchingKeys= 0;
if (new_num_lvls>type->num_levels) { if (new_num_lvls>type->num_levels) {
int nTotal; int nTotal;
@ -461,7 +461,7 @@ KeyCode matchingKeys[XkbMaxKeyCount],nMatchingKeys;
for (g=XkbKeyNumGroups(xkb,key)-1;g>=0;g--) { for (g=XkbKeyNumGroups(xkb,key)-1;g>=0;g--) {
if (XkbKeyKeyTypeIndex(xkb,key,g)==type_ndx) { if (XkbKeyKeyTypeIndex(xkb,key,g)==type_ndx) {
if (nClear>0) if (nClear>0)
bzero(&pSyms[g*width+firstClear],nClear*sizeof(KeySym)); memset(&pSyms[g*width+firstClear], 0, nClear*sizeof(KeySym));
} }
} }
} }
@ -491,8 +491,8 @@ KeySym *newSyms;
nOldSyms*sizeof(KeySym)); nOldSyms*sizeof(KeySym));
} }
if ((needed-nOldSyms)>0) { if ((needed-nOldSyms)>0) {
bzero(&xkb->map->syms[xkb->map->num_syms+XkbKeyNumSyms(xkb,key)], memset(&xkb->map->syms[xkb->map->num_syms+XkbKeyNumSyms(xkb, key)],
(needed-nOldSyms)*sizeof(KeySym)); 0, (needed-nOldSyms)*sizeof(KeySym));
} }
xkb->map->key_sym_map[key].offset = xkb->map->num_syms; xkb->map->key_sym_map[key].offset = xkb->map->num_syms;
xkb->map->num_syms+= needed; xkb->map->num_syms+= needed;
@ -515,7 +515,7 @@ KeySym *newSyms;
if (nCopy!=0) if (nCopy!=0)
memcpy(&newSyms[nSyms],XkbKeySymsPtr(xkb,i),nCopy*sizeof(KeySym)); memcpy(&newSyms[nSyms],XkbKeySymsPtr(xkb,i),nCopy*sizeof(KeySym));
if (nKeySyms>nCopy) if (nKeySyms>nCopy)
bzero(&newSyms[nSyms+nCopy],(nKeySyms-nCopy)*sizeof(KeySym)); memset(&newSyms[nSyms+nCopy], 0, (nKeySyms-nCopy)*sizeof(KeySym));
xkb->map->key_sym_map[i].offset = nSyms; xkb->map->key_sym_map[i].offset = nSyms;
nSyms+= nKeySyms; nSyms+= nKeySyms;
} }
@ -568,7 +568,7 @@ int tmp;
tmp= xkb->min_key_code-minKC; tmp= xkb->min_key_code-minKC;
if (xkb->map) { if (xkb->map) {
if (xkb->map->key_sym_map) { if (xkb->map->key_sym_map) {
bzero((char *)&xkb->map->key_sym_map[minKC], memset((char *)&xkb->map->key_sym_map[minKC], 0,
tmp*sizeof(XkbSymMapRec)); tmp*sizeof(XkbSymMapRec));
if (changes) { if (changes) {
changes->map.changed= _ExtendRange(changes->map.changed, changes->map.changed= _ExtendRange(changes->map.changed,
@ -578,7 +578,7 @@ int tmp;
} }
} }
if (xkb->map->modmap) { if (xkb->map->modmap) {
bzero((char *)&xkb->map->modmap[minKC],tmp); memset((char *)&xkb->map->modmap[minKC], 0, tmp);
if (changes) { if (changes) {
changes->map.changed= _ExtendRange(changes->map.changed, changes->map.changed= _ExtendRange(changes->map.changed,
XkbModifierMapMask,minKC, XkbModifierMapMask,minKC,
@ -589,7 +589,7 @@ int tmp;
} }
if (xkb->server) { if (xkb->server) {
if (xkb->server->behaviors) { if (xkb->server->behaviors) {
bzero((char *)&xkb->server->behaviors[minKC], memset((char *)&xkb->server->behaviors[minKC], 0,
tmp*sizeof(XkbBehavior)); tmp*sizeof(XkbBehavior));
if (changes) { if (changes) {
changes->map.changed= _ExtendRange(changes->map.changed, changes->map.changed= _ExtendRange(changes->map.changed,
@ -599,7 +599,7 @@ int tmp;
} }
} }
if (xkb->server->key_acts) { if (xkb->server->key_acts) {
bzero((char *)&xkb->server->key_acts[minKC], memset((char *)&xkb->server->key_acts[minKC], 0,
tmp*sizeof(unsigned short)); tmp*sizeof(unsigned short));
if (changes) { if (changes) {
changes->map.changed= _ExtendRange(changes->map.changed, changes->map.changed= _ExtendRange(changes->map.changed,
@ -609,7 +609,7 @@ int tmp;
} }
} }
if (xkb->server->vmodmap) { if (xkb->server->vmodmap) {
bzero((char *)&xkb->server->vmodmap[minKC], memset((char *)&xkb->server->vmodmap[minKC], 0,
tmp*sizeof(unsigned short)); tmp*sizeof(unsigned short));
if (changes) { if (changes) {
changes->map.changed= _ExtendRange(changes->map.changed, changes->map.changed= _ExtendRange(changes->map.changed,
@ -620,7 +620,7 @@ int tmp;
} }
} }
if ((xkb->names)&&(xkb->names->keys)) { if ((xkb->names)&&(xkb->names->keys)) {
bzero((char *)&xkb->names->keys[minKC],tmp*sizeof(XkbKeyNameRec)); memset((char *)&xkb->names->keys[minKC], 0, tmp*sizeof(XkbKeyNameRec));
if (changes) { if (changes) {
changes->names.changed= _ExtendRange(changes->names.changed, changes->names.changed= _ExtendRange(changes->names.changed,
XkbKeyNamesMask,minKC, XkbKeyNamesMask,minKC,
@ -644,7 +644,7 @@ int tmp;
free(prev_key_sym_map); free(prev_key_sym_map);
return BadAlloc; return BadAlloc;
} }
bzero((char *)&xkb->map->key_sym_map[xkb->max_key_code], memset((char *)&xkb->map->key_sym_map[xkb->max_key_code], 0,
tmp*sizeof(XkbSymMapRec)); tmp*sizeof(XkbSymMapRec));
if (changes) { if (changes) {
changes->map.changed= _ExtendRange(changes->map.changed, changes->map.changed= _ExtendRange(changes->map.changed,
@ -662,7 +662,7 @@ int tmp;
free(prev_modmap); free(prev_modmap);
return BadAlloc; return BadAlloc;
} }
bzero((char *)&xkb->map->modmap[xkb->max_key_code],tmp); memset((char *)&xkb->map->modmap[xkb->max_key_code], 0, tmp);
if (changes) { if (changes) {
changes->map.changed= _ExtendRange(changes->map.changed, changes->map.changed= _ExtendRange(changes->map.changed,
XkbModifierMapMask,maxKC, XkbModifierMapMask,maxKC,
@ -681,7 +681,7 @@ int tmp;
free(prev_behaviors); free(prev_behaviors);
return BadAlloc; return BadAlloc;
} }
bzero((char *)&xkb->server->behaviors[xkb->max_key_code], memset((char *)&xkb->server->behaviors[xkb->max_key_code], 0,
tmp*sizeof(XkbBehavior)); tmp*sizeof(XkbBehavior));
if (changes) { if (changes) {
changes->map.changed= _ExtendRange(changes->map.changed, changes->map.changed= _ExtendRange(changes->map.changed,
@ -699,7 +699,7 @@ int tmp;
free(prev_key_acts); free(prev_key_acts);
return BadAlloc; return BadAlloc;
} }
bzero((char *)&xkb->server->key_acts[xkb->max_key_code], memset((char *)&xkb->server->key_acts[xkb->max_key_code], 0,
tmp*sizeof(unsigned short)); tmp*sizeof(unsigned short));
if (changes) { if (changes) {
changes->map.changed= _ExtendRange(changes->map.changed, changes->map.changed= _ExtendRange(changes->map.changed,
@ -717,7 +717,7 @@ int tmp;
free(prev_vmodmap); free(prev_vmodmap);
return BadAlloc; return BadAlloc;
} }
bzero((char *)&xkb->server->vmodmap[xkb->max_key_code], memset((char *)&xkb->server->vmodmap[xkb->max_key_code], 0,
tmp*sizeof(unsigned short)); tmp*sizeof(unsigned short));
if (changes) { if (changes) {
changes->map.changed= _ExtendRange(changes->map.changed, changes->map.changed= _ExtendRange(changes->map.changed,
@ -736,7 +736,7 @@ int tmp;
free(prev_keys); free(prev_keys);
return BadAlloc; return BadAlloc;
} }
bzero((char *)&xkb->names->keys[xkb->max_key_code], memset((char *)&xkb->names->keys[xkb->max_key_code], 0,
tmp*sizeof(XkbKeyNameRec)); tmp*sizeof(XkbKeyNameRec));
if (changes) { if (changes) {
changes->names.changed= _ExtendRange(changes->names.changed, changes->names.changed= _ExtendRange(changes->names.changed,
@ -790,7 +790,7 @@ XkbAction *newActs;
memcpy(&newActs[nActs],XkbKeyActionsPtr(xkb,i), memcpy(&newActs[nActs],XkbKeyActionsPtr(xkb,i),
nCopy*sizeof(XkbAction)); nCopy*sizeof(XkbAction));
if (nCopy<nKeyActs) if (nCopy<nKeyActs)
bzero(&newActs[nActs+nCopy],(nKeyActs-nCopy)*sizeof(XkbAction)); memset(&newActs[nActs+nCopy], 0, (nKeyActs-nCopy)*sizeof(XkbAction));
xkb->server->key_acts[i]= nActs; xkb->server->key_acts[i]= nActs;
nActs+= nKeyActs; nActs+= nKeyActs;
} }

4
xkb/XKBMisc.c
View File

@ -580,7 +580,7 @@ int width,nOldGroups,oldWidth,newTypes[XkbNumKbdGroups];
pSyms= XkbResizeKeySyms(xkb,key,width*nGroups); pSyms= XkbResizeKeySyms(xkb,key,width*nGroups);
if (pSyms==NULL) if (pSyms==NULL)
return BadAlloc; return BadAlloc;
bzero(pSyms,width*nGroups*sizeof(KeySym)); memset(pSyms, 0, width*nGroups*sizeof(KeySym));
for (i=0;(i<nGroups)&&(i<nOldGroups);i++) { for (i=0;(i<nGroups)&&(i<nOldGroups);i++) {
pOldType= XkbKeyKeyType(xkb,key,i); pOldType= XkbKeyKeyType(xkb,key,i);
pNewType= &xkb->map->types[newTypes[i]]; pNewType= &xkb->map->types[newTypes[i]];
@ -596,7 +596,7 @@ int width,nOldGroups,oldWidth,newTypes[XkbNumKbdGroups];
pActs= XkbResizeKeyActions(xkb,key,width*nGroups); pActs= XkbResizeKeyActions(xkb,key,width*nGroups);
if (pActs==NULL) if (pActs==NULL)
return BadAlloc; return BadAlloc;
bzero(pActs,width*nGroups*sizeof(XkbAction)); memset(pActs, 0, width*nGroups*sizeof(XkbAction));
for (i=0;(i<nGroups)&&(i<nOldGroups);i++) { for (i=0;(i<nGroups)&&(i<nOldGroups);i++) {
pOldType= XkbKeyKeyType(xkb,key,i); pOldType= XkbKeyKeyType(xkb,key,i);
pNewType= &xkb->map->types[newTypes[i]]; pNewType= &xkb->map->types[newTypes[i]];

22
xkb/maprules.c
View File

@ -270,7 +270,7 @@ Bool found;
l_ndx_present = v_ndx_present = present= 0; l_ndx_present = v_ndx_present = present= 0;
str= &line->line[1]; str= &line->line[1];
len = remap->number; len = remap->number;
bzero((char *)remap,sizeof(RemapSpec)); memset((char *)remap, 0, sizeof(RemapSpec));
remap->number = len; remap->number = len;
while ((tok=_XStrtok(str," ",strtok_buf))!=NULL) { while ((tok=_XStrtok(str," ",strtok_buf))!=NULL) {
found= FALSE; found= FALSE;
@ -412,7 +412,7 @@ Bool append = FALSE;
DebugF("Illegal line of data ignored\n"); DebugF("Illegal line of data ignored\n");
return FALSE; return FALSE;
} }
bzero((char *)&tmp,sizeof(FileSpec)); memset((char *)&tmp, 0, sizeof(FileSpec));
str= line->line; str= line->line;
for (nread= 0;(tok=_XStrtok(str," ",strtok_buf))!=NULL;nread++) { for (nread= 0;(tok=_XStrtok(str," ",strtok_buf))!=NULL;nread++) {
str= NULL; str= NULL;
@ -495,7 +495,7 @@ static Bool
MakeMultiDefs(XkbRF_MultiDefsPtr mdefs, XkbRF_VarDefsPtr defs) MakeMultiDefs(XkbRF_MultiDefsPtr mdefs, XkbRF_VarDefsPtr defs)
{ {
bzero((char *)mdefs,sizeof(XkbRF_MultiDefsRec)); memset((char *)mdefs, 0, sizeof(XkbRF_MultiDefsRec));
mdefs->model = defs->model; mdefs->model = defs->model;
mdefs->options = _XkbDupString(defs->options); mdefs->options = _XkbDupString(defs->options);
if (mdefs->options) squeeze_spaces(mdefs->options); if (mdefs->options) squeeze_spaces(mdefs->options);
@ -834,7 +834,7 @@ XkbRF_GetComponents( XkbRF_RulesPtr rules,
MakeMultiDefs(&mdefs, defs); MakeMultiDefs(&mdefs, defs);
bzero((char *)names,sizeof(XkbComponentNamesRec)); memset((char *)names, 0, sizeof(XkbComponentNamesRec));
XkbRF_ClearPartialMatches(rules); XkbRF_ClearPartialMatches(rules);
XkbRF_CheckApplyRules(rules, &mdefs, names, XkbRF_Normal); XkbRF_CheckApplyRules(rules, &mdefs, names, XkbRF_Normal);
XkbRF_ApplyPartialMatches(rules, names); XkbRF_ApplyPartialMatches(rules, names);
@ -876,7 +876,7 @@ XkbRF_AddRule(XkbRF_RulesPtr rules)
DebugF("Allocation failure in XkbRF_AddRule\n"); DebugF("Allocation failure in XkbRF_AddRule\n");
return NULL; return NULL;
} }
bzero((char *)&rules->rules[rules->num_rules],sizeof(XkbRF_RuleRec)); memset((char *)&rules->rules[rules->num_rules], 0, sizeof(XkbRF_RuleRec));
return &rules->rules[rules->num_rules++]; return &rules->rules[rules->num_rules++];
} }
@ -898,7 +898,7 @@ XkbRF_AddGroup(XkbRF_RulesPtr rules)
return NULL; return NULL;
} }
bzero((char *)&rules->groups[rules->num_groups],sizeof(XkbRF_GroupRec)); memset((char *)&rules->groups[rules->num_groups], 0, sizeof(XkbRF_GroupRec));
return &rules->groups[rules->num_groups++]; return &rules->groups[rules->num_groups++];
} }
@ -912,20 +912,20 @@ XkbRF_GroupRec tgroup,*group;
if (!(rules && file)) if (!(rules && file))
return FALSE; return FALSE;
bzero((char *)&remap,sizeof(RemapSpec)); memset((char *)&remap, 0, sizeof(RemapSpec));
bzero((char *)&tgroup,sizeof(XkbRF_GroupRec)); memset((char *)&tgroup, 0, sizeof(XkbRF_GroupRec));
InitInputLine(&line); InitInputLine(&line);
while (GetInputLine(file,&line,TRUE)) { while (GetInputLine(file,&line,TRUE)) {
if (CheckLine(&line,&remap,&trule,&tgroup)) { if (CheckLine(&line,&remap,&trule,&tgroup)) {
if (tgroup.number) { if (tgroup.number) {
if ((group= XkbRF_AddGroup(rules))!=NULL) { if ((group= XkbRF_AddGroup(rules))!=NULL) {
*group= tgroup; *group= tgroup;
bzero((char *)&tgroup,sizeof(XkbRF_GroupRec)); memset((char *)&tgroup, 0, sizeof(XkbRF_GroupRec));
} }
} else { } else {
if ((rule= XkbRF_AddRule(rules))!=NULL) { if ((rule= XkbRF_AddRule(rules))!=NULL) {
*rule= trule; *rule= trule;
bzero((char *)&trule,sizeof(XkbRF_RuleRec)); memset((char *)&trule, 0, sizeof(XkbRF_RuleRec));
} }
} }
} }
@ -997,7 +997,7 @@ XkbRF_GroupPtr group;
if (rule->types) free(rule->types); if (rule->types) free(rule->types);
if (rule->compat) free(rule->compat); if (rule->compat) free(rule->compat);
if (rule->geometry) free(rule->geometry); if (rule->geometry) free(rule->geometry);
bzero((char *)rule,sizeof(XkbRF_RuleRec)); memset((char *)rule, 0, sizeof(XkbRF_RuleRec));
} }
free(rules->rules); free(rules->rules);
rules->num_rules= rules->sz_rules= 0; rules->num_rules= rules->sz_rules= 0;

52
xkb/xkb.c
View File

@ -557,7 +557,7 @@ ProcXkbGetState(ClientPtr client)
CHK_KBD_DEVICE(dev, stuff->deviceSpec, client, DixGetAttrAccess); CHK_KBD_DEVICE(dev, stuff->deviceSpec, client, DixGetAttrAccess);
xkb= &dev->key->xkbInfo->state; xkb= &dev->key->xkbInfo->state;
bzero(&rep,sizeof(xkbGetStateReply)); memset(&rep, 0, sizeof(xkbGetStateReply));
rep.type= X_Reply; rep.type= X_Reply;
rep.sequenceNumber= client->sequence; rep.sequenceNumber= client->sequence;
rep.length = 0; rep.length = 0;
@ -1429,7 +1429,7 @@ ProcXkbGetMap(ClientPtr client)
CHK_MASK_LEGAL(0x03,stuff->partial,XkbAllMapComponentsMask); CHK_MASK_LEGAL(0x03,stuff->partial,XkbAllMapComponentsMask);
xkb= dev->key->xkbInfo->desc; xkb= dev->key->xkbInfo->desc;
bzero(&rep,sizeof(xkbGetMapReply)); memset(&rep, 0, sizeof(xkbGetMapReply));
rep.type= X_Reply; rep.type= X_Reply;
rep.sequenceNumber= client->sequence; rep.sequenceNumber= client->sequence;
rep.length = (SIZEOF(xkbGetMapReply)-SIZEOF(xGenericReply))>>2; rep.length = (SIZEOF(xkbGetMapReply)-SIZEOF(xGenericReply))>>2;
@ -2172,7 +2172,7 @@ unsigned first,last;
first= req->firstKeyBehavior; first= req->firstKeyBehavior;
last= req->firstKeyBehavior+req->nKeyBehaviors-1; last= req->firstKeyBehavior+req->nKeyBehaviors-1;
bzero(&server->behaviors[first],req->nKeyBehaviors*sizeof(XkbBehavior)); memset(&server->behaviors[first], 0, req->nKeyBehaviors*sizeof(XkbBehavior));
for (i=0;i<req->totalKeyBehaviors;i++) { for (i=0;i<req->totalKeyBehaviors;i++) {
if ((server->behaviors[wire->key].type&XkbKB_Permanent)==0) { if ((server->behaviors[wire->key].type&XkbKB_Permanent)==0) {
server->behaviors[wire->key].type= wire->type; server->behaviors[wire->key].type= wire->type;
@ -2190,7 +2190,7 @@ unsigned first,last;
else xkbi->radioGroups= calloc(1, sz); else xkbi->radioGroups= calloc(1, sz);
if (xkbi->radioGroups) { if (xkbi->radioGroups) {
if (xkbi->nRadioGroups) if (xkbi->nRadioGroups)
bzero(&xkbi->radioGroups[xkbi->nRadioGroups], memset(&xkbi->radioGroups[xkbi->nRadioGroups], 0,
(maxRG-xkbi->nRadioGroups)*sizeof(XkbRadioGroupRec)); (maxRG-xkbi->nRadioGroups)*sizeof(XkbRadioGroupRec));
xkbi->nRadioGroups= maxRG; xkbi->nRadioGroups= maxRG;
} }
@ -2245,7 +2245,7 @@ CARD8 * start;
start= wire; start= wire;
first= req->firstKeyExplicit; first= req->firstKeyExplicit;
last= req->firstKeyExplicit+req->nKeyExplicit-1; last= req->firstKeyExplicit+req->nKeyExplicit-1;
bzero(&xkb->explicit[first],req->nKeyExplicit); memset(&xkb->explicit[first], 0, req->nKeyExplicit);
for (i=0;i<req->totalKeyExplicit;i++,wire+= 2) { for (i=0;i<req->totalKeyExplicit;i++,wire+= 2) {
xkb->explicit[wire[0]]= wire[1]; xkb->explicit[wire[0]]= wire[1];
} }
@ -2279,7 +2279,7 @@ CARD8 * start;
start= wire; start= wire;
first= req->firstModMapKey; first= req->firstModMapKey;
last= req->firstModMapKey+req->nModMapKeys-1; last= req->firstModMapKey+req->nModMapKeys-1;
bzero(&xkb->modmap[first],req->nModMapKeys); memset(&xkb->modmap[first], 0, req->nModMapKeys);
for (i=0;i<req->totalModMapKeys;i++,wire+= 2) { for (i=0;i<req->totalModMapKeys;i++,wire+= 2) {
xkb->modmap[wire[0]]= wire[1]; xkb->modmap[wire[0]]= wire[1];
} }
@ -2311,7 +2311,7 @@ XkbServerMapPtr srv = xkbi->desc->server;
first= req->firstVModMapKey; first= req->firstVModMapKey;
last= req->firstVModMapKey+req->nVModMapKeys-1; last= req->firstVModMapKey+req->nVModMapKeys-1;
bzero(&srv->vmodmap[first],req->nVModMapKeys*sizeof(unsigned short)); memset(&srv->vmodmap[first], 0, req->nVModMapKeys*sizeof(unsigned short));
for (i=0;i<req->totalVModMapKeys;i++,wire++) { for (i=0;i<req->totalVModMapKeys;i++,wire++) {
srv->vmodmap[wire->key]= wire->vmods; srv->vmodmap[wire->key]= wire->vmods;
} }
@ -2438,7 +2438,7 @@ _XkbSetMap(ClientPtr client, DeviceIntPtr dev, xkbSetMapReq *req, char *values)
xkb = xkbi->desc; xkb = xkbi->desc;
XkbSetCauseXkbReq(&cause,X_kbSetMap,client); XkbSetCauseXkbReq(&cause,X_kbSetMap,client);
bzero(&change, sizeof(change)); memset(&change, 0, sizeof(change));
sentNKN = FALSE; sentNKN = FALSE;
if ((xkb->min_key_code!=req->minKeyCode)|| if ((xkb->min_key_code!=req->minKeyCode)||
(xkb->max_key_code!=req->maxKeyCode)) { (xkb->max_key_code!=req->maxKeyCode)) {
@ -2851,7 +2851,7 @@ _XkbSetCompatMap(ClientPtr client, DeviceIntPtr dev,
XkbEventCauseRec cause; XkbEventCauseRec cause;
XkbSetCauseXkbReq(&cause,X_kbSetCompatMap,client); XkbSetCauseXkbReq(&cause,X_kbSetCompatMap,client);
bzero(&change,sizeof(XkbChangesRec)); memset(&change, 0, sizeof(XkbChangesRec));
XkbUpdateActions(dev,xkb->min_key_code,XkbNumKeys(xkb),&change,&check, XkbUpdateActions(dev,xkb->min_key_code,XkbNumKeys(xkb),&change,&check,
&cause); &cause);
if (check) if (check)
@ -3384,8 +3384,8 @@ _XkbSetNamedIndicator(ClientPtr client, DeviceIntPtr dev,
statec |= ((sli->effectiveState ^ sli->explicitState) & (1 << led)); statec |= ((sli->effectiveState ^ sli->explicitState) & (1 << led));
} }
bzero((char *)&ed,sizeof(xkbExtensionDeviceNotify)); memset((char *)&ed, 0, sizeof(xkbExtensionDeviceNotify));
bzero((char *)&changes,sizeof(XkbChangesRec)); memset((char *)&changes, 0, sizeof(XkbChangesRec));
XkbSetCauseXkbReq(&cause,X_kbSetNamedIndicator,client); XkbSetCauseXkbReq(&cause,X_kbSetNamedIndicator,client);
if (namec) if (namec)
XkbApplyLedNameChanges(dev,sli,namec,&ed,&changes,&cause); XkbApplyLedNameChanges(dev,sli,namec,&ed,&changes,&cause);
@ -4038,7 +4038,7 @@ _XkbSetNames(ClientPtr client, DeviceIntPtr dev, xkbSetNamesReq *stuff)
return BadAlloc; return BadAlloc;
} }
bzero(&nn,sizeof(xkbNamesNotify)); memset(&nn, 0, sizeof(xkbNamesNotify));
nn.changed= stuff->which; nn.changed= stuff->which;
tmp = (CARD32 *)&stuff[1]; tmp = (CARD32 *)&stuff[1];
if (stuff->which&XkbKeycodesNameMask) if (stuff->which&XkbKeycodesNameMask)
@ -4160,7 +4160,7 @@ _XkbSetNames(ClientPtr client, DeviceIntPtr dev, xkbSetNamesReq *stuff)
if (names->indicators[i]!=None) if (names->indicators[i]!=None)
sli->namesPresent|= bit; sli->namesPresent|= bit;
} }
bzero(&edev,sizeof(xkbExtensionDeviceNotify)); memset(&edev, 0, sizeof(xkbExtensionDeviceNotify));
edev.reason= XkbXI_IndicatorNamesMask; edev.reason= XkbXI_IndicatorNamesMask;
edev.ledClass= KbdFeedbackClass; edev.ledClass= KbdFeedbackClass;
edev.ledID= dev->kbdfeed->ctrl.id; edev.ledID= dev->kbdfeed->ctrl.id;
@ -4478,7 +4478,7 @@ xkbDoodadWireDesc * doodadWire;
for (i=0;i<num_doodads;i++,doodad++) { for (i=0;i<num_doodads;i++,doodad++) {
doodadWire= (xkbDoodadWireDesc *)wire; doodadWire= (xkbDoodadWireDesc *)wire;
wire= (char *)&doodadWire[1]; wire= (char *)&doodadWire[1];
bzero(doodadWire,SIZEOF(xkbDoodadWireDesc)); memset(doodadWire, 0, SIZEOF(xkbDoodadWireDesc));
doodadWire->any.name= doodad->any.name; doodadWire->any.name= doodad->any.name;
doodadWire->any.type= doodad->any.type; doodadWire->any.type= doodad->any.type;
doodadWire->any.priority= doodad->any.priority; doodadWire->any.priority= doodad->any.priority;
@ -5290,7 +5290,7 @@ _XkbSetGeometry(ClientPtr client, DeviceIntPtr dev, xkbSetGeometryReq *stuff)
XkbFreeGeometry(old,XkbGeomAllMask,TRUE); XkbFreeGeometry(old,XkbGeomAllMask,TRUE);
if (new_name) { if (new_name) {
xkbNamesNotify nn; xkbNamesNotify nn;
bzero(&nn,sizeof(xkbNamesNotify)); memset(&nn, 0, sizeof(xkbNamesNotify));
nn.changed= XkbGeometryNameMask; nn.changed= XkbGeometryNameMask;
XkbSendNamesNotify(dev,&nn); XkbSendNamesNotify(dev,&nn);
} }
@ -5497,7 +5497,7 @@ ProcXkbListComponents(ClientPtr client)
status= Success; status= Success;
str= (unsigned char *)&stuff[1]; str= (unsigned char *)&stuff[1];
bzero(&list,sizeof(XkbSrvListInfoRec)); memset(&list, 0, sizeof(XkbSrvListInfoRec));
list.maxRtrn= stuff->maxNames; list.maxRtrn= stuff->maxNames;
list.pattern[_XkbListKeycodes]= GetComponentSpec(&str,FALSE,&status); list.pattern[_XkbListKeycodes]= GetComponentSpec(&str,FALSE,&status);
list.pattern[_XkbListTypes]= GetComponentSpec(&str,FALSE,&status); list.pattern[_XkbListTypes]= GetComponentSpec(&str,FALSE,&status);
@ -5516,7 +5516,7 @@ ProcXkbListComponents(ClientPtr client)
} }
return status; return status;
} }
bzero(&rep,sizeof(xkbListComponentsReply)); memset(&rep, 0, sizeof(xkbListComponentsReply));
rep.type= X_Reply; rep.type= X_Reply;
rep.deviceID = dev->id; rep.deviceID = dev->id;
rep.sequenceNumber = client->sequence; rep.sequenceNumber = client->sequence;
@ -5622,7 +5622,7 @@ ProcXkbGetKbdByName(ClientPtr client)
geom_changed= FALSE; geom_changed= FALSE;
} }
bzero(mapFile,PATH_MAX); memset(mapFile, 0, PATH_MAX);
rep.type= X_Reply; rep.type= X_Reply;
rep.deviceID = dev->id; rep.deviceID = dev->id;
rep.sequenceNumber = client->sequence; rep.sequenceNumber = client->sequence;
@ -5657,7 +5657,7 @@ ProcXkbGetKbdByName(ClientPtr client)
if (stuff->load || if (stuff->load ||
((rep.reported&XkbGBN_SymbolsMask) && (new->compat))) { ((rep.reported&XkbGBN_SymbolsMask) && (new->compat))) {
XkbChangesRec changes; XkbChangesRec changes;
bzero(&changes,sizeof(changes)); memset(&changes, 0, sizeof(changes));
XkbUpdateDescActions(new, XkbUpdateDescActions(new,
new->min_key_code,XkbNumKeys(new), new->min_key_code,XkbNumKeys(new),
&changes); &changes);
@ -6121,7 +6121,7 @@ char * str;
wanted&= ~XkbXI_IndicatorsMask; wanted&= ~XkbXI_IndicatorsMask;
nameLen= XkbSizeCountedString(dev->name); nameLen= XkbSizeCountedString(dev->name);
bzero((char *)&rep,SIZEOF(xkbGetDeviceInfoReply)); memset((char *)&rep, 0, SIZEOF(xkbGetDeviceInfoReply));
rep.type = X_Reply; rep.type = X_Reply;
rep.deviceID= dev->id; rep.deviceID= dev->id;
rep.sequenceNumber = client->sequence; rep.sequenceNumber = client->sequence;
@ -6329,8 +6329,8 @@ xkbExtensionDeviceNotify ed;
XkbChangesRec changes; XkbChangesRec changes;
DeviceIntPtr kbd; DeviceIntPtr kbd;
bzero((char *)&ed,sizeof(xkbExtensionDeviceNotify)); memset((char *)&ed, 0, sizeof(xkbExtensionDeviceNotify));
bzero((char *)&changes,sizeof(XkbChangesRec)); memset((char *)&changes, 0, sizeof(XkbChangesRec));
XkbSetCauseXkbReq(&cause,X_kbSetDeviceInfo,client); XkbSetCauseXkbReq(&cause,X_kbSetDeviceInfo,client);
ledWire= (xkbDeviceLedsWireDesc *)wire; ledWire= (xkbDeviceLedsWireDesc *)wire;
for (i=0;i<num;i++) { for (i=0;i<num;i++) {
@ -6351,11 +6351,11 @@ DeviceIntPtr kbd;
atomWire= (CARD32 *)&ledWire[1]; atomWire= (CARD32 *)&ledWire[1];
if (changed&XkbXI_IndicatorNamesMask) { if (changed&XkbXI_IndicatorNamesMask) {
namec= sli->namesPresent|ledWire->namesPresent; namec= sli->namesPresent|ledWire->namesPresent;
bzero((char *)sli->names,XkbNumIndicators*sizeof(Atom)); memset((char *)sli->names, 0, XkbNumIndicators*sizeof(Atom));
} }
if (ledWire->namesPresent) { if (ledWire->namesPresent) {
sli->namesPresent= ledWire->namesPresent; sli->namesPresent= ledWire->namesPresent;
bzero((char *)sli->names,XkbNumIndicators*sizeof(Atom)); memset((char *)sli->names, 0, XkbNumIndicators*sizeof(Atom));
for (n=0,bit=1;n<XkbNumIndicators;n++,bit<<=1) { for (n=0,bit=1;n<XkbNumIndicators;n++,bit<<=1) {
if (ledWire->namesPresent&bit) { if (ledWire->namesPresent&bit) {
sli->names[n]= (Atom)*atomWire; sli->names[n]= (Atom)*atomWire;
@ -6369,7 +6369,7 @@ DeviceIntPtr kbd;
if (changed&XkbXI_IndicatorMapsMask) { if (changed&XkbXI_IndicatorMapsMask) {
mapc= sli->mapsPresent|ledWire->mapsPresent; mapc= sli->mapsPresent|ledWire->mapsPresent;
sli->mapsPresent= ledWire->mapsPresent; sli->mapsPresent= ledWire->mapsPresent;
bzero((char*)sli->maps,XkbNumIndicators*sizeof(XkbIndicatorMapRec)); memset((char*)sli->maps, 0, XkbNumIndicators*sizeof(XkbIndicatorMapRec));
} }
if (ledWire->mapsPresent) { if (ledWire->mapsPresent) {
for (n=0,bit=1;n<XkbNumIndicators;n++,bit<<=1) { for (n=0,bit=1;n<XkbNumIndicators;n++,bit<<=1) {
@ -6448,7 +6448,7 @@ _XkbSetDeviceInfoCheck(ClientPtr client, DeviceIntPtr dev,
char *wire; char *wire;
xkbExtensionDeviceNotify ed; xkbExtensionDeviceNotify ed;
bzero((char *)&ed,SIZEOF(xkbExtensionDeviceNotify)); memset((char *)&ed, 0, SIZEOF(xkbExtensionDeviceNotify));
ed.deviceID= dev->id; ed.deviceID= dev->id;
wire= (char *)&stuff[1]; wire= (char *)&stuff[1];
if (stuff->change&XkbXI_ButtonActionsMask) { if (stuff->change&XkbXI_ButtonActionsMask) {

2
xkb/xkbActions.c
View File

@ -1032,7 +1032,7 @@ register int i;
xkbi->filters= realloc(xkbi->filters, xkbi->filters= realloc(xkbi->filters,
xkbi->szFilters * sizeof(XkbFilterRec)); xkbi->szFilters * sizeof(XkbFilterRec));
/* 6/21/93 (ef) -- XXX! deal with allocation failure */ /* 6/21/93 (ef) -- XXX! deal with allocation failure */
bzero(&xkbi->filters[xkbi->szFilters/2], memset(&xkbi->filters[xkbi->szFilters/2], 0,
(xkbi->szFilters/2)*sizeof(XkbFilterRec)); (xkbi->szFilters/2)*sizeof(XkbFilterRec));
return &xkbi->filters[xkbi->szFilters/2]; return &xkbi->filters[xkbi->szFilters/2];
} }

24
xkb/xkbLEDs.c
View File

@ -263,7 +263,7 @@ unsigned oldState;
if (ed==NULL) { if (ed==NULL) {
ed= &my_ed; ed= &my_ed;
bzero((char *)ed,sizeof(xkbExtensionDeviceNotify)); memset((char *)ed, 0, sizeof(xkbExtensionDeviceNotify));
} }
else if ((ed->reason&XkbXI_IndicatorsMask)&& else if ((ed->reason&XkbXI_IndicatorsMask)&&
((ed->ledClass!=sli->class)||(ed->ledID!=sli->id))) { ((ed->ledClass!=sli->class)||(ed->ledID!=sli->id))) {
@ -273,7 +273,7 @@ unsigned oldState;
if ((kbd==dev)&&(sli->flags&XkbSLI_IsDefault)) { if ((kbd==dev)&&(sli->flags&XkbSLI_IsDefault)) {
if (changes==NULL) { if (changes==NULL) {
changes= &my_changes; changes= &my_changes;
bzero((char *)changes,sizeof(XkbChangesRec)); memset((char *)changes, 0, sizeof(XkbChangesRec));
} }
changes->indicators.state_changes|= affected; changes->indicators.state_changes|= affected;
} }
@ -362,8 +362,8 @@ XkbChangesRec changes;
xkbExtensionDeviceNotify ed; xkbExtensionDeviceNotify ed;
unsigned side_affected; unsigned side_affected;
bzero((char *)&changes,sizeof(XkbChangesRec)); memset((char *)&changes, 0, sizeof(XkbChangesRec));
bzero((char *)&ed,sizeof(xkbExtensionDeviceNotify)); memset((char *)&ed, 0, sizeof(xkbExtensionDeviceNotify));
sli= XkbFindSrvLedInfo(dev,XkbDfltXIClass,XkbDfltXIId,0); sli= XkbFindSrvLedInfo(dev,XkbDfltXIClass,XkbDfltXIId,0);
sli->explicitState&= ~affect; sli->explicitState&= ~affect;
sli->explicitState|= (affect&values); sli->explicitState|= (affect&values);
@ -735,7 +735,7 @@ XkbFlushLedEvents( DeviceIntPtr dev,
if (changes->indicators.state_changes) if (changes->indicators.state_changes)
XkbDDXUpdateDeviceIndicators(dev,sli,sli->effectiveState); XkbDDXUpdateDeviceIndicators(dev,sli,sli->effectiveState);
XkbSendNotification(kbd,changes,cause); XkbSendNotification(kbd,changes,cause);
bzero((char *)changes,sizeof(XkbChangesRec)); memset((char *)changes, 0, sizeof(XkbChangesRec));
if (XkbAX_NeedFeedback(kbd->key->xkbInfo->desc->ctrls, XkbAX_IndicatorFBMask)) { if (XkbAX_NeedFeedback(kbd->key->xkbInfo->desc->ctrls, XkbAX_IndicatorFBMask)) {
if (sli->effectiveState) if (sli->effectiveState)
@ -751,7 +751,7 @@ XkbFlushLedEvents( DeviceIntPtr dev,
XkbDDXUpdateDeviceIndicators(dev,sli,sli->effectiveState); XkbDDXUpdateDeviceIndicators(dev,sli,sli->effectiveState);
XkbSendExtensionDeviceNotify(dev,cause->client,ed); XkbSendExtensionDeviceNotify(dev,cause->client,ed);
} }
bzero((char *)ed,sizeof(XkbExtensionDeviceNotify)); memset((char *)ed, 0, sizeof(XkbExtensionDeviceNotify));
} }
return; return;
} }
@ -778,7 +778,7 @@ xkbExtensionDeviceNotify my_ed;
if (ed==NULL) { if (ed==NULL) {
ed= &my_ed; ed= &my_ed;
bzero((char *)ed,sizeof(xkbExtensionDeviceNotify)); memset((char *)ed, 0, sizeof(xkbExtensionDeviceNotify));
} }
else if ((ed->reason&XkbXI_IndicatorsMask)&& else if ((ed->reason&XkbXI_IndicatorsMask)&&
((ed->ledClass!=sli->class)||(ed->ledID!=sli->id))) { ((ed->ledClass!=sli->class)||(ed->ledID!=sli->id))) {
@ -788,7 +788,7 @@ xkbExtensionDeviceNotify my_ed;
if ((kbd==dev)&&(sli->flags&XkbSLI_IsDefault)) { if ((kbd==dev)&&(sli->flags&XkbSLI_IsDefault)) {
if (changes==NULL) { if (changes==NULL) {
changes= &my_changes; changes= &my_changes;
bzero((char *)changes,sizeof(XkbChangesRec)); memset((char *)changes, 0, sizeof(XkbChangesRec));
} }
changes->names.changed|= XkbIndicatorNamesMask; changes->names.changed|= XkbIndicatorNamesMask;
changes->names.changed_indicators|= changed_names; changes->names.changed_indicators|= changed_names;
@ -855,7 +855,7 @@ xkbExtensionDeviceNotify my_ed;
if (ed==NULL) { if (ed==NULL) {
ed= &my_ed; ed= &my_ed;
bzero((char *)ed,sizeof(xkbExtensionDeviceNotify)); memset((char *)ed, 0, sizeof(xkbExtensionDeviceNotify));
} }
else if ((ed->reason&XkbXI_IndicatorsMask)&& else if ((ed->reason&XkbXI_IndicatorsMask)&&
((ed->ledClass!=sli->class)||(ed->ledID!=sli->id))) { ((ed->ledClass!=sli->class)||(ed->ledID!=sli->id))) {
@ -865,7 +865,7 @@ xkbExtensionDeviceNotify my_ed;
if ((kbd==dev)&&(sli->flags&XkbSLI_IsDefault)) { if ((kbd==dev)&&(sli->flags&XkbSLI_IsDefault)) {
if (changes==NULL) { if (changes==NULL) {
changes= &my_changes; changes= &my_changes;
bzero((char *)changes,sizeof(XkbChangesRec)); memset((char *)changes, 0, sizeof(XkbChangesRec));
} }
changes->indicators.map_changes|= changed_maps; changes->indicators.map_changes|= changed_maps;
} }
@ -917,7 +917,7 @@ Bool kb_changed;
if (changes==NULL) { if (changes==NULL) {
changes= &my_changes; changes= &my_changes;
bzero((char *)changes,sizeof(XkbChangesRec)); memset((char *)changes, 0, sizeof(XkbChangesRec));
} }
kb_changed= FALSE; kb_changed= FALSE;
@ -943,7 +943,7 @@ Bool kb_changed;
if (ed==NULL) { if (ed==NULL) {
ed= &my_ed; ed= &my_ed;
bzero((char *)ed,sizeof(xkbExtensionDeviceNotify)); memset((char *)ed, 0, sizeof(xkbExtensionDeviceNotify));
} }
else if (affected&&(ed->reason&XkbXI_IndicatorsMask)&& else if (affected&&(ed->reason&XkbXI_IndicatorsMask)&&
((ed->ledClass!=sli->class)||(ed->ledID!=sli->id))) { ((ed->ledClass!=sli->class)||(ed->ledID!=sli->id))) {

10
xkb/xkbUtils.c
View File

@ -282,7 +282,7 @@ register unsigned key;
register unsigned bit,i; register unsigned bit,i;
unsigned present; unsigned present;
bzero(newVMods,XkbNumVirtualMods); memset(newVMods, 0, XkbNumVirtualMods);
present= 0; present= 0;
for (key=xkb->min_key_code;key<=xkb->max_key_code;key++) { for (key=xkb->min_key_code;key<=xkb->max_key_code;key++) {
if (xkb->server->vmodmap[key]==0) if (xkb->server->vmodmap[key]==0)
@ -588,7 +588,7 @@ XkbSrvInfoPtr xkbi = dev->key->xkbInfo;
xkbMapNotify mn; xkbMapNotify mn;
xkbi->desc->server->explicit[key]|= XkbExplicitAutoRepeatMask; xkbi->desc->server->explicit[key]|= XkbExplicitAutoRepeatMask;
bzero(&mn,sizeof(mn)); memset(&mn, 0, sizeof(mn));
mn.changed= XkbExplicitComponentsMask; mn.changed= XkbExplicitComponentsMask;
mn.firstKeyExplicit= key; mn.firstKeyExplicit= key;
mn.nKeyExplicit= 1; mn.nKeyExplicit= 1;
@ -961,7 +961,7 @@ _XkbCopyClientMap(XkbDescPtr src, XkbDescPtr dst)
if (!tmp) if (!tmp)
return FALSE; return FALSE;
dst->map->types = tmp; dst->map->types = tmp;
bzero(dst->map->types + dst->map->num_types, memset(dst->map->types + dst->map->num_types, 0,
(src->map->num_types - dst->map->num_types) * (src->map->num_types - dst->map->num_types) *
sizeof(XkbKeyTypeRec)); sizeof(XkbKeyTypeRec));
} }
@ -1426,7 +1426,7 @@ _XkbCopyGeom(XkbDescPtr src, XkbDescPtr dst)
dst->geom->sz_properties = src->geom->num_properties; dst->geom->sz_properties = src->geom->num_properties;
if (dst->geom->sz_properties > dst->geom->num_properties) { if (dst->geom->sz_properties > dst->geom->num_properties) {
bzero(dst->geom->properties + dst->geom->num_properties, memset(dst->geom->properties + dst->geom->num_properties, 0,
(dst->geom->sz_properties - dst->geom->num_properties) * (dst->geom->sz_properties - dst->geom->num_properties) *
sizeof(XkbPropertyRec)); sizeof(XkbPropertyRec));
} }
@ -1504,7 +1504,7 @@ _XkbCopyGeom(XkbDescPtr src, XkbDescPtr dst)
dst->geom->sz_colors = src->geom->num_colors; dst->geom->sz_colors = src->geom->num_colors;
if (dst->geom->sz_colors > dst->geom->num_colors) { if (dst->geom->sz_colors > dst->geom->num_colors) {
bzero(dst->geom->colors + dst->geom->num_colors, memset(dst->geom->colors + dst->geom->num_colors, 0,
(dst->geom->sz_colors - dst->geom->num_colors) * (dst->geom->sz_colors - dst->geom->num_colors) *
sizeof(XkbColorRec)); sizeof(XkbColorRec));
} }

6
xkb/xkmread.c
View File

@ -80,7 +80,7 @@ int newCount= *newCountRtrn;
oldPtr= realloc(oldPtr,newCount*elemSize); oldPtr= realloc(oldPtr,newCount*elemSize);
if (oldPtr!=NULL) { if (oldPtr!=NULL) {
char *tmp= (char *)oldPtr; char *tmp= (char *)oldPtr;
bzero(&tmp[oldCount*elemSize],(newCount-oldCount)*elemSize); memset(&tmp[oldCount*elemSize], 0, (newCount-oldCount)*elemSize);
} }
} }
else if (newCount<oldCount) { else if (newCount<oldCount) {
@ -725,8 +725,8 @@ int nRead=0;
return -1; return -1;
} }
nRead+= tmp*SIZEOF(xkmKeySymMapDesc); nRead+= tmp*SIZEOF(xkmKeySymMapDesc);
bzero((char *)typeName,XkbNumKbdGroups*sizeof(Atom)); memset((char *)typeName, 0, XkbNumKbdGroups*sizeof(Atom));
bzero((char *)type,XkbNumKbdGroups*sizeof(XkbKeyTypePtr)); memset((char *)type, 0, XkbNumKbdGroups*sizeof(XkbKeyTypePtr));
if (wireMap.flags&XkmKeyHasTypes) { if (wireMap.flags&XkmKeyHasTypes) {
register int g; register int g;
for (g=0;g<XkbNumKbdGroups;g++) { for (g=0;g<XkbNumKbdGroups;g++) {