forked from enlightenment/efl
some clang warning cleanups i forgot to commit
SVN revision: 83024
This commit is contained in:
parent
0f528092f8
commit
df701d8ca2
|
@ -13,8 +13,8 @@
|
||||||
|
|
||||||
static unsigned int _rid_count = 0;
|
static unsigned int _rid_count = 0;
|
||||||
|
|
||||||
static struct sockaddr_un socket_local;
|
|
||||||
#ifndef UNIX_PATH_MAX
|
#ifndef UNIX_PATH_MAX
|
||||||
|
static struct sockaddr_un socket_local;
|
||||||
#define UNIX_PATH_MAX sizeof(socket_local.sun_path)
|
#define UNIX_PATH_MAX sizeof(socket_local.sun_path)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -18,8 +18,8 @@ static int socketfd = -1;
|
||||||
static unsigned int _rid_count = 1;
|
static unsigned int _rid_count = 1;
|
||||||
static int _evas_cserve2_usage_log_dom = -1;
|
static int _evas_cserve2_usage_log_dom = -1;
|
||||||
|
|
||||||
static struct sockaddr_un socksize;
|
|
||||||
#ifndef UNIX_PATH_MAX
|
#ifndef UNIX_PATH_MAX
|
||||||
|
static struct sockaddr_un socksize;
|
||||||
#define UNIX_PATH_MAX sizeof(socksize.sun_path)
|
#define UNIX_PATH_MAX sizeof(socksize.sun_path)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -1834,8 +1834,8 @@ _ecore_x_event_handle_client_message(XEvent *xevent)
|
||||||
|
|
||||||
ecore_event_add(ECORE_X_EVENT_DESKTOP_CHANGE, e, NULL, NULL);
|
ecore_event_add(ECORE_X_EVENT_DESKTOP_CHANGE, e, NULL, NULL);
|
||||||
}
|
}
|
||||||
else if ((xevent->xclient.message_type ==
|
else if (xevent->xclient.message_type ==
|
||||||
ECORE_X_ATOM_NET_REQUEST_FRAME_EXTENTS))
|
ECORE_X_ATOM_NET_REQUEST_FRAME_EXTENTS)
|
||||||
{
|
{
|
||||||
Ecore_X_Event_Frame_Extents_Request *e;
|
Ecore_X_Event_Frame_Extents_Request *e;
|
||||||
|
|
||||||
|
|
|
@ -4011,7 +4011,7 @@ _size_min_restricted_calc(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
|
||||||
{
|
{
|
||||||
if (!ep->chosen_description->fixed.w)
|
if (!ep->chosen_description->fixed.w)
|
||||||
{
|
{
|
||||||
if ((ep->part->type == EDJE_PART_TYPE_TEXTBLOCK))
|
if (ep->part->type == EDJE_PART_TYPE_TEXTBLOCK)
|
||||||
{
|
{
|
||||||
Evas_Coord tb_mw;
|
Evas_Coord tb_mw;
|
||||||
evas_object_textblock_size_formatted_get(ep->object,
|
evas_object_textblock_size_formatted_get(ep->object,
|
||||||
|
|
|
@ -96,8 +96,11 @@ _eio_inotify_events(Eio_Monitor_Backend *backend, const char *file, int mask)
|
||||||
tmp_length = eina_stringshare_strlen(backend->parent->path) + length + 2;
|
tmp_length = eina_stringshare_strlen(backend->parent->path) + length + 2;
|
||||||
tmp = alloca(sizeof (char) * tmp_length);
|
tmp = alloca(sizeof (char) * tmp_length);
|
||||||
|
|
||||||
snprintf(tmp, tmp_length, length ? "%s/%s" : "%s",
|
if (length > 0)
|
||||||
backend->parent->path, file);
|
snprintf(tmp, tmp_length, "%s/%s", backend->parent->path, file);
|
||||||
|
else
|
||||||
|
snprintf(tmp, tmp_length, "%s", backend->parent->path);
|
||||||
|
|
||||||
|
|
||||||
is_dir = !!(mask & IN_ISDIR);
|
is_dir = !!(mask & IN_ISDIR);
|
||||||
|
|
||||||
|
|
|
@ -4787,7 +4787,7 @@ _ephysics_body_cylinder_face_obj_resize_cb(void *data, Evas *e EINA_UNUSED, Evas
|
||||||
bd = body->size.d;
|
bd = body->size.d;
|
||||||
break;
|
break;
|
||||||
case EPHYSICS_BODY_CYLINDER_FACE_CURVED:
|
case EPHYSICS_BODY_CYLINDER_FACE_CURVED:
|
||||||
if ((h == body->size.d))
|
if (h == body->size.d)
|
||||||
return;
|
return;
|
||||||
bw = body->size.w;
|
bw = body->size.w;
|
||||||
bh = body->size.h;
|
bh = body->size.h;
|
||||||
|
|
|
@ -1182,7 +1182,7 @@ evas_object_size_hint_aspect_get(const Evas_Object *eo_obj, Evas_Aspect_Control
|
||||||
static void
|
static void
|
||||||
_size_hint_aspect_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
|
_size_hint_aspect_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
|
||||||
{
|
{
|
||||||
const const Evas_Object_Protected_Data *obj = _pd;
|
const Evas_Object_Protected_Data *obj = _pd;
|
||||||
|
|
||||||
Evas_Aspect_Control *aspect = va_arg(*list, Evas_Aspect_Control*);
|
Evas_Aspect_Control *aspect = va_arg(*list, Evas_Aspect_Control*);
|
||||||
Evas_Coord *w = va_arg(*list, Evas_Coord *);
|
Evas_Coord *w = va_arg(*list, Evas_Coord *);
|
||||||
|
|
|
@ -42,8 +42,8 @@ static unsigned int _data_id = 0;
|
||||||
|
|
||||||
static Eina_List *_requests = NULL;
|
static Eina_List *_requests = NULL;
|
||||||
|
|
||||||
static struct sockaddr_un socksize;
|
|
||||||
#ifndef UNIX_PATH_MAX
|
#ifndef UNIX_PATH_MAX
|
||||||
|
static struct sockaddr_un socksize;
|
||||||
#define UNIX_PATH_MAX sizeof(socksize.sun_path)
|
#define UNIX_PATH_MAX sizeof(socksize.sun_path)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -967,7 +967,7 @@ _ecore_evas_x_event_client_message(void *data EINA_UNUSED, int type EINA_UNUSED,
|
||||||
edata->netwm_sync_val_hi = (int)e->data.l[3];
|
edata->netwm_sync_val_hi = (int)e->data.l[3];
|
||||||
edata->netwm_sync_set = 1;
|
edata->netwm_sync_set = 1;
|
||||||
}
|
}
|
||||||
else if ((e->message_type == ECORE_X_ATOM_E_WINDOW_PROFILE_CHANGE_REQUEST))
|
else if (e->message_type == ECORE_X_ATOM_E_WINDOW_PROFILE_CHANGE_REQUEST)
|
||||||
{
|
{
|
||||||
ee = ecore_event_window_match(e->win);
|
ee = ecore_event_window_match(e->win);
|
||||||
if (!ee) return ECORE_CALLBACK_PASS_ON; /* pass on event */
|
if (!ee) return ECORE_CALLBACK_PASS_ON; /* pass on event */
|
||||||
|
@ -2054,7 +2054,7 @@ _shaped_do(Ecore_Evas *ee, int shaped)
|
||||||
Ecore_Evas_Engine_Data_X11 *edata = ee->engine.data;
|
Ecore_Evas_Engine_Data_X11 *edata = ee->engine.data;
|
||||||
Evas_Engine_Info_Software_X11 *einfo;
|
Evas_Engine_Info_Software_X11 *einfo;
|
||||||
|
|
||||||
if ((ee->shaped == shaped)) return;
|
if (ee->shaped == shaped) return;
|
||||||
einfo = (Evas_Engine_Info_Software_X11 *)evas_engine_info_get(ee->evas);
|
einfo = (Evas_Engine_Info_Software_X11 *)evas_engine_info_get(ee->evas);
|
||||||
ee->shaped = shaped;
|
ee->shaped = shaped;
|
||||||
if (einfo)
|
if (einfo)
|
||||||
|
@ -2122,7 +2122,7 @@ _alpha_do(Ecore_Evas *ee, int alpha)
|
||||||
Evas_Engine_Info_Software_X11 *einfo;
|
Evas_Engine_Info_Software_X11 *einfo;
|
||||||
Ecore_Evas_Engine_Data_X11 *edata = ee->engine.data;
|
Ecore_Evas_Engine_Data_X11 *edata = ee->engine.data;
|
||||||
|
|
||||||
if ((ee->alpha == alpha)) return;
|
if (ee->alpha == alpha) return;
|
||||||
|
|
||||||
einfo = (Evas_Engine_Info_Software_X11 *)evas_engine_info_get(ee->evas);
|
einfo = (Evas_Engine_Info_Software_X11 *)evas_engine_info_get(ee->evas);
|
||||||
if (!einfo) return;
|
if (!einfo) return;
|
||||||
|
@ -2227,7 +2227,7 @@ _ecore_evas_x_alpha_set(Ecore_Evas *ee, int alpha)
|
||||||
else if (!strcmp(ee->driver, "opengl_x11"))
|
else if (!strcmp(ee->driver, "opengl_x11"))
|
||||||
{
|
{
|
||||||
#ifdef BUILD_ECORE_EVAS_OPENGL_X11
|
#ifdef BUILD_ECORE_EVAS_OPENGL_X11
|
||||||
if ((ee->alpha == alpha)) return;
|
if (ee->alpha == alpha) return;
|
||||||
|
|
||||||
Evas_Engine_Info_GL_X11 *einfo;
|
Evas_Engine_Info_GL_X11 *einfo;
|
||||||
|
|
||||||
|
@ -2353,7 +2353,7 @@ static void
|
||||||
_transparent_do(Ecore_Evas *ee, int transparent)
|
_transparent_do(Ecore_Evas *ee, int transparent)
|
||||||
{
|
{
|
||||||
#ifdef BUILD_ECORE_EVAS_SOFTWARE_X11
|
#ifdef BUILD_ECORE_EVAS_SOFTWARE_X11
|
||||||
if ((ee->transparent == transparent)) return;
|
if (ee->transparent == transparent) return;
|
||||||
|
|
||||||
Evas_Engine_Info_Software_X11 *einfo;
|
Evas_Engine_Info_Software_X11 *einfo;
|
||||||
|
|
||||||
|
|
|
@ -445,7 +445,7 @@ _evas_gl_common_viewport_set(Evas_Engine_GL_Context *gc)
|
||||||
if (vy < 0)
|
if (vy < 0)
|
||||||
{
|
{
|
||||||
vh = h - (2 * vy);
|
vh = h - (2 * vy);
|
||||||
if ((rot == 0 )) ay = 0;
|
if (rot == 0) ay = 0;
|
||||||
else if ((rot == 90 ) || (rot == 180) || (rot == 270)) ay = ppy - py;
|
else if ((rot == 90 ) || (rot == 180) || (rot == 270)) ay = ppy - py;
|
||||||
vy = -vy;
|
vy = -vy;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue