← Back to branch summary

~darkxst/ubuntu/raring/xorg-server/lp1073724

« back to all changes in this revision

Viewing changes to xkb/maprules.c

  • Committer: Package Import Robot
  • Author(s): Cyril Brulebois
  • Date: 2011-12-20 11:39:51 UTC
  • mto: (0.10.23) (1.1.48)
  • mto: This revision was merged to the branch mainline in revision 244.
  • Revision ID: package-import@ubuntu.com-20111220113951-cx9svdcnqpcta5wk
Tags: upstream-1.11.99.2
Import upstream version 1.11.99.2

Show diffs side-by-side

added added

removed removed

Lines of Context:
xkb/maprules.c
200
200
#define PART_MASK       0x000F
201
201
#define COMPONENT_MASK  0x03F0
202
202
 
203
 
static  char *  cname[MAX_WORDS] = {
 
203
static  const char *    cname[MAX_WORDS] = {
204
204
        "model", "layout", "variant", "option", 
205
205
        "keycodes", "symbols", "types", "compat", "geometry"
206
206
};
250
250
       *ndx = -1;
251
251
       return end + 1;
252
252
   }
253
 
   strncpy(ndx_buf, str, end - str);
254
 
   ndx_buf[end - str] = '\0';
 
253
   strlcpy(ndx_buf, str, 1 + end - str);
255
254
   *ndx = atoi(ndx_buf);
256
255
   return end + 1;
257
256
}