summaryrefslogtreecommitdiff
path: root/legacy
diff options
context:
space:
mode:
authorCarsten Haitzler <raster@rasterman.com>2010-12-18 01:47:29 +0000
committerCarsten Haitzler <raster@rasterman.com>2010-12-18 01:47:29 +0000
commit2f564887ec8c35f152138481f82b4e3778fbd9fd (patch)
treeb508239df50f31cf050cd574d6a4d9d69e704d9a /legacy
parent9a4f67c7260f4caea9015fd8501e123173965680 (diff)
formatting
SVN revision: 55624
Diffstat (limited to 'legacy')
-rw-r--r--legacy/ecore/src/lib/ecore_con/ecore_con.c52
1 files changed, 26 insertions, 26 deletions
diff --git a/legacy/ecore/src/lib/ecore_con/ecore_con.c b/legacy/ecore/src/lib/ecore_con/ecore_con.c
index 2a4c37ca06..3fba5ea512 100644
--- a/legacy/ecore/src/lib/ecore_con/ecore_con.c
+++ b/legacy/ecore/src/lib/ecore_con/ecore_con.c
@@ -1789,21 +1789,21 @@ _ecore_con_cl_read(Ecore_Con_Server *svr)
1789 1789
1790 /* only possible with non-ssl connections */ 1790 /* only possible with non-ssl connections */
1791 if (svr->connecting && (svr_try_connect_plain(svr) != ECORE_CON_CONNECTED)) 1791 if (svr->connecting && (svr_try_connect_plain(svr) != ECORE_CON_CONNECTED))
1792 return; 1792 return;
1793 1793
1794 if (svr->handshaking) 1794 if (svr->handshaking)
1795 { 1795 {
1796 DBG("Continuing ssl handshake"); 1796 DBG("Continuing ssl handshake");
1797 if (!ecore_con_ssl_server_init(svr)) 1797 if (!ecore_con_ssl_server_init(svr))
1798 lost_server = EINA_FALSE; 1798 lost_server = EINA_FALSE;
1799 } 1799 }
1800 1800
1801 if (!(svr->type & ECORE_CON_SSL)) 1801 if (!(svr->type & ECORE_CON_SSL))
1802 { 1802 {
1803 num = read(svr->fd, buf, sizeof(buf)); 1803 num = read(svr->fd, buf, sizeof(buf));
1804 /* 0 is not a valid return value for a tcp socket */ 1804 /* 0 is not a valid return value for a tcp socket */
1805 if ((num > 0) || ((num < 0) && (errno == EAGAIN))) 1805 if ((num > 0) || ((num < 0) && (errno == EAGAIN)))
1806 lost_server = EINA_FALSE; 1806 lost_server = EINA_FALSE;
1807 } 1807 }
1808 else 1808 else
1809 { 1809 {
@@ -1812,31 +1812,31 @@ _ecore_con_cl_read(Ecore_Con_Server *svr)
1812 if (num >= 0) 1812 if (num >= 0)
1813 lost_server = EINA_FALSE; 1813 lost_server = EINA_FALSE;
1814 } 1814 }
1815 1815
1816 if ((!svr->delete_me) && (num > 0)) 1816 if ((!svr->delete_me) && (num > 0))
1817 { 1817 {
1818 Ecore_Con_Event_Server_Data *e; 1818 Ecore_Con_Event_Server_Data *e;
1819 1819
1820 e = malloc(sizeof(Ecore_Con_Event_Server_Data)); 1820 e = malloc(sizeof(Ecore_Con_Event_Server_Data));
1821 EINA_SAFETY_ON_NULL_RETURN(e); 1821 EINA_SAFETY_ON_NULL_RETURN(e);
1822 1822
1823 svr->event_count++; 1823 svr->event_count++;
1824 e->server = svr; 1824 e->server = svr;
1825 e->data = malloc(num); 1825 e->data = malloc(num);
1826 if (!e->data) 1826 if (!e->data)
1827 { 1827 {
1828 ERR("alloc!"); 1828 ERR("alloc!");
1829 free(e); 1829 free(e);
1830 return; 1830 return;
1831 } 1831 }
1832 memcpy(e->data, buf, num); 1832 memcpy(e->data, buf, num);
1833 e->size = num; 1833 e->size = num;
1834 ecore_event_add(ECORE_CON_EVENT_SERVER_DATA, e, 1834 ecore_event_add(ECORE_CON_EVENT_SERVER_DATA, e,
1835 _ecore_con_event_server_data_free, NULL); 1835 _ecore_con_event_server_data_free, NULL);
1836 } 1836 }
1837 1837
1838 if (lost_server) 1838 if (lost_server)
1839 _ecore_con_server_kill(svr); 1839 _ecore_con_server_kill(svr);
1840} 1840}
1841 1841
1842static Eina_Bool 1842static Eina_Bool