diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/espik.c | 50 | ||||
| -rw-r--r-- | src/espik_common_handler.c | 4 | ||||
| -rw-r--r-- | src/espik_debug.c | 5 | ||||
| -rw-r--r-- | src/espik_irc.c | 8 | ||||
| -rw-r--r-- | src/espik_net.c | 12 |
5 files changed, 50 insertions, 29 deletions
diff --git a/src/espik.c b/src/espik.c index e93beea..307e569 100644 --- a/src/espik.c +++ b/src/espik.c @@ -20,7 +20,9 @@ typedef int (*Handler_Func) (void *data, int ev_type, void *ev); -/*typedef int (*Handler_Fd_Func) (void *data, Ecore_Fd_Handler * fd_handler);*/ +/* +typedef int (*Handler_Fd_Func) (void *data, Ecore_Fd_Handler * fd_handler); +*/ /* Use to replace EOL ('\n') with NULL ('\0') */ @@ -45,7 +47,9 @@ int del_backslash (char *msg) int main (int argc, char **argv) { Ecore_Fd_Handler *fd_kb; +#ifdef _ESPIK_DEBUG_ __indent_level = 0; +#endif espik_enter(); printf ("Welcome to %s %s\n", APPS_NAME, ESPIK_VERSION); @@ -75,25 +79,25 @@ int main (int argc, char **argv) printf ("nick: %s\n", a_infos.client->nickname); printf ("user: %s\n", a_infos.client->username); printf ("real: %s\n", a_infos.client->realname); - + +#if 0 if (!ecore_init ()) { printf ("Cannot init ecore; %d\n", 1); exit (-1); } - /* - * con_sock = - * ecore_con_server_connect (ECORE_CON_REMOTE_SYSTEM, - * a_infos.server->host, - * (int)a_infos.server->port, - * NULL); - * if (!con_sock) - * { - * fprintf (stderr, "Baaa\n"); - * exit (-1); - * } - */ + con_sock = + ecore_con_server_connect (ECORE_CON_REMOTE_SYSTEM, + a_infos.server->host, + (int)a_infos.server->port, + NULL); + if (!con_sock) + { + fprintf (stderr, "Baaa\n"); + exit (-1); + } +#endif /* Handler Network & Keyboard */ fd_kb = ecore_main_fd_handler_add (STDIN_FILENO, ECORE_FD_READ, kb_get, @@ -103,8 +107,10 @@ int main (int argc, char **argv) printf ("Cannot ecore_main_fd_handler_add\n"); exit (-1); } - /* ecore_event_handler_add (ECORE_CON_EVENT_SERVER_DATA, - * (Handler_Func) server_data, NULL); */ + /* + ecore_event_handler_add (ECORE_CON_EVENT_SERVER_DATA, + (Handler_Func) server_data, NULL); + */ espik_con_init (a_infos); @@ -112,7 +118,9 @@ int main (int argc, char **argv) ecore_main_loop_begin (); - /* ecore_con_server_del (con_sock); */ + /* + ecore_con_server_del (con_sock); + */ free (a_infos.server->host); free (a_infos.server); @@ -124,12 +132,16 @@ int main (int argc, char **argv) */ free (a_infos.client); - /* ecore_main_loop_quit (); */ + /* + ecore_main_loop_quit (); + */ espik_debug_print ("end"); ecore_config_shutdown (); - /* ecore_con_shutdown (); */ + /* + ecore_con_shutdown (); + */ ecore_shutdown (); espik_leave(); diff --git a/src/espik_common_handler.c b/src/espik_common_handler.c index accd2b8..cf00adf 100644 --- a/src/espik_common_handler.c +++ b/src/espik_common_handler.c @@ -82,7 +82,9 @@ int kb_get (void* data __UNUSED__, Ecore_Fd_Handler* fd_handler) espik_debug_print ("AFTER espik_raw_send"); espik_raw_send (tmp); -/* irc_disconnect(); */ + /* + irc_disconnect(); + */ espik_con_shutdown (); ecore_main_loop_quit (); diff --git a/src/espik_debug.c b/src/espik_debug.c index 57298ef..424408e 100644 --- a/src/espik_debug.c +++ b/src/espik_debug.c @@ -22,7 +22,10 @@ inline void espik_debug_bt (int num) char** strings; size_t i; -/* if (!debug_bt) return; */ + /* + if (!debug_bt) + return; + */ fprintf(stderr, "\n***** Backtrace (Signal %d) *****\n", num); size = backtrace(array, 128); diff --git a/src/espik_irc.c b/src/espik_irc.c index 2555297..7a0141a 100644 --- a/src/espik_irc.c +++ b/src/espik_irc.c @@ -246,9 +246,13 @@ char* irc_send (char* msg) cmd_and_message = separate_commandline (msg + 1); -/* espik_debug_print ("irc_send: <separate_commandline"); */ + /* + espik_debug_print ("irc_send: <separate_commandline"); + */ - /*string_upper (cmd_and_message[0]);*/ + /* + string_upper (cmd_and_message[0]); + */ for (cmd = cmd_tab; cmd->cmd_name != 0; cmd++) { diff --git a/src/espik_net.c b/src/espik_net.c index 38bd304..d8cec3f 100644 --- a/src/espik_net.c +++ b/src/espik_net.c @@ -28,7 +28,9 @@ void espik_con_init (t_info serv_info) nb_launch = ecore_con_init (); -/* espik_debug_printf ("nb_launch = %d", nb_launch); */ + /* + espik_debug_printf ("nb_launch = %d", nb_launch); + */ con_sock = ecore_con_server_connect (ECORE_CON_REMOTE_SYSTEM, serv_info.server->host, @@ -98,7 +100,6 @@ void espik_con_up() void espik_con_shutdown () { espik_enter(); -/* espik_debug_print ("> espik_con_shutdown"); */ if (!connected) espik_debug_print ("Unable to connect to server"); @@ -107,7 +108,6 @@ void espik_con_shutdown () ecore_con_server_del (con_sock)); ecore_con_shutdown (); -/* espik_debug_print ("< espik_con_shutdown"); */ ecore_main_loop_quit (); espik_leave(); } @@ -123,9 +123,9 @@ void espik_raw_send (char *msg) espik_debug_print ("msg: %s\nout: %s", msg, buf.buf); /* - printf ("out[len-3]: 0x%X\n", out[len - 3]); - printf ("out[len-2]: 0x%X\n", out[len - 2]); - printf ("out[len-1]: 0x%X\n", out[len - 1]); + printf ("out[len-3]: 0x%X\n", out[len - 3]); + printf ("out[len-2]: 0x%X\n", out[len - 2]); + printf ("out[len-1]: 0x%X\n", out[len - 1]); */ ret = ecore_con_server_send (con_sock, buf.buf, buf.len); |