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

code cleanup 

SVN revision: 17311
This commit is contained in:
tsauerbeck 2005-10-08 10:10:09 +00:00 committed by tsauerbeck
parent 63169a9701
commit cc9c9b8997
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
legacy/evas/src/lib/engines/software_x11/evas_outbuf.c
View File

@ -796,7 +796,7 @@ evas_software_x11_outbuf_perf_restore_x(Display * disp, Window draw, Visual * vi
/* read performance results from root window */ /* read performance results from root window */
Atom type, format; Atom type, format;
Outbuf_Perf *perf; Outbuf_Perf *perf;
char *retval; unsigned char *retval = NULL;
Atom type_ret; Atom type_ret;
unsigned long bytes_after, num_ret; unsigned long bytes_after, num_ret;
int format_ret; int format_ret;
@ -804,26 +804,21 @@ evas_software_x11_outbuf_perf_restore_x(Display * disp, Window draw, Visual * vi
perf = evas_software_x11_outbuf_perf_new_x(disp, draw, vis, cmap, x_depth); perf = evas_software_x11_outbuf_perf_new_x(disp, draw, vis, cmap, x_depth);
type = XInternAtom(disp, "__EVAS_PERF_ENGINE_SOFTWARE", False); type = XInternAtom(disp, "__EVAS_PERF_ENGINE_SOFTWARE", False);
format = XA_STRING; format = XA_STRING;
retval = NULL;
XGetWindowProperty(disp, perf->x.root, type, 0, 16384, False, format, XGetWindowProperty(disp, perf->x.root, type, 0, 16384, False, format,
&type_ret, &format_ret, &num_ret, &bytes_after, &type_ret, &format_ret, &num_ret, &bytes_after, &retval);
(unsigned char **)&retval); if (format_ret == 8 && type_ret == type)
if (retval)
{ {
char *s; char *s;
if (format_ret != 8)
goto out;
if (type_ret != type)
goto out;
s = malloc(num_ret + 1); s = malloc(num_ret + 1);
strncpy(s, retval, num_ret); strncpy(s, retval, num_ret);
s[num_ret] = 0; s[num_ret] = 0;
evas_software_x11_outbuf_perf_deserialize_x(perf, s); evas_software_x11_outbuf_perf_deserialize_x(perf, s);
free(s); free(s);
out:
XFree(retval);
} }
if (retval) XFree(retval);
return perf; return perf;
} }