stop the indenting and line wrapping madness!!!!!!!

git-svn-id: http://svn.enlightenment.org/svn/e/trunk/ecore@52394 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/lib/ecore_con/ecore_con.c b/src/lib/ecore_con/ecore_con.c
index 1926959..189cbf1 100644 (file)
--- a/src/lib/ecore_con/ecore_con.c
+++ b/src/lib/ecore_con/ecore_con.c
@@ -51,15 +51,13 @@ static void      _ecore_con_cb_udp_listen(void *data, Ecore_Con_Info *info);
 static void      _ecore_con_server_free(Ecore_Con_Server *svr);
 static void      _ecore_con_client_free(Ecore_Con_Client *cl);
 
-static Eina_Bool _ecore_con_svr_handler(void *data,
-                                        Ecore_Fd_Handler *fd_handler);
+static Eina_Bool _ecore_con_svr_handler(void *data, Ecore_Fd_Handler *fd_handler);
 static Eina_Bool _ecore_con_cl_handler(void *data, Ecore_Fd_Handler *fd_handler);
-static Eina_Bool _ecore_con_cl_udp_handler(void *data,
-                                           Ecore_Fd_Handler *fd_handler);
-static Eina_Bool _ecore_con_svr_udp_handler(void *data,
-                                            Ecore_Fd_Handler *fd_handler);
-static Eina_Bool _ecore_con_svr_cl_handler(void *data,
-                                           Ecore_Fd_Handler *fd_handler);
+static Eina_Bool _ecore_con_cl_udp_handler(void *data, Ecore_Fd_Handler *fd_handler);
+static Eina_Bool _ecore_con_svr_udp_handler(void *data, Ecore_Fd_Handler *fd_handler);
+
+static void      _ecore_con_svr_cl_read(Ecore_Con_Client *cl);
+static Eina_Bool _ecore_con_svr_cl_handler(void *data, Ecore_Fd_Handler *fd_handler);
 
 static void      _ecore_con_server_flush(Ecore_Con_Server *svr);
 static void      _ecore_con_client_flush(Ecore_Con_Client *cl);
@@ -1543,8 +1541,7 @@ _ecore_con_svr_handler(void *data, Ecore_Fd_Handler *fd_handler __UNUSED__)
    cl->fd = new_fd;
    cl->server = svr;
 
-   if ((svr->type & ECORE_CON_SSL) &&
-       (ecore_con_ssl_client_init(cl)))
+   if ((svr->type & ECORE_CON_SSL) && (ecore_con_ssl_client_init(cl)))
      {
         close(new_fd);
         ecore_con_ssl_client_shutdown(cl);
@@ -1866,103 +1863,100 @@ _ecore_con_svr_udp_handler(void *data, Ecore_Fd_Handler *fd_handler)
    return ECORE_CALLBACK_RENEW;
 }
 
-static Eina_Bool
-_ecore_con_svr_cl_handler(void *data, Ecore_Fd_Handler *fd_handler)
+static void
+_ecore_con_svr_cl_read(Ecore_Con_Client *cl)
 {
-   Ecore_Con_Client *cl;
+   unsigned char *inbuf = NULL;
+   int inbuf_num = 0;
+   int tries;
 
-   cl = data;
-   if (cl->dead)
-      return ECORE_CALLBACK_RENEW;
+   for (tries = 0; tries < 16; tries++)
+     {
+        int num;
+        int lost_client = 1;
+        unsigned char buf[READBUFSIZ];
 
-   if (cl->delete_me)
-      return ECORE_CALLBACK_RENEW;
+        errno = 0;
 
-   if (ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_READ))
-     {
-        unsigned char *inbuf = NULL;
-        int inbuf_num = 0;
-        int tries;
+        if (!(cl->server->type & ECORE_CON_SSL))
+          {
+             if ((num = read(cl->fd, buf, READBUFSIZ)) <= 0)
+                if ((num < 0) && (errno == EAGAIN))
+                   lost_client = 0;
 
-        for (tries = 0; tries < 16; tries++)
+          }
+        else if (!(num = ecore_con_ssl_client_read(cl, buf, READBUFSIZ)))
+           lost_client = 0;
+
+        if (num > 0)
           {
-             int num;
-             int lost_client = 1;
-             unsigned char buf[READBUFSIZ];
+             inbuf = realloc(inbuf, inbuf_num + num);
+             memcpy(inbuf + inbuf_num, buf, num);
+             inbuf_num += num;
+             continue;
+          }
 
-             errno = 0;
+        if (inbuf && (!cl->delete_me))
+          {
+             Ecore_Con_Event_Client_Data *e;
 
-             if (!(cl->server->type & ECORE_CON_SSL))
+             e = malloc(sizeof(Ecore_Con_Event_Client_Data));
+             if (e)
                {
-                  if ((num = read(cl->fd, buf, READBUFSIZ)) <= 0)
-                     if ((num < 0) && (errno == EAGAIN))
-                        lost_client = 0;
-
+                  cl->event_count++;
+                  e->client = cl;
+                  e->data = inbuf;
+                  e->size = inbuf_num;
+                  ecore_event_add(ECORE_CON_EVENT_CLIENT_DATA, e,
+                                  _ecore_con_event_client_data_free, NULL);
                }
-             else if (!(num =
-                           ecore_con_ssl_client_read(cl, buf,
-                                                     READBUFSIZ)))
-                lost_client = 0;
+          }
 
-             if (num < 1)
+        if (lost_client && (!cl->delete_me))
+          {
+             /* we lost our client! */
+             Ecore_Con_Event_Client_Del *e;
+
+             e = calloc(1, sizeof(Ecore_Con_Event_Client_Del));
+             if (e)
                {
-                  if (inbuf && !cl->delete_me)
-                    {
-                       Ecore_Con_Event_Client_Data *e;
+                  cl->event_count++;
+                  e->client = cl;
+                  ecore_event_add(ECORE_CON_EVENT_CLIENT_DEL, e,
+                                  _ecore_con_event_client_del_free, NULL);
+               }
+          }
 
-                       e = calloc(1, sizeof(Ecore_Con_Event_Client_Data));
-                       if (e)
-                         {
-                            cl->event_count++;
-                            e->client = cl;
-                            e->data = inbuf;
-                            e->size = inbuf_num;
-                                 ecore_event_add(ECORE_CON_EVENT_CLIENT_DATA, e,
-                                            _ecore_con_event_client_data_free,
-                                            NULL);
-                         }
-                    }
+        if (lost_client)
+          {
+             cl->dead = 1;
+             if (cl->fd_handler)
+                ecore_main_fd_handler_del(cl->fd_handler);
 
-                  if (lost_client)
-                    {
-                       if (!cl->delete_me)
-                         {
-                            /* we lost our client! */
-                            Ecore_Con_Event_Client_Del *e;
-
-                            e = calloc(1, sizeof(Ecore_Con_Event_Client_Del));
-                            if (e)
-                              {
-                                 cl->event_count++;
-                                 e->client = cl;
-                                 ecore_event_add(
-                                    ECORE_CON_EVENT_CLIENT_DEL,
-                                    e,
-                                    _ecore_con_event_client_del_free,
-                                    NULL);
-                              }
-                         }
+             cl->fd_handler = NULL;
+          }
 
-                       cl->dead = 1;
-                       if (cl->fd_handler)
-                          ecore_main_fd_handler_del(cl->fd_handler);
+        break;
+     }
+}
 
-                       cl->fd_handler = NULL;
-                    }
+static Eina_Bool
+_ecore_con_svr_cl_handler(void *data, Ecore_Fd_Handler *fd_handler)
+{
+   Ecore_Con_Client *cl;
 
-                  break;
-               }
-             else
-               {
-                  inbuf = realloc(inbuf, inbuf_num + num);
-                  memcpy(inbuf + inbuf_num, buf, num);
-                  inbuf_num += num;
-               }
-          }
-     }
-   else if (ecore_main_fd_handler_active_get(fd_handler,
-                                             ECORE_FD_WRITE))
-      _ecore_con_client_flush(cl);
+   cl = data;
+   if (cl->dead)
+      return ECORE_CALLBACK_RENEW;
+
+   if (cl->delete_me)
+      return ECORE_CALLBACK_RENEW;
+
+   if (ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_READ))
+     _ecore_con_svr_cl_read(cl);
+     
+   else if (ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_WRITE))
+     _ecore_con_client_flush(cl);
 
    return ECORE_CALLBACK_RENEW;
 }