diff options
| author | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-05-19 18:49:26 +0930 |
|---|---|---|
| committer | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-05-19 18:49:26 +0930 |
| commit | ff9c27b08754c160256fe4d75cc4fbe07083f9d4 (patch) | |
| tree | 8ed2aa744180bafc92409cc1024692849cde488d | |
| parent | e3af1209b9c1fdb032d01e00b300d57278b81189 (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-- | man/Xss.man | 10 | ||||
| -rw-r--r-- | src/XScrnSaver.c | 16 |
2 files changed, 13 insertions, 13 deletions
diff --git a/man/Xss.man b/man/Xss.man index 615351d..cde6b31 100644 --- a/man/Xss.man +++ b/man/Xss.man @@ -62,10 +62,10 @@ typedef struct { .fi .HP Bool XScreenSaverQueryExtension(Display *\fIdpy\fP, -int *\fIevent_basep\fP, int *\fIerror_basep\fP\^); +int *\fIevent_base_return\fP, int *\fIerror_base_return\fP\^); .HP -Status XScreenSaverQueryVersion(Display *\fIdpy\fP, int *\fImajor_versionp\fP, -int *\fIminor_versionp\fP\^); +Status XScreenSaverQueryVersion(Display *\fIdpy\fP, +int *\fImajor_version_return\fP, int *\fIminor_version_return\fP\^); .HP XScreenSaverInfo *XScreenSaverAllocInfo(\^void\^); .HP @@ -153,9 +153,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 .B XScreenSaverAllocInfo allocates and returns an \fBXScreenSaverInfo\fP structure diff --git a/src/XScrnSaver.c b/src/XScrnSaver.c index 8ccc44b..1e3fe70 100644 --- a/src/XScrnSaver.c +++ b/src/XScrnSaver.c @@ -156,14 +156,14 @@ static Status event_to_wire ( Bool XScreenSaverQueryExtension ( 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; @@ -173,8 +173,8 @@ Bool XScreenSaverQueryExtension ( Status XScreenSaverQueryVersion( Display *dpy, - int *major_versionp, - int *minor_versionp) + int *major_version_return, + int *minor_version_return) { XExtDisplayInfo *info = find_display (dpy); xScreenSaverQueryVersionReply rep; @@ -193,8 +193,8 @@ Status XScreenSaverQueryVersion( 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; |