From d5b0f0c26f5dc139c5c8e534cafc017956229f66 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 2 Nov 2015 14:00:32 +0100 Subject: package.c: Fix incorrect buffersize and constant-folding Signed-off-by: Rikard Falkeborn Signed-off-by: Pierre Neidhardt Signed-off-by: Allan McRae --- src/pacman/package.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/pacman/package.c b/src/pacman/package.c index dbd23f5a..c9301acf 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -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])); } } -- cgit v1.2.3-70-g09d2