From 29193b6c4c13d885681c42a87632cf65fbf5b70d Mon Sep 17 00:00:00 2001 From: Laurent Ghigonis Date: Wed, 5 Jun 2013 18:14:30 +0200 Subject: convert to tabs, and fix some indent manualy no functionnal change --- libglouglou/tests/connect.c | 52 ++++++++++++++-------------- libglouglou/tests/sendrecv.c | 81 ++++++++++++++++++++++---------------------- 2 files changed, 68 insertions(+), 65 deletions(-) (limited to 'libglouglou/tests') diff --git a/libglouglou/tests/connect.c b/libglouglou/tests/connect.c index 3e46667..2a203c8 100644 --- a/libglouglou/tests/connect.c +++ b/libglouglou/tests/connect.c @@ -8,39 +8,41 @@ int cli_connect_ok = 0; int srv_handle_conn(struct gg_server *srv, struct gg_user *usr) { - if (usr->id == 0) - srv_connect_ok = 1; - return 0; + if (usr->id == 0) + srv_connect_ok = 1; + return 0; } int cli_handle_conn(struct gg_client *cli) { - cli_connect_ok = 1; - return 0; + cli_connect_ok = 1; + return 0; } int main(void) { - struct event_base *ev_base; - - ev_base = event_base_new(); - if (!gg_server_start(ev_base, "127.0.0.1", 12345, srv_handle_conn, NULL, NULL)) { - printf("error: gg_server_start returned NULL\n"); - return 1; - } - if (!gg_client_connect(ev_base, "127.0.0.1", 12345, cli_handle_conn, NULL, NULL)) { - printf("error: gg_client_connect returned NULL\n"); - return 1; - } - event_base_loop(ev_base, EVLOOP_NONBLOCK); - event_base_loop(ev_base, EVLOOP_NONBLOCK); - - if (srv_connect_ok == 0) - printf("error: srv_connect_ok == 0\n"); - if (cli_connect_ok == 0) - printf("error: cli_connect_ok == 0\n"); - - return (!srv_connect_ok || !cli_connect_ok); + struct event_base *ev_base; + + ev_base = event_base_new(); + if (!gg_server_start(ev_base, "127.0.0.1", 12345, + srv_handle_conn,NULL, NULL)) { + printf("error: gg_server_start returned NULL\n"); + return 1; + } + if (!gg_client_connect(ev_base, "127.0.0.1", 12345, + cli_handle_conn, NULL, NULL)) { + printf("error: gg_client_connect returned NULL\n"); + return 1; + } + event_base_loop(ev_base, EVLOOP_NONBLOCK); + event_base_loop(ev_base, EVLOOP_NONBLOCK); + + if (srv_connect_ok == 0) + printf("error: srv_connect_ok == 0\n"); + if (cli_connect_ok == 0) + printf("error: cli_connect_ok == 0\n"); + + return (!srv_connect_ok || !cli_connect_ok); } diff --git a/libglouglou/tests/sendrecv.c b/libglouglou/tests/sendrecv.c index cbfb402..2df9e01 100644 --- a/libglouglou/tests/sendrecv.c +++ b/libglouglou/tests/sendrecv.c @@ -6,62 +6,63 @@ int srv_recv_ok = 0; int cli_recv_ok = 0; int -srv_handle_packet(struct gg_server *srv, struct gg_user *usr, struct gg_packet *pkt) +srv_handle_packet(struct gg_server *srv, + struct gg_user *usr, struct gg_packet *pkt) { - if (pkt->type == PACKET_NEWCONN) - srv_recv_ok = 1; - return 0; + if (pkt->type == PACKET_NEWCONN) + srv_recv_ok = 1; + return 0; } int cli_handle_packet(struct gg_client *cli, struct gg_packet *pkt) { - if (pkt->type == PACKET_NEWCONN) - cli_recv_ok = 1; - return 0; + if (pkt->type == PACKET_NEWCONN) + cli_recv_ok = 1; + return 0; } int main(void) { - struct event_base *ev_base; - struct gg_server *srv; - struct gg_client *cli; - struct gg_packet pkt; + struct event_base *ev_base; + struct gg_server *srv; + struct gg_client *cli; + struct gg_packet pkt; - ev_base = event_base_new(); - srv = gg_server_start(ev_base, "127.0.0.1", GLOUGLOU_PROBE_DEFAULT_PORT, - NULL, srv_handle_packet, NULL); - if (!srv) { - printf("error: gg_server_start returned NULL\n"); - return 1; - } - cli = gg_client_connect(ev_base, "127.0.0.1", GLOUGLOU_PROBE_DEFAULT_PORT, - NULL, cli_handle_packet, NULL); - if (!cli) { - printf("error: gg_client_connect returned NULL\n"); - return 1; - } - event_base_loop(ev_base, EVLOOP_NONBLOCK); - event_base_loop(ev_base, EVLOOP_NONBLOCK); + ev_base = event_base_new(); + srv = gg_server_start(ev_base, "127.0.0.1", GLOUGLOU_PROBE_DEFAULT_PORT, + NULL, srv_handle_packet, NULL); + if (!srv) { + printf("error: gg_server_start returned NULL\n"); + return 1; + } + cli = gg_client_connect(ev_base, "127.0.0.1", GLOUGLOU_PROBE_DEFAULT_PORT, + NULL, cli_handle_packet, NULL); + if (!cli) { + printf("error: gg_client_connect returned NULL\n"); + return 1; + } + event_base_loop(ev_base, EVLOOP_NONBLOCK); + event_base_loop(ev_base, EVLOOP_NONBLOCK); - pkt.ver = PACKET_VERSION; - pkt.type = PACKET_NEWCONN; + pkt.ver = PACKET_VERSION; + pkt.type = PACKET_NEWCONN; - gg_server_send(srv, &pkt, NULL); - gg_server_send_flush(srv, NULL); - gg_client_send(cli, &pkt); - gg_client_send_flush(cli); + gg_server_send(srv, &pkt, NULL); + gg_server_send_flush(srv, NULL); + gg_client_send(cli, &pkt); + gg_client_send_flush(cli); - event_base_loop(ev_base, EVLOOP_NONBLOCK); + event_base_loop(ev_base, EVLOOP_NONBLOCK); - gg_client_disconnect(cli); - gg_server_stop(srv); + gg_client_disconnect(cli); + gg_server_stop(srv); - if (srv_recv_ok == 0) - printf("error: srv_recv_ok == 0\n"); - if (cli_recv_ok == 0) - printf("error: cli_recv_ok == 0\n"); + if (srv_recv_ok == 0) + printf("error: srv_recv_ok == 0\n"); + if (cli_recv_ok == 0) + printf("error: cli_recv_ok == 0\n"); - return (!srv_recv_ok || !cli_recv_ok); + return (!srv_recv_ok || !cli_recv_ok); } -- cgit v1.2.3-59-g8ed1b