diff options
| author | marha <marha@users.sourceforge.net> | 2011-11-25 08:32:21 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-11-25 08:32:21 +0100 |
| commit | 849d328b25c2f3c87d539e1fe7af38e7580a0409 (patch) | |
| tree | 349c425a87ddb3aaa1d7832d5a8e68252fc73ddb /xorg-server/xkb/maprules.c | |
| parent | a8a12d4c8be177f63cae7dc96c2b52f09e228a76 (diff) | |
| parent | a0b4a1330be6a36ad095222d2ea83927cd33514d (diff) | |
| download | vcxsrv-849d328b25c2f3c87d539e1fe7af38e7580a0409.tar.gz vcxsrv-849d328b25c2f3c87d539e1fe7af38e7580a0409.tar.bz2 vcxsrv-849d328b25c2f3c87d539e1fe7af38e7580a0409.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/glx/glxdriswrast.c
xorg-server/glx/single2.c
xorg-server/hw/xwin/winconfig.c
xorg-server/os/osinit.c
xorg-server/os/xdmcp.c
xorg-server/xkb/xkbInit.c
Diffstat (limited to 'xorg-server/xkb/maprules.c')
| -rw-r--r-- | xorg-server/xkb/maprules.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/xorg-server/xkb/maprules.c b/xorg-server/xkb/maprules.c index f94089982..66800478c 100644 --- a/xorg-server/xkb/maprules.c +++ b/xorg-server/xkb/maprules.c @@ -200,7 +200,7 @@ Bool endOfFile,spacePending,slashPending,inComment; #define PART_MASK 0x000F #define COMPONENT_MASK 0x03F0 -static char * cname[MAX_WORDS] = { +static const char * cname[MAX_WORDS] = { "model", "layout", "variant", "option", "keycodes", "symbols", "types", "compat", "geometry" }; @@ -250,8 +250,7 @@ get_index(char *str, int *ndx) *ndx = -1; return end + 1; } - strncpy(ndx_buf, str, end - str); - ndx_buf[end - str] = '\0'; + strlcpy(ndx_buf, str, 1 + end - str); *ndx = atoi(ndx_buf); return end + 1; } |