diff options
Diffstat (limited to 'src/espik_irc.c')
| -rw-r--r-- | src/espik_irc.c | 38 |
1 files changed, 6 insertions, 32 deletions
diff --git a/src/espik_irc.c b/src/espik_irc.c index dbe962d..21c418f 100644 --- a/src/espik_irc.c +++ b/src/espik_irc.c @@ -10,7 +10,6 @@ #include "espik_error.h" /*#include "espik_common_handler.h"*/ #include "espik_net.h" -#include "espik_debug.h" #include "espik.h" char* current_chan; @@ -22,12 +21,12 @@ typedef struct } cmd_t; cmd_t cmd_tab[] = { - { "JOIN", irc_join }, - { "PART", irc_part }, - { "PRIVMSG", irc_privmsg }, - { "QUIT", irc_quit }, - { "RAW", irc_raw }, - { "NICK", irc_nick }, + { "JOIN", irc_join }, + { "PART", irc_part }, + { "PRIVMSG", irc_privmsg }, + { "QUIT", irc_quit }, + { "RAW", irc_raw }, + { "NICK", irc_nick }, /* { "ACTION", irc_action }, */ { 0, 0 } }; @@ -40,7 +39,6 @@ char** separate_commandline (char *msg) { unsigned int len; char** two_words; - espik_enter(); /* Yes, do nothing, just get len ! */ for (len = 0 ; msg[len] != ' ' && msg[len] != '\t' ; len++); @@ -56,7 +54,6 @@ char** separate_commandline (char *msg) } while (*two_words[1] == ' ' || *two_words[1] == '\t'); - espik_leave(); return (two_words); } @@ -80,27 +77,22 @@ void string_upper (char *str) unsigned short sendmsg_len (char* msg) { - espik_enter(); - espik_leave(); return (strlen (msg) + 2); } buf_t make_buffer(int len) { buf_t buf; - espik_enter(); buf.buf = malloc (len); buf.len = len + 1; /* Alloc trailing \0 */ - espik_leave(); return (buf); } char* irc_privmsg (char* chan, char* msg) { buf_t out; - espik_enter(); out = make_buffer (strlen ("PRIVMSG") + 1 /* "PRIVMSG " */ + strlen (chan) + 2 /* ":<channel> "*/ @@ -109,14 +101,12 @@ char* irc_privmsg (char* chan, char* msg) snprintf (out.buf, out.len, "PRIVMSG %s :%s", chan, msg); free (msg); - espik_leave(); return (out.buf); } char* irc_join (char* chan __UNUSED__, char* msg) { buf_t out; - espik_enter(); /* Could also by '&' and so one ... * have to look on RFC, dev will be done with # only */ @@ -124,7 +114,6 @@ char* irc_join (char* chan __UNUSED__, char* msg) { espik_debug_print ("%s is not a channel", msg); espik_debug_print ("Usage: /JOIN #channel"); - espik_leave(); return (0); } @@ -134,14 +123,12 @@ char* irc_join (char* chan __UNUSED__, char* msg) snprintf (out.buf, out.len, "JOIN %s", msg); free (msg); - espik_leave(); return (out.buf); } char* irc_part (char* chan, char* msg) { buf_t out; - espik_enter(); if (msg[0] != '#') { @@ -165,14 +152,12 @@ char* irc_part (char* chan, char* msg) } free (msg); - espik_leave(); return (out.buf); } char* irc_quit (char* chan __UNUSED__, char* msg) { buf_t out; - espik_enter(); out = make_buffer (strlen ("QUIT") + 2 /* "QUIT :" */ + strlen (msg)); /* "<msg>EOF" */ @@ -189,20 +174,16 @@ char* irc_quit (char* chan __UNUSED__, char* msg) */ free (msg); - espik_leave(); return (out.buf); } char* irc_raw (char* chan __UNUSED__, char* msg) { - espik_enter(); - espik_leave(); return (msg); } char* irc_nick (char* chan __UNUSED__, char* nick) { - espik_enter(); buf_t out; out = make_buffer (strlen ("NICK") + 1 /* "NICK " */ @@ -212,7 +193,6 @@ char* irc_nick (char* chan __UNUSED__, char* nick) espik_debug_print ("NICK CHANGED REQUEST: %s", nick); - espik_leave(); return (out.buf); } @@ -237,7 +217,6 @@ void irc_disconnect (Ecore_Con_Server *sock) char* irc_send (char* msg) { char* out; - espik_enter(); out = NULL; @@ -273,24 +252,19 @@ char* irc_send (char* msg) { espik_debug_print ("%s is not a know command", cmd_and_message[0]); - espik_leave(); return (0); } } else - { out = irc_privmsg (current_chan, msg); - } if (!out) { free (msg); - espik_leave(); return (0); } espik_debug_print ("%s", out); - espik_leave(); return (out); } |