diff options
| author | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-05-19 17:31:04 +0930 |
|---|---|---|
| committer | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-05-19 17:31:04 +0930 |
| commit | 839ef4a38dceec053c3fb33878e59eb26bd8d580 (patch) | |
| tree | 1d2dbb274565ca3f9b7072a54d5a7e9246cf90d4 | |
| parent | d7778d80356f9a7f0bc4ffd0f0cf0bfa86928249 (diff) | |
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>
| -rw-r--r-- | include/X11/extensions/Xfixes.h | 8 | ||||
| -rw-r--r-- | man/Xfixes.man | 6 | ||||
| -rw-r--r-- | src/Xfixes.c | 16 |
3 files changed, 17 insertions, 13 deletions
diff --git a/include/X11/extensions/Xfixes.h b/include/X11/extensions/Xfixes.h index 7c4a2ab..873aab3 100644 --- a/include/X11/extensions/Xfixes.h +++ b/include/X11/extensions/Xfixes.h @@ -113,10 +113,12 @@ typedef struct { _XFUNCPROTOBEGIN -Bool XFixesQueryExtension (Display *dpy, int *event_basep, int *error_basep); +Bool XFixesQueryExtension (Display *dpy, + int *event_base_return, + int *error_base_return); Status XFixesQueryVersion (Display *dpy, - int *major_versionp, - int *minor_versionp); + int *major_version_return, + int *minor_version_return); int XFixesVersion (void); diff --git a/man/Xfixes.man b/man/Xfixes.man index f081cc5..9722236 100644 --- a/man/Xfixes.man +++ b/man/Xfixes.man @@ -35,11 +35,11 @@ XFixes \- Augmented versions of core protocol requests .nf .sp Bool XFixesQueryExtension \^(\^Display *\fIdpy\fP, - int *\fIevent_basep\fP, int *\fIerror_basep\fP\^); + int *\fIevent_base_return\fP, int *\fIerror_base_return\fP\^); .sp Status XFixesQueryVersion \^(\^Display *\fIdpy\fP, - int *\fImajor_versionp\fP, - int *\fIminor_versionp\fP\^); + int *\fImajor_version_return\fP, + int *\fIminor_version_return\fP\^); .sp void XFixesChangeSaveSet \^(\^Display *dpy, Window \fIwindow\fP, diff --git a/src/Xfixes.c b/src/Xfixes.c index cf56b5a..05bfac2 100644 --- a/src/Xfixes.c +++ b/src/Xfixes.c @@ -297,14 +297,16 @@ XFixesEventToWire(Display *dpy, XEvent *event, xEvent *wire) } Bool -XFixesQueryExtension (Display *dpy, int *event_basep, int *error_basep) +XFixesQueryExtension (Display *dpy, + int *event_base_return, + int *error_base_return) { XFixesExtDisplayInfo *info = XFixesFindDisplay (dpy); if (XFixesHasExtension(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 @@ -313,15 +315,15 @@ XFixesQueryExtension (Display *dpy, int *event_basep, int *error_basep) Status XFixesQueryVersion (Display *dpy, - int *major_versionp, - int *minor_versionp) + int *major_version_return, + int *minor_version_return) { XFixesExtDisplayInfo *info = XFixesFindDisplay (dpy); XFixesCheckExtension (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; } |