aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-12-04 14:46:39 -05:00
Code

Make configure checks able to build with -Werror

Browse Source 
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
parent 1bf4753914
commit beec29c305
6 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure.ac
View File

@ -221,7 +221,7 @@ AC_CACHE_VAL(irssi_cv_type_socklen_t,
[AC_TRY_COMPILE([ [AC_TRY_COMPILE([
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h>], #include <sys/socket.h>],
[socklen_t t;], [socklen_t t = 0; return((int)t); ],
irssi_cv_type_socklen_t=yes, irssi_cv_type_socklen_t=yes,
irssi_cv_type_socklen_t=no, irssi_cv_type_socklen_t=no,
)]) )])
@ -455,8 +455,10 @@ if test "$want_perl" != "no"; then
esac esac
dnl * check that perl's ldflags actually work dnl * check that perl's ldflags actually work
echo "main(){perl_alloc(); return 0;}" > conftest.c echo "#include <EXTERN.h>" > conftest.c
$CC $CFLAGS conftest.c -o conftest $LDFLAGS $PERL_LDFLAGS 2> perl.error.tmp > /dev/null echo "#include <perl.h>" >> conftest.c
echo "int main(){perl_alloc(); return 0;}" >> conftest.c
$CC $CFLAGS $PERL_CFLAGS conftest.c -o conftest $LDFLAGS $PERL_LDFLAGS 2> perl.error.tmp > /dev/null
if test ! -s conftest -a "x$ignore_perl_errors" = "x"; then if test ! -s conftest -a "x$ignore_perl_errors" = "x"; then
perl_check_error="Error linking with perl libraries: $PERL_LDFLAGS: `cat perl.error.tmp`" perl_check_error="Error linking with perl libraries: $PERL_LDFLAGS: `cat perl.error.tmp`"
AC_MSG_RESULT([error linking with perl libraries, building without Perl]) AC_MSG_RESULT([error linking with perl libraries, building without Perl])

2
src/core/network.c
View File

@ -60,7 +60,7 @@ GIOChannel *g_io_channel_new(int handle)
IPADDR ip4_any = { IPADDR ip4_any = {
AF_INET, AF_INET,
{ { { INADDR_ANY } } } { INADDR_ANY }
}; };
int net_ip_compare(IPADDR *ip1, IPADDR *ip2) int net_ip_compare(IPADDR *ip1, IPADDR *ip2)

2
src/fe-text/gui-entry.c
View File

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

4
src/fe-text/term-terminfo.c
View File

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

5
src/fe-text/textbuffer-view.c
View File

@ -22,6 +22,7 @@
#include "module.h" #include "module.h"
#include "textbuffer-view.h" #include "textbuffer-view.h"
#include "signals.h"
#include "utf8.h" #include "utf8.h"
typedef struct { 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) 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) { if (chr & 0x80000000) {
chr = 0xfffd; chr = 0xfffd;
*next = data + 1; *next = data + 1;
*width = 1; *width = 1;
} else { } else {
*next = g_utf8_next_char(data); *next = (unsigned char *)g_utf8_next_char(data);
*width = unichar_isprint(chr) ? mk_wcwidth(chr) : 1; *width = unichar_isprint(chr) ? mk_wcwidth(chr) : 1;
} }
return chr; return chr;

3
src/perl/textui/Statusbar.xs
View File

@ -50,7 +50,6 @@ static void perl_statusbar_event(char *function, SBAR_ITEM_REC *item,
int get_size_only) int get_size_only)
{ {
dSP; dSP;
int retcount;
SV *item_sv, **sv; SV *item_sv, **sv;
HV *hv; HV *hv;
@ -63,7 +62,7 @@ static void perl_statusbar_event(char *function, SBAR_ITEM_REC *item,
XPUSHs(sv_2mortal(newSViv(get_size_only))); XPUSHs(sv_2mortal(newSViv(get_size_only)));
PUTBACK; PUTBACK;
retcount = perl_call_pv(function, G_EVAL|G_DISCARD); perl_call_pv(function, G_EVAL|G_DISCARD);
SPAGAIN; SPAGAIN;
if (SvTRUE(ERRSV)) { if (SvTRUE(ERRSV)) {