Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_con
Modified Files:
ecore_con.c ecore_con_url.c
Log Message:
fix up some warnings
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_con/ecore_con.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -3 -r1.54 -r1.55
--- ecore_con.c 27 Nov 2005 07:18:36 -0000 1.54
+++ ecore_con.c 6 Jan 2006 17:58:12 -0000 1.55
@@ -2,17 +2,6 @@
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
-#include "Ecore.h"
-#include "ecore_private.h"
-#include "ecore_con_private.h"
-#include "Ecore_Con.h"
-
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#elif WIN32
-#include <winsock.h>
-#endif
-
#include <sys/stat.h>
#include <arpa/inet.h>
#include <sys/socket.h>
@@ -24,6 +13,17 @@
#include <time.h>
#endif
+#include "Ecore.h"
+#include "ecore_private.h"
+#include "ecore_con_private.h"
+#include "Ecore_Con.h"
+
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#elif WIN32
+#include <winsock.h>
+#endif
+
static void _ecore_con_cb_dns_lookup(void *data, struct hostent *he);
static void _ecore_con_server_free(Ecore_Con_Server *svr);
static void _ecore_con_client_free(Ecore_Con_Client *cl);
@@ -35,12 +35,12 @@
static void _ecore_con_event_client_data_free(void *data, void *ev);
static void _ecore_con_event_server_data_free(void *data, void *ev);
-int ECORE_CON_EVENT_CLIENT_ADD = 0;
-int ECORE_CON_EVENT_CLIENT_DEL = 0;
-int ECORE_CON_EVENT_SERVER_ADD = 0;
-int ECORE_CON_EVENT_SERVER_DEL = 0;
-int ECORE_CON_EVENT_CLIENT_DATA = 0;
-int ECORE_CON_EVENT_SERVER_DATA = 0;
+EAPI int ECORE_CON_EVENT_CLIENT_ADD = 0;
+EAPI int ECORE_CON_EVENT_CLIENT_DEL = 0;
+EAPI int ECORE_CON_EVENT_SERVER_ADD = 0;
+EAPI int ECORE_CON_EVENT_SERVER_DEL = 0;
+EAPI int ECORE_CON_EVENT_CLIENT_DATA = 0;
+EAPI int ECORE_CON_EVENT_SERVER_DATA = 0;
static Ecore_List *servers = NULL;
static int init_count = 0;
@@ -61,7 +61,7 @@
* shut down.
* @ingroup Ecore_Con_Lib_Group
*/
-int
+EAPI int
ecore_con_init(void)
{
if (++init_count != 1) return init_count;
@@ -87,7 +87,7 @@
* shut down.
* @ingroup Ecore_Con_Lib_Group
*/
-int
+EAPI int
ecore_con_shutdown(void)
{
if (--init_count != 0) return init_count;
@@ -134,7 +134,7 @@
* @return A new Ecore_Con_Server.
* @ingroup Ecore_Con_Server_Group
*/
-Ecore_Con_Server *
+EAPI Ecore_Con_Server *
ecore_con_server_add(Ecore_Con_Type compl_type,
const char *name,
int port,
@@ -363,7 +363,7 @@
* @return A new Ecore_Con_Server.
* @ingroup Ecore_Con_Server_Group
*/
-Ecore_Con_Server *
+EAPI Ecore_Con_Server *
ecore_con_server_connect(Ecore_Con_Type compl_type,
const char *name,
int port,
@@ -472,7 +472,7 @@
* @return Data associated with the server when it was created.
* @ingroup Ecore_Con_Server_Group
*/
-void *
+EAPI void *
ecore_con_server_del(Ecore_Con_Server *svr)
{
void *data;
@@ -495,7 +495,7 @@
* @return The associated data.
* @ingroup Ecore_Con_Server_Group
*/
-void *
+EAPI void *
ecore_con_server_data_get(Ecore_Con_Server *svr)
{
if (!ECORE_MAGIC_CHECK(svr, ECORE_MAGIC_CON_SERVER))
@@ -514,7 +514,7 @@
* @return @c 1 if the server is connected. @c 0 otherwise.
* @ingroup Ecore_Con_Server_Group
*/
-int
+EAPI int
ecore_con_server_connected_get(Ecore_Con_Server *svr)
{
if (!ECORE_MAGIC_CHECK(svr, ECORE_MAGIC_CON_SERVER))
@@ -536,7 +536,7 @@
* error.
* @ingroup Ecore_Con_Server_Group
*/
-int
+EAPI int
ecore_con_server_send(Ecore_Con_Server *svr, void *data, int size)
{
if (!ECORE_MAGIC_CHECK(svr, ECORE_MAGIC_CON_SERVER))
@@ -592,7 +592,7 @@
* lower).
* @ingroup Ecore_Con_Server_Group
*/
-void
+EAPI void
ecore_con_server_client_limit_set(Ecore_Con_Server *svr, int client_limit,
char reject_excess_clients)
{
if (!ECORE_MAGIC_CHECK(svr, ECORE_MAGIC_CON_SERVER))
@@ -620,7 +620,7 @@
* error.
* @ingroup Ecore_Con_Client_Group
*/
-int
+EAPI int
ecore_con_client_send(Ecore_Con_Client *cl, void *data, int size)
{
if (!ECORE_MAGIC_CHECK(cl, ECORE_MAGIC_CON_CLIENT))
@@ -661,7 +661,7 @@
* @return The server that the client connected to.
* @ingroup Ecore_Con_Client_Group
*/
-Ecore_Con_Server *
+EAPI Ecore_Con_Server *
ecore_con_client_server_get(Ecore_Con_Client *cl)
{
if (!ECORE_MAGIC_CHECK(cl, ECORE_MAGIC_CON_CLIENT))
@@ -679,7 +679,7 @@
* @return Data associated with the client.
* @ingroup Ecore_Con_Client_Group
*/
-void *
+EAPI void *
ecore_con_client_del(Ecore_Con_Client *cl)
{
void *data;
@@ -703,7 +703,7 @@
* @param data What to set the data to.
* @ingroup Ecore_Con_Client_Group
*/
-void
+EAPI void
ecore_con_client_data_set(Ecore_Con_Client *cl, const void *data)
{
if (!ECORE_MAGIC_CHECK(cl, ECORE_MAGIC_CON_CLIENT))
@@ -721,7 +721,7 @@
* @return The data associated with @p cl.
* @ingroup Ecore_Con_Client_Group
*/
-void *
+EAPI void *
ecore_con_client_data_get(Ecore_Con_Client *cl)
{
if (!ECORE_MAGIC_CHECK(cl, ECORE_MAGIC_CON_CLIENT))
@@ -738,7 +738,7 @@
* @return 1 if SSL is available, 0 if it is not.
* @ingroup Ecore_Con_Client_Group
*/
-int
+EAPI int
ecore_con_ssl_available_get(void)
{
#if USE_OPENSSL
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_con/ecore_con_url.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- ecore_con_url.c 6 Sep 2005 23:14:31 -0000 1.7
+++ ecore_con_url.c 6 Jan 2006 17:58:12 -0000 1.8
@@ -57,7 +57,7 @@
static int init_count = 0;
#endif
-int
+EAPI int
ecore_con_url_init(void)
{
#ifdef HAVE_CURL
@@ -98,7 +98,7 @@
#endif
}
-int
+EAPI int
ecore_con_url_shutdown(void)
{
#ifdef HAVE_CURL
@@ -132,7 +132,7 @@
return 1;
}
-Ecore_Con_Url *
+EAPI Ecore_Con_Url *
ecore_con_url_new(const char *url)
{
#ifdef HAVE_CURL
@@ -167,7 +167,7 @@
#endif
}
-void
+EAPI void
ecore_con_url_destroy(Ecore_Con_Url *url_con)
{
#ifdef HAVE_CURL
@@ -187,7 +187,7 @@
#endif
}
-int
+EAPI int
ecore_con_url_url_set(Ecore_Con_Url *url_con, const char *url)
{
#ifdef HAVE_CURL
@@ -203,7 +203,7 @@
return 1;
}
-int
+EAPI int
ecore_con_url_send(Ecore_Con_Url *url_con, void *data, size_t length, char
*content_type)
{
#ifdef HAVE_CURL
@@ -242,7 +242,7 @@
}
#ifdef HAVE_CURL
-size_t
+static size_t
_ecore_con_url_data_cb(void *buffer, size_t size, size_t nmemb, void *userp)
{
Ecore_Con_Url *url_con;
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
