From 56bc832134b4f6884999797f0f0c1b846602088d Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon, 19 May 2008 17:38:08 +0930
Subject: [PATCH] Rename parameters to clarify QueryExtension call.

These parameters are not treated as input. Rename them to make the inner
workings slightly more obvious.

X.Org Bug 14511 <http://bugs.freedesktop.org/show_bug.cgi?id=14511>
---
 man/XTest.xml | 16 ++++++++--------
 src/XTest.c   | 15 ++++++++-------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/man/XTest.xml b/man/XTest.xml
index a80ab22..bc61337 100644
--- a/man/XTest.xml
+++ b/man/XTest.xml
@@ -80,17 +80,17 @@ cc [ flag ... ] file ... -lXtst  [ library ... ]
 <funcprototype>
 <funcdef><function>Bool</function> XTestQueryExtension</funcdef>
 <paramdef><parameter>display</parameter></paramdef>
-<paramdef><parameter>event_base</parameter></paramdef>
-<paramdef><parameter>error_base</parameter></paramdef>
-<paramdef><parameter>major_version</parameter></paramdef>
-<paramdef><parameter>minor_version</parameter></paramdef>
+<paramdef><parameter>event_base_return</parameter></paramdef>
+<paramdef><parameter>error_base_return</parameter></paramdef>
+<paramdef><parameter>major_version_return</parameter></paramdef>
+<paramdef><parameter>minor_version_return</parameter></paramdef>
 </funcprototype>
 <funcsynopsisinfo>
  Display *display;
- int *event_base;
- int *error_base;
- int *major_version;
- int *minor_version;
+ int *event_base_return;
+ int *error_base_return;
+ int *major_version_return;
+ int *minor_version_return;
 </funcsynopsisinfo>
 <funcprototype>
 <funcdef><function>Bool</function> XTestCompareCursorWithWindow</funcdef>
diff --git a/src/XTest.c b/src/XTest.c
index eccf1fb..82ad52a 100644
--- a/src/XTest.c
+++ b/src/XTest.c
@@ -97,10 +97,11 @@ static XEXT_GENERATE_CLOSE_DISPLAY (close_display, xtest_info)
  *****************************************************************************/
 
 Bool
-XTestQueryExtension (dpy, event_basep, error_basep, majorp, minorp)
+XTestQueryExtension (dpy, event_base_return, error_base_return,
+			major_return, minor_return)
     Display *dpy;
-    int *event_basep, *error_basep;
-    int *majorp, *minorp;
+    int *event_base_return, *error_base_return;
+    int *major_return, *minor_return;
 {
     XExtDisplayInfo *info = find_display (dpy);
     register xXTestGetVersionReq *req;
@@ -120,10 +121,10 @@ XTestQueryExtension (dpy, event_basep, error_basep, majorp, minorp)
 	}
 	UnlockDisplay(dpy);
 	SyncHandle();
-	*event_basep = info->codes->first_event;
-	*error_basep = info->codes->first_error;
-	*majorp = rep.majorVersion;
-	*minorp = rep.minorVersion;
+	*event_base_return = info->codes->first_event;
+	*error_base_return = info->codes->first_error;
+	*major_return = rep.majorVersion;
+	*minor_return = rep.minorVersion;
 	return True;
     } else {
 	return False;
-- 
2.7.4