From 1be3101aeab9b6136c32a91c23799724a7fe7797 Mon Sep 17 00:00:00 2001 From: Kaleb Keithley Date: Fri, 14 Nov 2003 16:48:47 +0000 Subject: XFree86 4.3.0.1 --- AuGetBest.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'AuGetBest.c') 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 #include @@ -37,10 +38,8 @@ in this Software without prior written authorization from The Open Group. #include #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 || -- cgit v1.2.1