From 54e72e37c7001a5156efe090038c50726854945c Mon Sep 17 00:00:00 2001 From: Kaleb Keithley Date: Wed, 26 Nov 2003 22:48:39 +0000 Subject: merge latest (4.3.99.16) from XFree86 (vendor) branch --- AuGetAddr.c | 16 +---------- AuGetBest.c | 17 +---------- AuLock.c | 11 +------ AuUnlock.c | 7 +---- Xau.man | 82 +++++++++++++++-------------------------------------- include/X11/Xauth.h | 22 +------------- 6 files changed, 28 insertions(+), 127 deletions(-) diff --git a/AuGetAddr.c b/AuGetAddr.c index cd6948b..b0a4caf 100644 --- a/AuGetAddr.c +++ b/AuGetAddr.c @@ -25,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xau/AuGetAddr.c,v 1.5 2001/12/14 19:54:36 dawes Exp $ */ +/* $XFree86: xc/lib/Xau/AuGetAddr.c,v 1.6 2003/11/17 22:20:21 dawes Exp $ */ #include #include @@ -39,7 +39,6 @@ binaryEqual (_Xconst char *a, _Xconst char *b, int len) return 1; } -#if NeedFunctionPrototypes Xauth * XauGetAuthByAddr ( #if NeedWidePrototypes @@ -62,19 +61,6 @@ unsigned int name_length, unsigned short name_length, #endif _Xconst char* name) -#else -Xauth * -XauGetAuthByAddr (family, address_length, address, - number_length, number, - name_length, name) -unsigned short family; -unsigned short address_length; -char *address; -unsigned short number_length; -char *number; -unsigned short name_length; -char *name; -#endif { FILE *auth_file; char *auth_name; diff --git a/AuGetBest.c b/AuGetBest.c index 01ba34e..c8661eb 100644 --- a/AuGetBest.c +++ b/AuGetBest.c @@ -25,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xau/AuGetBest.c,v 1.7 2001/12/14 19:54:36 dawes Exp $ */ +/* $XFree86: xc/lib/Xau/AuGetBest.c,v 1.8 2003/11/17 22:20:21 dawes Exp $ */ #include #include @@ -47,7 +47,6 @@ binaryEqual (_Xconst char *a, _Xconst char *b, int len) return 1; } -#if NeedFunctionPrototypes Xauth * XauGetBestAuthByAddr ( #if NeedWidePrototypes @@ -67,20 +66,6 @@ XauGetBestAuthByAddr ( int types_length, char** types, _Xconst int* type_lengths) -#else -Xauth * -XauGetBestAuthByAddr (family, address_length, address, - number_length, number, - types_length, types, type_lengths) - unsigned short family; - unsigned short address_length; - char *address; - unsigned short number_length; - char *number; - int types_length; - char **types; - int *type_lengths; -#endif { FILE *auth_file; char *auth_name; diff --git a/AuLock.c b/AuLock.c index 8e5a2cc..89c4814 100644 --- a/AuLock.c +++ b/AuLock.c @@ -25,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xau/AuLock.c,v 3.6 2002/05/31 18:45:43 dawes Exp $ */ +/* $XFree86: xc/lib/Xau/AuLock.c,v 3.7 2003/11/17 22:20:21 dawes Exp $ */ #include #include @@ -46,21 +46,12 @@ extern unsigned sleep (); #define link rename #endif -#if NeedFunctionPrototypes int XauLockAuth ( _Xconst char *file_name, int retries, int timeout, long dead) -#else -int -XauLockAuth (file_name, retries, timeout, dead) -char *file_name; -int retries; -int timeout; -long dead; -#endif { char creat_name[1025], link_name[1025]; struct stat statb; diff --git a/AuUnlock.c b/AuUnlock.c index 7c7eb01..8783b56 100644 --- a/AuUnlock.c +++ b/AuUnlock.c @@ -25,19 +25,14 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xau/AuUnlock.c,v 1.4 2001/12/14 19:54:36 dawes Exp $ */ +/* $XFree86: xc/lib/Xau/AuUnlock.c,v 1.5 2003/11/17 22:20:21 dawes Exp $ */ #include #include int -#if NeedFunctionPrototypes XauUnlockAuth ( _Xconst char *file_name) -#else -XauUnlockAuth (file_name) -char *file_name; -#endif { #ifndef WIN32 char creat_name[1025]; diff --git a/Xau.man b/Xau.man index 263d84e..db90093 100644 --- a/Xau.man +++ b/Xau.man @@ -24,7 +24,7 @@ .\" dealing in this Software without prior written authorization from the .\" X Consortium. .\" -.\" $XFree86: xc/doc/man/Xau/Xau.man,v 1.2 2001/01/27 18:20:19 dawes Exp $ +.\" $XFree86: xc/doc/man/Xau/Xau.man,v 1.3 2003/04/28 22:18:14 herrb Exp $ .\" .TH Xau 3 __xorgversion__ .SH NAME @@ -48,64 +48,28 @@ typedef struct xauth { char *data; } Xauth; -.ft B -char *XauFileName () - -.ft B -Xauth *XauReadAuth (auth_file) -.ft I - FILE *auth_file; - -.ft B -int XauWriteAuth (auth_file, auth) -.ft I - FILE *auth_file; - Xauth *auth; - -.ft B -Xauth *XauGetAuthByAddr (\kAfamily, -\h'|\nAu'address_length, address, -\h'|\nAu'number_length, number) -.ft I - unsigned short family; - unsigned short address_length; - char *address; - unsigned short number_length; - char *number; - -.ft B -Xauth *XauGetBestAuthByAddr (\kAfamily, -\h'|\nAu'address_length, address, -\h'|\nAu'number_length, number, -\h'|\nAu'types_length, types, type_lengths) -.ft I - unsigned short family; - unsigned short address_length; - char *address; - unsigned short number_length; - char *number; - int types_length; - char **types; - int *type_lengths; - -.ft B -int XauLockAuth (file_name, retries, timeout, dead) -.ft I - char *file_name; - int retries; - int timeout; - long dead; - -.ft B -int XauUnlockAuth (file_name) -.ft I - char *file_name; - -.ft B -XauDisposeAuth (auth) -.ft I - Xauth *auth; - +.HP +char *XauFileName (void); +.HP +Xauth *XauReadAuth (FILE *\fIauth_file\fP\^); +.HP +int XauWriteAuth (FILE *\fIauth_file\fP, Xauth *\fIauth\fP\^); +.HP +Xauth *XauGetAuthByAddr (unsigned short \fIfamily\fP\^, unsigned short +\fIaddress_length\fP\^, char *\fIaddress\fP\^, unsigned short +\fInumber_length\fP\^, char *\fInumber\fP\^); +.HP +Xauth *XauGetBestAuthByAddr (unsigned short \fIfamily\fP\^, unsigned short +\fIaddress_length\fP\^, char *\fIaddress\fP\^, unsigned short +\fInumber_length\fP\^, char *\fInumber\fP\^, int \fItypes_length\fP\^, char +**\fItypes\fR\^, int *\fItype_lengths\fR\^); +.HP +int XauLockAuth (char *\fIfile_name\fP\^, int \fIretries\fP\^, int +\fItimeout\fP\^, long \fIdead\fP\^); +.HP +int XauUnlockAuth (char *\fIfile_name\fP\^); +.HP +int XauDisposeAuth (Xauth *\fIauth\fP\^); .ft R .SH DESCRIPTION .PP diff --git a/include/X11/Xauth.h b/include/X11/Xauth.h index e4efc2d..7340687 100644 --- a/include/X11/Xauth.h +++ b/include/X11/Xauth.h @@ -26,7 +26,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xau/Xauth.h,v 1.5 2001/12/14 19:54:36 dawes Exp $ */ +/* $XFree86: xc/lib/Xau/Xauth.h,v 1.6 2003/11/17 22:20:21 dawes Exp $ */ #ifndef _Xauth_h #define _Xauth_h @@ -62,41 +62,30 @@ _XFUNCPROTOBEGIN char *XauFileName(void); Xauth *XauReadAuth( -#if NeedFunctionPrototypes FILE* /* auth_file */ -#endif ); int XauLockAuth( -#if NeedFunctionPrototypes _Xconst char* /* file_name */, int /* retries */, int /* timeout */, long /* dead */ -#endif ); int XauUnlockAuth( -#if NeedFunctionPrototypes _Xconst char* /* file_name */ -#endif ); int XauWriteAuth( -#if NeedFunctionPrototypes FILE* /* auth_file */, Xauth* /* auth */ -#endif ); Xauth *XauGetAuthByName( -#if NeedFunctionPrototypes _Xconst char* /* display_name */ -#endif ); Xauth *XauGetAuthByAddr( -#if NeedFunctionPrototypes #if NeedWidePrototypes unsigned int /* family */, unsigned int /* address_length */, @@ -117,11 +106,9 @@ unsigned int /* name_length */, unsigned short /* name_length */, #endif _Xconst char* /* name */ -#endif ); Xauth *XauGetBestAuthByAddr( -#if NeedFunctionPrototypes #if NeedWidePrototypes unsigned int /* family */, unsigned int /* address_length */, @@ -139,13 +126,10 @@ _Xconst char* /* number */, int /* types_length */, char** /* type_names */, _Xconst int* /* type_lengths */ -#endif ); void XauDisposeAuth( -#if NeedFunctionPrototypes Xauth* /* auth */ -#endif ); #ifdef K5AUTH @@ -155,17 +139,13 @@ Xauth* /* auth */ #undef xfree int XauKrb5Encode( -#if NeedFunctionPrototypes krb5_principal /* princ */, krb5_data * /* outbuf */ -#endif ); int XauKrb5Decode( -#if NeedFunctionPrototypes krb5_data /* inbuf */, krb5_principal * /* princ */ -#endif ); #endif /* K5AUTH */ -- cgit v1.2.3