diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-17 19:03:18 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-17 19:03:18 +0000 |
| commit | 400780e6a7f710b57e92a9cc792bcb4ba530ffb3 (patch) | |
| tree | e79f892e8545c72ddbe15d679315143e5672175d /src/xkb/XKBNames.c | |
| parent | dc4268a7dadc8da0d561757a68461246728613d3 (diff) | |
merge XFree86 4.3.0.1 to -CURRENT
Diffstat (limited to 'src/xkb/XKBNames.c')
| -rw-r--r-- | src/xkb/XKBNames.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/xkb/XKBNames.c b/src/xkb/XKBNames.c index 22439d29..a072bf88 100644 --- a/src/xkb/XKBNames.c +++ b/src/xkb/XKBNames.c @@ -24,6 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +/* $XFree86: xc/lib/X11/XKBNames.c,v 1.4 2001/10/28 03:32:33 tsi Exp $ */ #define NEED_REPLIES #define NEED_EVENTS @@ -369,12 +370,12 @@ XkbSetNames(dpy,which,firstType,nTypes,xkb) #endif { register xkbSetNamesReq *req; - int nLvlNames; + int nLvlNames = 0; XkbInfoPtr xkbi; XkbNamesPtr names; unsigned firstLvlType,nLvlTypes; int nVMods,nLEDs,nRG,nKA,nGroups; - int nKeys,firstKey,nAtoms; + int nKeys=0,firstKey=0,nAtoms; CARD32 leds,vmods,groups; if ((dpy->flags & XlibDisplayNoXkb) || @@ -598,14 +599,14 @@ XkbChangeNames(dpy,xkb,changes) #endif { register xkbSetNamesReq *req; - int nLvlNames; + int nLvlNames = 0; XkbInfoPtr xkbi; XkbNamesPtr names; unsigned which,firstType,nTypes; unsigned firstLvlType,nLvlTypes; int nVMods,nLEDs,nRG,nKA,nGroups; - int nKeys,firstKey,nAtoms; - CARD32 leds,vmods,groups; + int nKeys=0,firstKey=0,nAtoms; + CARD32 leds=0,vmods=0,groups=0; if ((dpy->flags & XlibDisplayNoXkb) || (!dpy->xkb_info && !XkbUseExtension(dpy,NULL,NULL))) |