Enlightenment CVS committal
Author : kwo
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_con
Modified Files:
Ecore_Con.h ecore_con.c ecore_con_dns.c ecore_con_private.h
ecore_con_url.c
Log Message:
Add const, fix warnings.
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_con/Ecore_Con.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- Ecore_Con.h 24 Sep 2006 08:16:01 -0000 1.22
+++ Ecore_Con.h 5 Nov 2006 16:49:55 -0000 1.23
@@ -152,7 +152,7 @@
EAPI void *ecore_con_server_data_get(Ecore_Con_Server *svr);
EAPI int ecore_con_server_connected_get(Ecore_Con_Server
*svr);
EAPI Ecore_List *ecore_con_server_clients_get(Ecore_Con_Server *svr);
- EAPI int ecore_con_server_send(Ecore_Con_Server *svr, void
*data, int size);
+ EAPI int ecore_con_server_send(Ecore_Con_Server *svr, const
void *data, int size);
EAPI void ecore_con_server_client_limit_set(Ecore_Con_Server
*svr, int client_limit, char reject_excess_clients);
EAPI char *ecore_con_server_ip_get(Ecore_Con_Server *svr);
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_con/ecore_con.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -3 -r1.82 -r1.83
--- ecore_con.c 25 Sep 2006 05:21:14 -0000 1.82
+++ ecore_con.c 5 Nov 2006 16:49:55 -0000 1.83
@@ -50,7 +50,9 @@
static Ecore_List *servers = NULL;
static int init_count = 0;
+#if USE_OPENSSL
static int ssl_init_count = 0;
+#endif
#define LENGTH_OF_SOCKADDR_UN(s) (strlen((s)->sun_path) + (size_t)(((struct
sockaddr_un *)NULL)->sun_path))
#define LENGTH_OF_ABSTRACT_SOCKADDR_UN(s, path) (strlen(path) + 1 +
(size_t)(((struct sockaddr_un *)NULL)->sun_path))
@@ -647,7 +649,7 @@
* @ingroup Ecore_Con_Server_Group
*/
EAPI int
-ecore_con_server_send(Ecore_Con_Server *svr, void *data, int size)
+ecore_con_server_send(Ecore_Con_Server *svr, const void *data, int size)
{
if (!ECORE_MAGIC_CHECK(svr, ECORE_MAGIC_CON_SERVER))
{
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_con/ecore_con_dns.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- ecore_con_dns.c 12 Aug 2006 14:38:03 -0000 1.27
+++ ecore_con_dns.c 5 Nov 2006 16:49:55 -0000 1.28
@@ -28,6 +28,7 @@
*/
#include "Ecore.h"
#include "ecore_private.h"
+#include "ecore_con_private.h"
#include <ctype.h>
#include <netinet/in.h>
@@ -72,6 +73,7 @@
struct hostent *he;
};
+#if 0
static void _ecore_con_dns_ghbn(Ecore_Con_Dns_Query *query, const char
*hostname);
static int _ecore_con_dns_timeout(void *data);
static int _ecore_con_cb_fd_handler(void *data, Ecore_Fd_Handler *fd_handler);
@@ -79,9 +81,11 @@
static void _ecore_con_dns_cache_free(Ecore_Con_Dns_Cache *cache);
static int _ecore_con_hostname_get(unsigned char *buf, char *hostname,
int pos, int length);
+#endif
static int dns_init = 0;
+#if 0
static struct in_addr servers[SERVERS];
static int server_count;
@@ -93,6 +97,7 @@
static uint16_t dns_id = 0;
static Ecore_Con_Dns_Cache *dns_cache = NULL;
+#endif
#define SET_16BIT(p, v) \
(((p)[0]) = ((v) >> 8) & 0xff), \
@@ -321,7 +326,7 @@
}
static int
-_ecore_con_dns_exit_handler(void *data, int type, void *event)
+_ecore_con_dns_exit_handler(void *data, int type __UNUSED__, void *event)
{
CB_Data *cbdata;
Ecore_Exe_Event_Del *ev;
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_con/ecore_con_private.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- ecore_con_private.h 24 Sep 2006 08:16:02 -0000 1.17
+++ ecore_con_private.h 5 Nov 2006 16:49:55 -0000 1.18
@@ -1,6 +1,7 @@
#ifndef _ECORE_CON_PRIVATE_H
#define _ECORE_CON_PRIVATE_H
+#include "Ecore_Con.h"
#include "Ecore_Data.h"
#define ECORE_MAGIC_CON_SERVER 0x77665544
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_con/ecore_con_url.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- ecore_con_url.c 24 Sep 2006 08:16:02 -0000 1.10
+++ ecore_con_url.c 5 Nov 2006 16:49:55 -0000 1.11
@@ -163,6 +163,7 @@
return url_con;
#else
+ url = NULL;
return NULL;
#endif
}
@@ -184,6 +185,8 @@
curl_slist_free_all(url_con->headers);
free(url_con->url);
free(url_con);
+#else
+ url_con = NULL;
#endif
}
@@ -198,7 +201,9 @@
if (url)
url_con->url = strdup(url);
curl_easy_setopt(url_con->curl_easy, CURLOPT_URL, url_con->url);
-
+#else
+ url_con = NULL;
+ url = NULL;
#endif
return 1;
}
@@ -237,6 +242,10 @@
return _ecore_con_url_perform(url_con);
#else
+ url_con = NULL;
+ data = NULL;
+ length = 0;
+ content_type = NULL;
return 0;
#endif
}
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
