jsuya
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

in 2011, we began using formatting tools to fix problematic formatting. 

in later 2011, we began using formatting tools to fix problematic formatting caused by previous runs of formatting tools used to fix problematic formatting


SVN revision: 65852
This commit is contained in:
Mike Blumenkrantz 2011-12-03 20:05:48 +00:00
parent 6b13c32a78
commit 8b6899154c
30 changed files with 1265 additions and 1252 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
legacy/ecore/src/lib/ecore_x/xlib/ecore_x.c
View File

@ -300,7 +300,7 @@ ecore_x_init(const char *name)
eina_init();
_ecore_xlib_log_dom = eina_log_domain_register
("ecore_x", ECORE_XLIB_DEFAULT_LOG_COLOR);
if(_ecore_xlib_log_dom < 0)
if (_ecore_xlib_log_dom < 0)
{
EINA_LOG_ERR(
"Impossible to create a log domain for the Ecore Xlib module.");

6
legacy/ecore/src/lib/ecore_x/xlib/ecore_x_atoms.c
View File

@ -291,9 +291,11 @@ _ecore_x_atoms_init(void)
num = sizeof(items) / sizeof(Atom_Item);
atoms = alloca(num * sizeof(Atom));
names = alloca(num * sizeof(char *));
for (i = 0; i < num; i++) names[i] = (char *)items[i].name;
for (i = 0; i < num; i++)
names[i] = (char *)items[i].name;
XInternAtoms(_ecore_x_disp, names, num, False, atoms);
for (i = 0; i < num; i++) *(items[i].atom) = atoms[i];
for (i = 0; i < num; i++)
*(items[i].atom) = atoms[i];
}
/**

8
legacy/ecore/src/lib/ecore_x/xlib/ecore_x_composite.c
View File

@ -47,7 +47,7 @@ ecore_x_composite_redirect_window(Ecore_X_Window win,
int update = CompositeRedirectAutomatic;
LOGFN(__FILE__, __LINE__, __FUNCTION__);
switch(type)
switch (type)
{
case ECORE_X_COMPOSITE_UPDATE_AUTOMATIC:
update = CompositeRedirectAutomatic;
@ -69,7 +69,7 @@ ecore_x_composite_redirect_subwindows(Ecore_X_Window win,
int update = CompositeRedirectAutomatic;
LOGFN(__FILE__, __LINE__, __FUNCTION__);
switch(type)
switch (type)
{
case ECORE_X_COMPOSITE_UPDATE_AUTOMATIC:
update = CompositeRedirectAutomatic;
@ -91,7 +91,7 @@ ecore_x_composite_unredirect_window(Ecore_X_Window win,
int update = CompositeRedirectAutomatic;
LOGFN(__FILE__, __LINE__, __FUNCTION__);
switch(type)
switch (type)
{
case ECORE_X_COMPOSITE_UPDATE_AUTOMATIC:
update = CompositeRedirectAutomatic;
@ -113,7 +113,7 @@ ecore_x_composite_unredirect_subwindows(Ecore_X_Window win,
int update = CompositeRedirectAutomatic;
LOGFN(__FILE__, __LINE__, __FUNCTION__);
switch(type)
switch (type)
{
case ECORE_X_COMPOSITE_UPDATE_AUTOMATIC:
update = CompositeRedirectAutomatic;

5
legacy/ecore/src/lib/ecore_x/xlib/ecore_x_events.c
View File

@ -2436,7 +2436,7 @@ _ecore_x_event_handle_gesture_notify_tapnhold(XEvent *xevent)
}
void
_ecore_x_event_handle_gesture_notify_hold(XEvent *xevent)
_ecore_x_event_handle_gesture_notify_hold(XEvent *xevent)
{
XGestureNotifyHoldEvent *xhe;
Ecore_X_Event_Gesture_Notify_Hold *e;
@ -2461,7 +2461,7 @@ void
}
void
_ecore_x_event_handle_gesture_notify_group(XEvent *xevent)
_ecore_x_event_handle_gesture_notify_group(XEvent *xevent)
{
XGestureNotifyGroupEvent *xge;
Ecore_X_Event_Gesture_Notify_Group *e;
@ -2482,5 +2482,6 @@ void
ecore_event_add(ECORE_X_EVENT_GESTURE_NOTIFY_GROUP, e, NULL, NULL);
}
#endif /* ifdef ECORE_XGESTURE */

3
legacy/ecore/src/lib/ecore_x/xlib/ecore_x_fixes.c
View File

@ -253,7 +253,8 @@ ecore_x_region_invert(Ecore_X_Region dest,
int num = 0;
LOGFN(__FILE__, __LINE__, __FUNCTION__);
while (bounds + num) num++;
while (bounds + num)
num++;
xbound = _ecore_x_rectangle_ecore_to_x(bounds, num);
XFixesInvertRegion(_ecore_x_disp, dest, xbound, source);

5
legacy/ecore/src/lib/ecore_x/xlib/ecore_x_netwm.c
View File

@ -927,7 +927,7 @@ _ecore_x_netwm_state_get(Ecore_X_Atom a)
static Ecore_X_Atom
_ecore_x_netwm_state_atom_get(Ecore_X_Window_State s)
{
switch(s)
switch (s)
{
case ECORE_X_WINDOW_STATE_MODAL:
return ECORE_X_ATOM_NET_WM_STATE_MODAL;
@ -1780,7 +1780,8 @@ _ecore_x_netwm_startup_info_parse(Ecore_X_Startup_Info *info,
char value[1024];
/* Skip space */
while (*data == ' ') data++;
while (*data == ' ')
data++;
/* Get key */
key = data;
data = strchr(key, '=');

3
legacy/ecore/src/lib/ecore_x/xlib/ecore_x_randr_11.c
View File

@ -18,7 +18,8 @@
root) ((screen = \
XRRRootToScreen(_ecore_x_disp, \
root)) != -1)
#define RANDR_CHECK_1_1_RET(ret) if(_randr_version < RANDR_1_1) return ret
#define RANDR_CHECK_1_1_RET(ret) if (_randr_version < RANDR_1_1) \
return ret
extern XRRScreenResources *(*_ecore_x_randr_get_screen_resources)(Display *
dpy,

15
legacy/ecore/src/lib/ecore_x/xlib/ecore_x_randr_12.c
View File

@ -19,7 +19,8 @@
#define RANDR_VALIDATE_ROOT(screen, root) \
((screen = XRRRootToScreen(_ecore_x_disp, root)) != -1)
#define RANDR_CHECK_1_2_RET(ret) if(_randr_version < RANDR_1_2) return ret
#define RANDR_CHECK_1_2_RET(ret) if (_randr_version < RANDR_1_2) \
return ret
#define RANDR_PROPERTY_EDID "EDID"
#define RANDR_PROPERTY_BACKLIGHT "Backlight"
@ -281,14 +282,14 @@ ecore_x_randr_screen_current_size_set(Ecore_X_Window root,
if (h <= 0)
h = DisplayHeight(_ecore_x_disp, scr);
if(w_mm <= 0)
if (w_mm <= 0)
w_mm =
(int)(((double)(DisplayWidthMM(_ecore_x_disp,
scr) /
(double)DisplayWidth(_ecore_x_disp,
scr))) * (double)w);
if(h_mm <= 0)
if (h_mm <= 0)
h_mm =
(int)(((double)(DisplayHeightMM(_ecore_x_disp,
scr) /
@ -353,7 +354,7 @@ ecore_x_randr_modes_info_get(Ecore_X_Window root,
}
else
{
while(i > 0)
while (i > 0)
free(ret[--i]);
free(ret);
ret = NULL;
@ -581,7 +582,7 @@ ecore_x_randr_crtc_possible_outputs_get(Ecore_X_Window root,
crtc) &&
(res = _ecore_x_randr_get_screen_resources (_ecore_x_disp, root)))
{
if((crtc_info = XRRGetCrtcInfo(_ecore_x_disp, res, crtc)))
if ((crtc_info = XRRGetCrtcInfo(_ecore_x_disp, res, crtc)))
{
if ((ret =
malloc(sizeof(Ecore_X_Randr_Output) * crtc_info->npossible)))
@ -1613,7 +1614,7 @@ ecore_x_randr_output_edid_get(Ecore_X_Window root,
if (!length || !_ecore_x_randr_output_validate(root, output))
return NULL;
if(XRRGetOutputProperty (_ecore_x_disp, output, name,
if (XRRGetOutputProperty (_ecore_x_disp, output, name,
0, 100, False, False,
AnyPropertyType,
&actual_type, &actual_format,
@ -1623,7 +1624,7 @@ ecore_x_randr_output_edid_get(Ecore_X_Window root,
{
if ((ret = malloc(nitems * sizeof(unsigned char))))
{
if(length &&
if (length &&
(memcpy(ret, prop_data, (nitems * sizeof(unsigned char)))))
*length = nitems;

6
legacy/ecore/src/lib/ecore_x/xlib/ecore_x_randr_12_edid.c
View File

@ -344,13 +344,15 @@ ecore_x_randr_edid_info_has_valid_checksum(unsigned char *edid,
if (edid_length < 128) return EINA_FALSE;
/* Check the EDID block itself */
for (i = 0; i < 128; i++) sum += edid[i];
for (i = 0; i < 128; i++)
sum += edid[i];
if (sum) return EINA_FALSE;
/* Check the cea extension blocks */
_ECORE_X_RANDR_EDID_FOR_EACH_CEA_BLOCK(edid, edid_length, cea_block_iter)
{
for (i = 0, sum = 0; i < 128; i++) sum += cea_block_iter[i];
for (i = 0, sum = 0; i < 128; i++)
sum += cea_block_iter[i];
}
if (sum) return EINA_FALSE;
return EINA_TRUE;

3
legacy/ecore/src/lib/ecore_x/xlib/ecore_x_randr_13.c
View File

@ -15,7 +15,8 @@
#ifdef ECORE_XRANDR
#define RANDR_1_3 ((1 << 16) | 3)
#define RANDR_CHECK_1_3_RET(ret) if(_randr_version < RANDR_1_3) return ret
#define RANDR_CHECK_1_3_RET(ret) if (_randr_version < RANDR_1_3) \
return ret
extern XRRScreenResources *(*_ecore_x_randr_get_screen_resources)(Display *
dpy,

5
legacy/ecore/src/lib/ecore_x/xlib/ecore_x_selection.c
View File

@ -572,7 +572,7 @@ ecore_x_selection_convert(Ecore_X_Atom selection,
return EINA_FALSE;
/* Default, just return the data
*data_ret = malloc(sel->length);
* data_ret = malloc(sel->length);
memcpy(*data_ret, sel->data, sel->length);
free(tgt_str);
return 1;
@ -850,7 +850,8 @@ _ecore_x_selection_parser_files(const char *target,
tmp[i++] = data[is++];
else
{
while ((data[is] == '\r') || (data[is] == '\n')) is++;
while ((data[is] == '\r') || (data[is] == '\n'))
is++;
tmp[i] = 0;
sel->num_files++;
t2 = realloc(sel->files, sel->num_files * sizeof(char *));

6
legacy/ecore/src/lib/ecore_x/xlib/ecore_x_window_prop.c
View File

@ -479,7 +479,8 @@ ecore_x_window_prop_property_set(Ecore_X_Window win,
dat = malloc(sizeof(unsigned long) * number);
if (dat)
{
for (ptr = (int *)data, i = 0; i < number; i++) dat[i] = ptr[i];
for (ptr = (int *)data, i = 0; i < number; i++)
dat[i] = ptr[i];
XChangeProperty(_ecore_x_disp, win, property, type, size,
PropModeReplace, (unsigned char *)dat, number);
free(dat);
@ -589,7 +590,8 @@ ecore_x_window_prop_list(Ecore_X_Window win,
atoms = malloc(num * sizeof(Ecore_X_Atom));
if (atoms)
{
for (i = 0; i < num; i++) atoms[i] = atom_ret[i];
for (i = 0; i < num; i++)
atoms[i] = atom_ret[i];
if (num_ret)
*num_ret = num;
}