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, 17 insertions, 17 deletions

diff --git a/include/X11/extensions/XRes.h b/include/X11/extensions/XRes.h
index 5b3374e..26c8362 100644
--- a/include/X11/extensions/XRes.h
+++ b/include/X11/extensions/XRes.h
@@ -24,14 +24,14 @@ _XFUNCPROTOBEGIN
 
 Bool XResQueryExtension (
    Display *dpy,
-   int *event_base,
-   int *error_base
+   int *event_base_return,
+   int *error_base_return
 );
 
 Status XResQueryVersion (
    Display *dpy,
-   int *major_versionp,
-   int *minor_versionp
+   int *major_version_return,
+   int *minor_version_return
 );
 
 Status XResQueryClients (
diff --git a/man/XRes.man b/man/XRes.man
index d08290c..20de262 100644
--- a/man/XRes.man
+++ b/man/XRes.man
@@ -48,10 +48,10 @@ typedef struct {
 .fi
 .HP
 Bool XResQueryExtension(Display *\fIdpy\fP, 
-int *\fIevent_basep\fP, int *\fIerror_basep\fP\^);
+int *\fIevent_base_return\fP, int *\fIerror_base_return\fP\^);
 .HP
-Status XResQueryVersion(Display *\fIdpy\fP, int *\fImajor_versionp\fP,
-int *\fIminor_versionp\fP\^);
+Status XResQueryVersion(Display *\fIdpy\fP, int *\fImajor_version_return\fP,
+int *\fIminor_version_return\fP\^);
 .HP
 Status XResQueryClients(Display *\fIdpy\fP, int *\fInum_clients\fP, 
 XResClient **\fIclients\fP\^);
@@ -85,9 +85,9 @@ returns
 .B True
 if the request succeeded; the values of the major and minor protocol
 versions supported by the server are returned in 
-.I major_versionp 
+.I major_version_return
 and 
-.I minor_versionp .
+.I minor_version_return .
 .PP
 .PP
 .B XResQueryClients 
diff --git a/src/XRes.c b/src/XRes.c
index 06cc78d..ed6fe52 100644
--- a/src/XRes.c
+++ b/src/XRes.c
@@ -47,15 +47,15 @@ static XEXT_GENERATE_FIND_DISPLAY (find_display, xres_ext_info,
 
 Bool XResQueryExtension (
     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;
@@ -64,8 +64,8 @@ Bool XResQueryExtension (
 
 Status XResQueryVersion(
     Display *dpy,
-    int *major_versionp, 
-    int *minor_versionp
+    int *major_version_return,
+    int *minor_version_return
 )
 {
     XExtDisplayInfo *info = find_display (dpy);
@@ -85,8 +85,8 @@ Status XResQueryVersion(
         SyncHandle ();
         return 0;
     }
-    *major_versionp = rep.server_major;
-    *minor_versionp = rep.server_minor;
+    *major_version_return = rep.server_major;
+    *minor_version_return = rep.server_minor;
     UnlockDisplay (dpy);
     SyncHandle ();
     return 1;