andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Reduce unnecessary string copying in xkbtext routines

Browse Source 
Instead of using sprintf to copy a static string to a local buffer,
just to pass it to TryCopyStr, pass the static string to TryCopyStr
directly, as is already done in other parts of this code.

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
This commit is contained in:
Alan Coopersmith 2011-11-03 20:44:43 -07:00
parent 05d8a7f7a7
commit 3d0ece5e84
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
xkb/xkbtext.c
View File

@ -772,15 +772,14 @@ char tbuf[32];
if (action->type==XkbSA_LockPtrBtn) {
switch (act->flags&(XkbSA_LockNoUnlock|XkbSA_LockNoLock)) {
case XkbSA_LockNoLock:
sprintf(tbuf,",affect=unlock"); break;
TryCopyStr(buf,",affect=unlock",sz); break;
case XkbSA_LockNoUnlock:
sprintf(tbuf,",affect=lock"); break;
TryCopyStr(buf,",affect=lock",sz); break;
case XkbSA_LockNoUnlock|XkbSA_LockNoLock:
sprintf(tbuf,",affect=neither"); break;
TryCopyStr(buf,",affect=neither",sz); break;
default:
sprintf(tbuf,",affect=both"); break;
TryCopyStr(buf,",affect=both",sz); break;
}
TryCopyStr(buf,tbuf,sz);
}
return TRUE;
}
@ -1065,15 +1064,14 @@ char tbuf[32];
if (action->type==XkbSA_LockDeviceBtn) {
switch (act->flags&(XkbSA_LockNoUnlock|XkbSA_LockNoLock)) {
case XkbSA_LockNoLock:
sprintf(tbuf,",affect=unlock"); break;
TryCopyStr(buf,",affect=unlock",sz); break;
case XkbSA_LockNoUnlock:
sprintf(tbuf,",affect=lock"); break;
TryCopyStr(buf,",affect=lock",sz); break;
case XkbSA_LockNoUnlock|XkbSA_LockNoLock:
sprintf(tbuf,",affect=neither"); break;
TryCopyStr(buf,",affect=neither",sz); break;
default:
sprintf(tbuf,",affect=both"); break;
TryCopyStr(buf,",affect=both",sz); break;
}
TryCopyStr(buf,tbuf,sz);
}
return TRUE;
}