formatting.

SVN revision: 31825

legacy/ecore/src/lib/ecore_con/Ecore_Con.h

@@ -189,7 +189,7 @@ extern "C" {
    EAPI int               ecore_con_url_shutdown(void);
    EAPI Ecore_Con_Url    *ecore_con_url_new(const char *url);
    EAPI void              ecore_con_url_destroy(Ecore_Con_Url *url_con);
-   EAPI void              ecore_con_url_data_set(Ecore_Con_Url *url_con, const void *data);
+   EAPI void              ecore_con_url_data_set(Ecore_Con_Url *url_con, void *data);
    EAPI void             *ecore_con_url_data_get(Ecore_Con_Url *url_con);
    EAPI int               ecore_con_url_url_set(Ecore_Con_Url *url_con, const char *url);
    EAPI int               ecore_con_url_send(Ecore_Con_Url *url_con, void *data, size_t length, char *content_type);

legacy/ecore/src/lib/ecore_con/ecore_con_private.h

@@ -74,7 +74,7 @@ struct _Ecore_Con_Url
 
    Ecore_Con_Url_Time condition;
    time_t             time;
-   const void        *data;
+   void              *data;
 
    Ecore_Fd_Handler  *fd_handler;
 

legacy/ecore/src/lib/ecore_con/ecore_con_url.c

@@ -58,17 +58,17 @@ static Ecore_List *_url_con_list = NULL;
 static fd_set _current_fd_set;
 static int init_count = 0;
 
-struct _little_ecore_con_url_event_s
+struct _Ecore_Con_Url_Event
 {
   int    type;
   void  *ev;
 };
-typedef struct _little_ecore_con_url_event_s     _little_ecore_con_url_event_t;
+typedef struct _Ecore_Con_Url_Event Ecore_Con_Url_Event;
 
 static int
 _url_complete_idler_cb(void *data)
 {
-   _little_ecore_con_url_event_t *lev;
+   Ecore_Con_Url_Event *lev;
 
    lev = data;
 
@@ -81,9 +81,9 @@ _url_complete_idler_cb(void *data)
 static void
 _url_complete_push_event(int type, void *ev)
 {
-   _little_ecore_con_url_event_t *lev;
+   Ecore_Con_Url_Event *lev;
 
-   lev = malloc(sizeof (_little_ecore_con_url_event_t));
+   lev = malloc(sizeof(Ecore_Con_Url_Event));
    lev->type = type;
    lev->ev = ev;
 
@@ -208,8 +208,8 @@ ecore_con_url_new(const char *url)
 
    return url_con;
 #else
-   url = NULL;
    return NULL;
+   url = NULL;
 #endif
 }
 
@@ -237,6 +237,7 @@ ecore_con_url_destroy(Ecore_Con_Url *url_con)
    free(url_con->url);
    free(url_con);
 #else
+   return;
    url_con = NULL;
 #endif
 }
@@ -258,15 +259,16 @@ ecore_con_url_url_set(Ecore_Con_Url *url_con, const char *url)
    if (url)
      url_con->url = strdup(url);
    curl_easy_setopt(url_con->curl_easy, CURLOPT_URL, url_con->url);
+   return 1;
 #else
+   return 0;
    url_con = NULL;
    url = NULL;
 #endif
-   return 1;
 }
 
 EAPI void
-ecore_con_url_data_set(Ecore_Con_Url *url_con, const void *data)
+ecore_con_url_data_set(Ecore_Con_Url *url_con, void *data)
 {
 #ifdef HAVE_CURL
    if (!ECORE_MAGIC_CHECK(url_con, ECORE_MAGIC_CON_URL))
@@ -277,10 +279,9 @@ ecore_con_url_data_set(Ecore_Con_Url *url_con, const void *data)
 
    url_con->data = data;
 #else
-   (void*) url_con;
-   (const void*) data;
-
    return;
+   url_con = NULL;
+   data = NULL;
 #endif
 }
 
@@ -294,11 +295,10 @@ ecore_con_url_data_get(Ecore_Con_Url *url_con)
 	return NULL;
      }
 
-   return (void*) url_con->data;
+   return url_con->data;
 #else
-   (void*) url_con;
-
    return NULL;
+   url_con = NULL;
 #endif
 }
 
@@ -315,9 +315,10 @@ ecore_con_url_time(Ecore_Con_Url *url_con, Ecore_Con_Url_Time condition, time_t
    url_con->condition = condition;
    url_con->time = tm;
 #else
-   (void*) url_con;
+   return;
-   condition;
+   url_con = NULL;
-   tm;
+   condition = 0;
+   tm = 0;
 #endif
 }
 
@@ -376,11 +377,11 @@ ecore_con_url_send(Ecore_Con_Url *url_con, void *data, size_t length, char *cont
 
    return _ecore_con_url_perform(url_con);
 #else
+   return 0;
    url_con = NULL;
    data = NULL;
    length = 0;
    content_type = NULL;
-   return 0;
 #endif
 }
 
@@ -408,9 +409,11 @@ _ecore_con_url_data_cb(void *buffer, size_t size, size_t nmemb, void *userp)
 #define ECORE_CON_URL_TRANSMISSION(Transmit, Event, Url_con, Total, Now) \
 { \
    Ecore_Con_Event_Url_Progress *e; \
-                if (Total != 0 || Now != 0) { \
+   if ((Total != 0) || (Now != 0)) \
+     { \
 	e = calloc(1, sizeof(Ecore_Con_Event_Url_Progress)); \
-                        if (e) { \
+	if (e) \
+	  { \
 	     e->url_con = url_con; \
 	     e->total = Total; \
 	     e->now = Now; \