diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-17 19:03:41 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-17 19:03:41 +0000 |
| commit | 046c2c32dd7268cc51de9748f42c14abc102e4f6 (patch) | |
| tree | 10e45a24782e633b9f6e1f8b427fac91ee2ddfa8 /AuGetBest.c | |
| parent | dcc3fc52f917603df94ef4207f1dec9238dce23b (diff) | |
merge XFree86 4.3.0.1 to -CURRENT
Diffstat (limited to 'AuGetBest.c')
| -rw-r--r-- | AuGetBest.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/AuGetBest.c b/AuGetBest.c index ff24813..01ba34e 100644 --- a/AuGetBest.c +++ b/AuGetBest.c @@ -25,6 +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 $ */ #include <X11/Xauth.h> #include <X11/Xos.h> @@ -37,10 +38,8 @@ in this Software without prior written authorization from The Open Group. #include <X11/Xos_r.h> #endif -static -binaryEqual (a, b, len) -register char *a, *b; -register int len; +static int +binaryEqual (_Xconst char *a, _Xconst char *b, int len) { while (len--) if (*a++ != *b++) @@ -105,7 +104,9 @@ XauGetBestAuthByAddr (family, address_length, address, #ifdef hpux if (family == FamilyLocal) { +#ifdef XTHREADS_NEEDS_BYNAMEPARAMS _Xgethostbynameparams hparams; +#endif struct hostent *hostp; /* make sure we try fully-qualified hostname */ @@ -130,16 +131,14 @@ XauGetBestAuthByAddr (family, address_length, address, /* * Match when: * either family or entry->family are FamilyWild or - * family and entry->family are the same - * and - * either address or entry->address are empty or - * address and entry->address are the same + * family and entry->family are the same and + * address and entry->address are the same * and * either number or entry->number are empty or * number and entry->number are the same * and - * name matches one of the specified names, or no names - * were specified + * either name or entry->name are empty or + * name and entry->name are the same */ if ((family == FamilyWild || entry->family == FamilyWild || |