X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Ftest_add_wchstr.c;h=1bca895573a9ae884519cf441e33232af5a13f4f;hp=08ff6ee06f1c80b186df0efb4b9e57d6fcb70a41;hb=91fa4688e82518794fcf0c32a36f3fcca5e4c2d5;hpb=aa4fd77b765d528af776d42ea6e98a7405e18b40 diff --git a/test/test_add_wchstr.c b/test/test_add_wchstr.c index 08ff6ee0..1bca8955 100644 --- a/test/test_add_wchstr.c +++ b/test/test_add_wchstr.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 2009,2010 Free Software Foundation, Inc. * + * Copyright (c) 2010-2011,2012 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -26,7 +26,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: test_add_wchstr.c,v 1.12 2010/12/12 00:17:13 tom Exp $ + * $Id: test_add_wchstr.c,v 1.17 2012/10/27 19:37:30 tom Exp $ * * Demonstrate the waddwchstr() and wadd_wch functions. * Thomas Dickey - 2009/9/12 @@ -90,6 +90,8 @@ static size_t temp_length; if (need > temp_length) { \ temp_length = need * 2; \ temp_buffer = typeRealloc(cchar_t, temp_length, temp_buffer); \ + if (!temp_buffer) \ + failed("TempBuffer"); \ } \ have[0] = 0; \ have[1] = 0; \ @@ -123,7 +125,7 @@ ChWLen(const wchar_t *source) if (!pass_ctls) { size_t adjust = 0; size_t n; - char *s; + const char *s; for (n = 0; n < result; ++n) { if (source[n] < 256 && (s = unctrl((chtype) source[n])) != 0) { @@ -357,7 +359,7 @@ test_add_wchstr(int level) if (has_colors()) { start_color(); init_pair(1, COLOR_WHITE, COLOR_BLUE); - wbkgdset(work, COLOR_PAIR(1) | ' '); + wbkgdset(work, (chtype) (COLOR_PAIR(1) | ' ')); } while ((ch = read_linedata(work)) != ERR && !isQUIT(ch)) {