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>

3 files changed, 22 insertions, 18 deletions

diff --git a/include/X11/extensions/Xcomposite.h b/include/X11/extensions/Xcomposite.h
index 7c1e2ad..b97e390 100644
--- a/include/X11/extensions/Xcomposite.h
+++ b/include/X11/extensions/Xcomposite.h
@@ -58,11 +58,13 @@
 
 _XFUNCPROTOBEGIN
 
-Bool XCompositeQueryExtension (Display *dpy, int *event_basep, int *error_basep);
+Bool XCompositeQueryExtension (Display *dpy,
+                               int *event_base_return,
+                               int *error_base_return);
 
 Status XCompositeQueryVersion (Display *dpy,
-			       int     *major_versionp,
-			       int     *minor_versionp);
+                               int     *major_version_return,
+                               int     *minor_version_return);
 
 int XCompositeVersion (void);
 
diff --git a/man/Xcomposite.xml b/man/Xcomposite.xml
index 939bc0f..d753776 100644
--- a/man/Xcomposite.xml
+++ b/man/Xcomposite.xml
@@ -66,14 +66,14 @@
   <funcprototype>
    <funcdef>Bool <function>XCompositeQueryExtension</function></funcdef>
    <paramdef><type>Display *</type><parameter>dpy</parameter></paramdef>
-   <paramdef>int *<parameter>event_basep</parameter></paramdef>
-   <paramdef>int *<parameter>error_basep</parameter></paramdef>
+   <paramdef>int *<parameter>event_base_return</parameter></paramdef>
+   <paramdef>int *<parameter>error_base_return</parameter></paramdef>
   </funcprototype>
   <funcprototype>
    <funcdef>Status <function>XCompositeQueryVersion</function></funcdef>
    <paramdef>Display *<parameter>dpy</parameter></paramdef>
-   <paramdef>int *<parameter>major_versionp</parameter></paramdef>
-   <paramdef>int *<parameter>minor_versionp</parameter></paramdef>
+   <paramdef>int *<parameter>major_version_return</parameter></paramdef>
+   <paramdef>int *<parameter>minor_version_return</parameter></paramdef>
   </funcprototype>
   <funcprototype>
    <funcdef>int <function>XCompositeVersion</function></funcdef>
@@ -203,28 +203,28 @@ contents of all descendants.
    </para></listitem>
   </varlistentry>
   <varlistentry>
-   <term><parameter>event_basep</parameter></term>
+   <term><parameter>event_base_return</parameter></term>
    <listitem><para>
     Pointer to integer where the base value for Composite Extension events
     will be stored.
    </para></listitem>
   </varlistentry>
   <varlistentry>
-   <term><parameter>error_basep</parameter></term>
+   <term><parameter>error_base_return</parameter></term>
    <listitem><para>
     Pointer to integer where the base value for Composite Extension errors
     will be stored.
    </para></listitem>
   </varlistentry>
   <varlistentry>
-   <term><parameter>major_versionp</parameter></term>
+   <term><parameter>major_version_return</parameter></term>
    <listitem><para>
     Pointer to integer where the major version of the Composite Extension
     supported by the X server will be stored.
    </para></listitem>
   </varlistentry>
   <varlistentry>
-   <term><parameter>minor_versionp</parameter></term>
+   <term><parameter>minor_version_return</parameter></term>
    <listitem><para>
     Pointer to integer where the minor version of the Composite Extension
     supported by the X server will be stored.
diff --git a/src/Xcomposite.c b/src/Xcomposite.c
index e7d576a..33b5727 100644
--- a/src/Xcomposite.c
+++ b/src/Xcomposite.c
@@ -211,14 +211,16 @@ XCompositeFindDisplay (Display *dpy)
     
 
 Bool 
-XCompositeQueryExtension (Display *dpy, int *event_basep, int *error_basep)
+XCompositeQueryExtension (Display *dpy,
+			  int *event_base_return,
+			  int *error_base_return)
 {
     XCompositeExtDisplayInfo *info = XCompositeFindDisplay (dpy);
 
     if (XCompositeHasExtension(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
@@ -227,14 +229,14 @@ XCompositeQueryExtension (Display *dpy, int *event_basep, int *error_basep)
 
 Status 
 XCompositeQueryVersion (Display *dpy,
-		    int	    *major_versionp,
-		    int	    *minor_versionp)
+		    int	    *major_version_return,
+		    int	    *minor_version_return)
 {
     XCompositeExtDisplayInfo	*info = XCompositeFindDisplay (dpy);
 
     XCompositeCheckExtension (dpy, info, 0);
-    *major_versionp = info->major_version;
-    *minor_versionp = info->minor_version;
+    *major_version_return = info->major_version;
+    *minor_version_return = info->minor_version;
     return 1;
 }