Make configure checks able to build with -Werror

Also fix a few compiler warnings, this combined with pull #82 allows me to build
with CFLAGS="-Werror -Wall".
This commit is contained in:
David Leadbeater 2014-07-06 18:56:17 +01:00
commit beec29c305
6 changed files with 13 additions and 11 deletions

View file

@ -452,7 +452,7 @@ void gui_entry_insert_text(GUI_ENTRY_REC *entry, const char *str)
g_utf8_validate(str, -1, &ptr);
len = g_utf8_pointer_to_offset(str, ptr);
} else if (term_type == TERM_TYPE_BIG5)
len = strlen_big5(str);
len = strlen_big5((const unsigned char *)str);
else
len = strlen(str);
entry_text_grow(entry, len);

View file

@ -140,7 +140,7 @@ int term_init(void)
term_set_input_type(TERM_TYPE_8BIT);
term_common_init();
g_atexit(term_deinit);
atexit(term_deinit);
return TRUE;
}
@ -568,7 +568,7 @@ void term_stop(void)
static int input_utf8(const unsigned char *buffer, int size, unichar *result)
{
unichar c = g_utf8_get_char_validated(buffer, size);
unichar c = g_utf8_get_char_validated((char *)buffer, size);
switch (c) {
case (unichar)-1:

View file

@ -22,6 +22,7 @@
#include "module.h"
#include "textbuffer-view.h"
#include "signals.h"
#include "utf8.h"
typedef struct {
@ -178,14 +179,14 @@ static void unformat_24bit_line_color(const unsigned char **ptr, int off, int *f
static inline unichar read_unichar(const unsigned char *data, const unsigned char **next, int *width)
{
unichar chr = g_utf8_get_char_validated(data, -1);
unichar chr = g_utf8_get_char_validated((const char *) data, -1);
if (chr & 0x80000000) {
chr = 0xfffd;
*next = data + 1;
*width = 1;
} else {
*next = g_utf8_next_char(data);
*next = (unsigned char *)g_utf8_next_char(data);
*width = unichar_isprint(chr) ? mk_wcwidth(chr) : 1;
}
return chr;