diff options
| author | Timo Sirainen <cras@irssi.org> | 2000-08-30 22:29:55 +0000 |
|---|---|---|
| committer | cras <cras@dbcabf3a-b0e7-0310-adc4-f8d773084564> | 2000-08-30 22:29:55 +0000 |
| commit | b4bdec4436190d7ccb6252be388b5ee70c5c36f5 (patch) | |
| tree | 5b80eb0eab42f347575c05dbff3361f9955cd6ee /src/irc/core/irc-servers.h | |
| parent | cf7eb945ea769b51622a1c1cbbbc7e7a6a494df9 (diff) | |
| download | irssi-b4bdec4436190d7ccb6252be388b5ee70c5c36f5.zip | |
Object type checking fixes
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@638 dbcabf3a-b0e7-0310-adc4-f8d773084564
Diffstat (limited to 'src/irc/core/irc-servers.h')
| -rw-r--r-- | src/irc/core/irc-servers.h | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/src/irc/core/irc-servers.h b/src/irc/core/irc-servers.h index 9199a698..e1fd333d 100644 --- a/src/irc/core/irc-servers.h +++ b/src/irc/core/irc-servers.h @@ -3,21 +3,19 @@ #include "servers.h" -#define IS_IRC_SERVER(server) \ - ((server) != NULL && \ - module_find_id("IRC SERVER", (server)->chat_type) != -1) - -#define IS_IRC_SERVER_CONNECT(conn) \ - ((conn) != NULL && \ - module_find_id("IRC SERVER CONNECT", (conn)->chat_type) != -1) - /* returns IRC_SERVER_REC if it's IRC server, NULL if it isn't */ #define IRC_SERVER(server) \ - (IS_IRC_SERVER(server) ? (IRC_SERVER_REC *) (server) : NULL) + MODULE_CHECK_CAST(server, IRC_SERVER_REC, chat_type, "IRC SERVER") #define IRC_SERVER_CONNECT(conn) \ - (IS_IRC_SERVER_CONNECT(conn) ? \ - (IRC_SERVER_CONNECT_REC *) (conn) : NULL) + MODULE_CHECK_CAST(conn, IRC_SERVER_CONNECT_REC, \ + chat_type, "IRC SERVER CONNECT") + +#define IS_IRC_SERVER(server) \ + (IRC_SERVER(server) ? TRUE : FALSE) + +#define IS_IRC_SERVER_CONNECT(conn) \ + (IRC_SERVER_CONNECT(conn) ? TRUE : FALSE) /* all strings should be either NULL or dynamically allocated */ /* address and nick are mandatory, rest are optional */ |