From 29c77457ad86966ae2204b865fb8b437269063c4 Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Sat, 1 Nov 2014 20:00:57 +0200 Subject: Refactor XGetExtensionVersion. _XiGetExtensionVersion was called from XGetExtensionVersion and from _XiCheckExtInit. When called from _XiCheckExtInit, nothing accounted for the fact that it can return ((XExtensionVersion *) NoSuchExtension) in case of error. Also it recursively calls _XiCheckExtInit potentionally causing multiple unlocks if _XiCheckExtInit fails. -> Remove it and call directly _XiGetExtensionVersionRequest and only call _XiCheckExtInit only from XGetExtensionVersion. Signed-off-by: Michal Srb Signed-off-by: Peter Hutterer --- src/XIint.h | 1 - 1 file changed, 1 deletion(-) (limited to 'src/XIint.h') diff --git a/src/XIint.h b/src/XIint.h index 99f3652..9479a79 100644 --- a/src/XIint.h +++ b/src/XIint.h @@ -29,7 +29,6 @@ extern XExtDisplayInfo *XInput_find_display(Display *); extern int _XiCheckExtInit(Display *, int, XExtDisplayInfo *); extern int _XiCheckVersion(XExtDisplayInfo *info, int version_index); -extern XExtensionVersion *_XiGetExtensionVersion(Display *, _Xconst char *, XExtDisplayInfo *); extern XExtensionVersion* _XiGetExtensionVersionRequest(Display *dpy, _Xconst char *name, int xi_opcode); extern Status _xiQueryVersion(Display *dpy, int*, int*, XExtDisplayInfo *); -- cgit v1.2.3