summaryrefslogtreecommitdiffstats
path: root/ui/ncurses/nc-boot-editor.c
diff options
context:
space:
mode:
authorSamuel Mendoza-Jonas <sam.mj@au1.ibm.com>2014-10-09 14:40:38 +1100
committerSamuel Mendoza-Jonas <sam.mj@au1.ibm.com>2015-08-31 14:56:51 +1000
commit75c3e8689b1affde2dc8417ca96ca94bc132408f (patch)
tree42b52c2fc6b019b301cadd0e733a4836819ef1ee /ui/ncurses/nc-boot-editor.c
parent3ec4b6e0f2a1a91b7a651eff9762f247a724d3d2 (diff)
downloadtalos-petitboot-75c3e8689b1affde2dc8417ca96ca94bc132408f.tar.gz
talos-petitboot-75c3e8689b1affde2dc8417ca96ca94bc132408f.zip
lib/i18n: Move strncols to i18n.c
Make the strncols() helper available generally to i18n-concerned code. Signed-off-by: Samuel Mendoza-Jonas <sam.mj@au1.ibm.com>
Diffstat (limited to 'ui/ncurses/nc-boot-editor.c')
-rw-r--r--ui/ncurses/nc-boot-editor.c31
1 files changed, 0 insertions, 31 deletions
diff --git a/ui/ncurses/nc-boot-editor.c b/ui/ncurses/nc-boot-editor.c
index 274bd9d..f55fe4a 100644
--- a/ui/ncurses/nc-boot-editor.c
+++ b/ui/ncurses/nc-boot-editor.c
@@ -22,7 +22,6 @@
#include <assert.h>
#include <string.h>
-#include <stdlib.h>
#include "log/log.h"
#include "talloc/talloc.h"
@@ -524,36 +523,6 @@ void boot_editor_update(struct boot_editor *boot_editor,
pad_refresh(boot_editor);
}
-/* Return the number of columns required to display a localised string */
-static int strncols(const char *str)
-{
- int i, wlen, ncols = 0;
- wchar_t *wstr;
-
- wlen = mbstowcs(NULL, str, 0);
- if (wlen <= 0)
- return wlen;
-
- wstr = malloc(sizeof(wchar_t) * wlen + 1);
- if (!wstr)
- return -1;
-
- wlen = mbstowcs(wstr, str, wlen);
- if (wlen <= 0) {
- free(wstr);
- return wlen;
- }
-
- /* Processing each character individually lets us use the same
- * check for all languages */
- for (i = 0; i < wlen; i++) {
- ncols += wcwidth(wstr[i]);
- }
-
- free(wstr);
- return ncols;
-}
-
struct boot_editor *boot_editor_init(struct cui *cui,
struct pmenu_item *item,
const struct system_info *sysinfo,
OpenPOWER on IntegriCloud