diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2011-10-28 21:18:46 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2011-11-23 12:15:05 -0800 |
| commit | 6e6d732bac3c21cb85f8e998908f9b393630e5f8 (patch) | |
| tree | be0fb5e9e8f4e10af141e061f35e6f62b06d3181 /xkb/ddxLoad.c | |
| parent | e189dbb3e57d30eb96034d4ce9544ce7a93a371e (diff) | |
Convert strncpy/strncat to strlcpy/strlcat
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>
Diffstat (limited to 'xkb/ddxLoad.c')
| -rw-r--r-- | xkb/ddxLoad.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/xkb/ddxLoad.c b/xkb/ddxLoad.c index 219d39c9a..196142318 100644 --- a/xkb/ddxLoad.c +++ b/xkb/ddxLoad.c @@ -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; } |