diff options
| author | marha <marha@users.sourceforge.net> | 2014-03-21 22:50:26 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-03-21 22:56:24 +0100 |
| commit | eb71c0f23999d1cc156e1821d73634ec79621fc2 (patch) | |
| tree | d45d551ada10b1bfb3d57517c892770734a77817 /libXext | |
| parent | ab3d257d88f67e169a314ad0fac851fc2fc6cb05 (diff) | |
| parent | 41fea4472dec859ddec76bdfa7108ebec71de1e3 (diff) | |
| download | vcxsrv-eb71c0f23999d1cc156e1821d73634ec79621fc2.tar.gz vcxsrv-eb71c0f23999d1cc156e1821d73634ec79621fc2.tar.bz2 vcxsrv-eb71c0f23999d1cc156e1821d73634ec79621fc2.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
xserver fontconfig libX11 libXext libxcb mesa git update 21 Mar 2014
Conflicts:
libxcb/src/xcb_auth.c
libxcb/src/xcb_conn.c
libxcb/src/xcb_util.c
libxcb/src/xcb_windefs.h
mesalib/src/mapi/glapi/glapi.h
Diffstat (limited to 'libXext')
| -rw-r--r-- | libXext/src/XEVI.c | 6 | ||||
| -rw-r--r-- | libXext/src/Xge.c | 7 |
2 files changed, 4 insertions, 9 deletions
diff --git a/libXext/src/XEVI.c b/libXext/src/XEVI.c index 6d77fdf10..c9b172c41 100644 --- a/libXext/src/XEVI.c +++ b/libXext/src/XEVI.c @@ -183,8 +183,10 @@ Status XeviGetVisualInfo( _XEatDataWords(dpy, rep.length); UnlockDisplay(dpy); SyncHandle(); - if (evi_return) - Xfree(evi_return); + if (*evi_return) { + Xfree(*evi_return); + *evi_return = NULL; + } if (temp_xInfo) Xfree(temp_xInfo); if (temp_conflict) diff --git a/libXext/src/Xge.c b/libXext/src/Xge.c index 5c4d72dd7..2811ae889 100644 --- a/libXext/src/Xge.c +++ b/libXext/src/Xge.c @@ -265,9 +265,6 @@ _xgeWireToEvent(Display* dpy, XEvent* re, xEvent *event) it = it->next; } - fprintf(stderr, - "_xgeWireToEvent: Unknown extension %d, this should never happen.\n", - extension); return False; } @@ -295,10 +292,6 @@ _xgeEventToWire(Display* dpy, XEvent* re, xEvent* event) it = it->next; } - fprintf(stderr, - "_xgeEventToWire: Unknown extension %d, this should never happen.\n", - extension); - return Success; } |