hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-09-28 21:33:09 +00:00
Code Issues Projects Releases Wiki Activity

Convert strncpy/strncat to strlcpy/strlcat

Browse source 
As long as we're carrying around a compatibility copy in os/strl*.c,
might as well use them.

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
This commit is contained in:
Alan Coopersmith 2011-10-28 21:18:46 -07:00
commit 6e6d732bac
13 changed files with 21 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

6
xkb/ddxLoad.c
View file

@ -263,8 +263,7 @@ XkbDDXCompileKeymapByNames( XkbDescPtr xkb,
if (xkbDebugFlags)
DebugF("[xkb] xkb executes: %s\n",buf);
if (nameRtrn) {
strncpy(nameRtrn,keymap,nameRtrnLen);
nameRtrn[nameRtrnLen-1]= '\0';
strlcpy(nameRtrn,keymap,nameRtrnLen);
}
free(buf);
#ifdef WIN32
@ -322,8 +321,7 @@ FILE * file;
}
else file= NULL;
if ((fileNameRtrn!=NULL)&&(fileNameRtrnLen>0)) {
strncpy(fileNameRtrn,buf,fileNameRtrnLen);
buf[fileNameRtrnLen-1]= '\0';
strlcpy(fileNameRtrn,buf,fileNameRtrnLen);
}
return file;
}

3
xkb/maprules.c
View file

@ -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;
}

3
xkb/xkbtext.c
View file

@ -81,8 +81,7 @@ char *rtrn,*tmp;
if (len>BUFFER_SIZE)
len= BUFFER_SIZE-2;
rtrn= tbGetBuffer(len);
strncpy(rtrn,atmstr,len);
rtrn[len]= '\0';
strlcpy(rtrn,atmstr,len);
}
else {
rtrn= tbGetBuffer(1);