From c5ac895a7dabe5a46e33e733771f20cc08e72d95 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon, 19 May 2008 17:43:19 +0930
Subject: Rename parameters to clarify QueryVersion/QueryExtension.

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/Xinerama.man | 26 +++++++++++++-------------
 src/Xinerama.c   | 22 +++++++++++-----------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/man/Xinerama.man b/man/Xinerama.man
index bec9f80..74bc53d 100644
--- a/man/Xinerama.man
+++ b/man/Xinerama.man
@@ -41,11 +41,11 @@ Xinerama \- API for Xinerama extension to X11 Protocol
 .nf    
 .sp
 Bool XineramaQueryExtension \^(\^Display *\fIdpy\fP, 
-	int *\fIevent_basep\fP, int *\fIerror_basep\fP\^);
+	int *\fIevent_base_return\fP, int *\fIerror_base_return\fP\^);
 .sp
 Status XineramaQueryVersion \^(\^Display *\fIdpy\fP,
-	int *\fImajor_versionp\fP,
-	int *\fIminor_versionp\fP\^);
+	int *\fImajor_version_return\fP,
+	int *\fIminor_version_return\fP\^);
 .sp
 Bool XineramaIsActive \^(\^Display *\fIdpy\fP\^);
 .sp
@@ -55,13 +55,13 @@ XineramaScreenInfo * XineramaQueryScreens \^(\^Display *\fIdpy\fP,
 .SH ARGUMENTS
 .IP \fIdisplay\fP 1i
 Specifies the connection to the X server.
-.IP \fIevent_basep\fP 1i
+.IP \fIevent_base_return\fP 1i
 Specifies the return location for the assigned base event code
-.IP \fIerror_basep\fP 1i
+.IP \fIerror_base_return\fP 1i
 Specifies the return location for the assigned base error code
-.IP \fImajor_versionp\fP 1i
+.IP \fImajor_version_return\fP 1i
 Returns the major version supported by the server
-.IP \fIminor_versionp\fP 1i
+.IP \fIminor_version_return\fP 1i
 Returns the minor version supported by the server
 .IP \fInumber\fP 1i
 Returns the number of entries in the returned XineramaScreenInfo array.
@@ -78,18 +78,18 @@ into a single logical X screen.
 .LP
 The XineramaQueryExtension function queries the Xserver to determine the 
 availability of the Xinerama Extension. If the extension is available, the 
-return value is True, and event_base and error_base are set to the base event 
-number and base error number for the extension, respectively. Otherwise, the 
-return value is False, and the values of event_base and error_base are 
-undefined.
+return value is True, and event_base_return and error_base_return are set to
+the base event number and base error number for the extension, respectively.
+Otherwise, the return value is False, and the values of event_base_return and
+error_base_return are undefined.
 .sp
 
 .SS \fBXineramaQueryVersion()\fR
 
 .LP
 The XineramaQueryVersion function returns the version of the Xinerama extension
-implemented by the Xserver. The version is returned in major_versionp and 
-minor_versionp. The major version will be incremented for protocol 
+implemented by the Xserver. The version is returned in major_version_return
+and minor_version_return. The major version will be incremented for protocol
 incompatible changes, and the minor version will be incremented for small, 
 upwardly compatible changes.
 .LP
diff --git a/src/Xinerama.c b/src/Xinerama.c
index eff7633..e58ede8 100644
--- a/src/Xinerama.c
+++ b/src/Xinerama.c
@@ -78,15 +78,15 @@ static XEXT_GENERATE_CLOSE_DISPLAY (close_display, panoramiX_ext_info)
 
 Bool XPanoramiXQueryExtension (
     Display *dpy,
-    int *event_basep,
-    int *error_basep
+    int *event_base_return,
+    int *error_base_return
 )
 {
     XExtDisplayInfo *info = find_display (dpy);
 
     if (XextHasExtension(info)) {
-	*event_basep = info->codes->first_event;
-	*error_basep = info->codes->first_error;
+	*event_base_return = info->codes->first_event;
+	*error_base_return = info->codes->first_error;
 	return True;
     } else {
 	return False;
@@ -96,8 +96,8 @@ Bool XPanoramiXQueryExtension (
 
 Status XPanoramiXQueryVersion(
     Display *dpy,
-    int	    *major_versionp, 
-    int *minor_versionp
+    int     *major_version_return,
+    int     *minor_version_return
 )
 {
     XExtDisplayInfo *info = find_display (dpy);
@@ -117,8 +117,8 @@ Status XPanoramiXQueryVersion(
 	SyncHandle ();
 	return 0;
     }
-    *major_versionp = rep.majorVersion;
-    *minor_versionp = rep.minorVersion;
+    *major_version_return = rep.majorVersion;
+    *minor_version_return = rep.minorVersion;
     UnlockDisplay (dpy);
     SyncHandle ();
     return 1;
@@ -228,11 +228,11 @@ Status XPanoramiXGetScreenSize (
 
 Bool XineramaQueryExtension (
    Display *dpy,
-   int     *event_base,
-   int     *error_base
+   int     *event_base_return,
+   int     *error_base_return
 )
 {
-   return XPanoramiXQueryExtension(dpy, event_base, error_base);
+   return XPanoramiXQueryExtension(dpy, event_base_return, error_base_return);
 }
 
 Status XineramaQueryVersion(
-- 
cgit v1.2.1