moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-12-21 23:38:49 -05:00
Code Issues Releases Wiki Activity

package.c: Fix incorrect buffersize and constant-folding

Browse Source 
Signed-off-by: Rikard Falkeborn <rikard.falkeborn@gmail.com>
Signed-off-by: Pierre Neidhardt <ambrevar@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Pierre Neidhardt 2015-11-02 14:00:32 +01:00 committed by Allan McRae
parent 906dc0ce24
commit d5b0f0c26f
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/pacman/package.c
View File

@ -90,9 +90,8 @@ static void make_aligned_titles(void)
{
unsigned int i;
size_t max = 0;
static const wchar_t *title_suffix = L" :";
static const size_t title_suffix_len = sizeof(title_suffix);
wchar_t wbuf[ARRAYSIZE(titles)][TITLE_MAXLEN + title_suffix_len];
static const wchar_t title_suffix[] = L" :";
wchar_t wbuf[ARRAYSIZE(titles)][TITLE_MAXLEN + ARRAYSIZE(title_suffix)];
size_t wlen[ARRAYSIZE(wbuf)];
char *buf[ARRAYSIZE(wbuf)];
buf[T_ARCHITECTURE] = _("Architecture");
@ -133,7 +132,7 @@ static void make_aligned_titles(void)
for(i = 0; i < ARRAYSIZE(wbuf); i++) {
wmemset(wbuf[i] + wlen[i], L' ', max - wlen[i]);
wmemcpy(wbuf[i] + max, title_suffix, title_suffix_len);
wmemcpy(wbuf[i] + max, title_suffix, ARRAYSIZE(title_suffix));
wcstombs(titles[i], wbuf[i], sizeof(wbuf[i]));
}
}