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

s/enum GInputCondition/int/ - enums aren't supposed to orred together i

Browse Source 
think.. at least MIPSpro gave warnings about it and it also feels wrong :)


git-svn-id: http://svn.irssi.org/repos/irssi/trunk@865 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2000-11-23 23:29:32 +00:00 committed by cras
parent 8961d23171
commit d1d70fd5d7
7 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/common.h
View File

@ -50,17 +50,14 @@
#define g_free_and_null(a) \ #define g_free_and_null(a) \
if (a) { g_free(a); (a) = NULL; } if (a) { g_free(a); (a) = NULL; }
typedef enum { #define G_INPUT_READ (1 << 0)
G_INPUT_READ = 1 << 0, #define G_INPUT_WRITE (1 << 1)
G_INPUT_WRITE = 1 << 1
} GInputCondition;
typedef void (*GInputFunction) (void *data, int source, typedef void (*GInputFunction) (void *data, int source, int condition);
GInputCondition condition);
int g_input_add(int source, GInputCondition condition, int g_input_add(int source, int condition,
GInputFunction function, void *data); GInputFunction function, void *data);
int g_input_add_full(int source, int priority, GInputCondition condition, int g_input_add_full(int source, int priority, int condition,
GInputFunction function, void *data); GInputFunction function, void *data);
#define MAX_INT_STRLEN ((sizeof(int) * CHAR_BIT + 2) / 3 + 1) #define MAX_INT_STRLEN ((sizeof(int) * CHAR_BIT + 2) / 3 + 1)

8
src/core/misc.c
View File

@ -28,7 +28,7 @@
#endif #endif
typedef struct { typedef struct {
GInputCondition condition; int condition;
GInputFunction function; GInputFunction function;
void *data; void *data;
} IRSSI_INPUT_REC; } IRSSI_INPUT_REC;
@ -37,7 +37,7 @@ static int irssi_io_invoke(GIOChannel *source, GIOCondition condition,
void *data) void *data)
{ {
IRSSI_INPUT_REC *rec = data; IRSSI_INPUT_REC *rec = data;
GInputCondition icond = (GInputCondition)0; int icond = 0;
if (condition & (G_IO_ERR | G_IO_HUP | G_IO_NVAL)) { if (condition & (G_IO_ERR | G_IO_HUP | G_IO_NVAL)) {
/* error, we have to call the function.. */ /* error, we have to call the function.. */
@ -60,7 +60,7 @@ static int irssi_io_invoke(GIOChannel *source, GIOCondition condition,
return TRUE; return TRUE;
} }
int g_input_add_full(int source, int priority, GInputCondition condition, int g_input_add_full(int source, int priority, int condition,
GInputFunction function, void *data) GInputFunction function, void *data)
{ {
IRSSI_INPUT_REC *rec; IRSSI_INPUT_REC *rec;
@ -87,7 +87,7 @@ int g_input_add_full(int source, int priority, GInputCondition condition,
return result; return result;
} }
int g_input_add(int source, GInputCondition condition, int g_input_add(int source, int condition,
GInputFunction function, void *data) GInputFunction function, void *data)
{ {
return g_input_add_full(source, G_PRIORITY_DEFAULT, condition, return g_input_add_full(source, G_PRIORITY_DEFAULT, condition,

3
src/core/net-nonblock.c
View File

@ -190,8 +190,7 @@ static void simple_readpipe(SIMPLE_THREAD_REC *rec, int pipe)
return; return;
} }
rec->tag = g_input_add(handle, rec->tag = g_input_add(handle, G_INPUT_READ | G_INPUT_WRITE,
(GInputCondition) (G_INPUT_READ|G_INPUT_WRITE),
(GInputFunction) simple_init, rec); (GInputFunction) simple_init, rec);
} }

3
src/core/servers.c
View File

@ -200,8 +200,7 @@ static void server_connect_callback_readpipe(SERVER_REC *server)
server->handle = net_sendbuffer_create(handle, 0); server->handle = net_sendbuffer_create(handle, 0);
server->connect_tag = server->connect_tag =
g_input_add(handle, g_input_add(handle, G_INPUT_WRITE | G_INPUT_READ,
(GInputCondition) (G_INPUT_WRITE|G_INPUT_READ),
(GInputFunction) server_connect_callback_init, (GInputFunction) server_connect_callback_init,
server); server);
signal_emit("server connecting", 2, server, &iprec.ip); signal_emit("server connecting", 2, server, &iprec.ip);

2
src/irc/dcc/dcc-chat.c
View File

@ -252,7 +252,7 @@ static void dcc_chat_connect(DCC_REC *dcc)
source_host_ok ? source_host_ip : NULL); source_host_ok ? source_host_ip : NULL);
if (dcc->handle != -1) { if (dcc->handle != -1) {
dcc->tagconn = g_input_add(dcc->handle, dcc->tagconn = g_input_add(dcc->handle,
(GInputCondition) (G_INPUT_WRITE|G_INPUT_READ), G_INPUT_WRITE | G_INPUT_READ,
(GInputFunction) sig_chat_connected, dcc); (GInputFunction) sig_chat_connected, dcc);
} else { } else {
/* error connecting */ /* error connecting */

2
src/irc/dcc/dcc-files.c
View File

@ -199,7 +199,7 @@ static void dcc_get_connect(DCC_REC *dcc)
source_host_ok ? source_host_ip : NULL); source_host_ok ? source_host_ip : NULL);
if (dcc->handle != -1) { if (dcc->handle != -1) {
dcc->tagconn = g_input_add(dcc->handle, dcc->tagconn = g_input_add(dcc->handle,
(GInputCondition) (G_INPUT_WRITE|G_INPUT_READ), G_INPUT_WRITE | G_INPUT_READ,
(GInputFunction) sig_dccget_connected, dcc); (GInputFunction) sig_dccget_connected, dcc);
} else { } else {
/* error connecting */ /* error connecting */

2
src/perl/perl.c
View File

@ -488,7 +488,7 @@ int perl_input_add(int source, int condition,
rec = g_new(PERL_SOURCE_REC, 1); rec = g_new(PERL_SOURCE_REC, 1);
rec->func = g_strdup_printf("%s::%s", perl_get_package(), func); rec->func = g_strdup_printf("%s::%s", perl_get_package(), func);
rec->data = g_strdup(data); rec->data = g_strdup(data);
rec->tag = g_input_add(source, (GInputCondition) condition, rec->tag = g_input_add(source, condition,
(GInputFunction) perl_source_event, rec); (GInputFunction) perl_source_event, rec);
perl_sources = g_slist_append(perl_sources, rec); perl_sources = g_slist_append(perl_sources, rec);