xserver git update 11/6/2010

9 files changed, 236 insertions, 236 deletions

diff --git a/xorg-server/os/access.c b/xorg-server/os/access.c
index 2a0ea01cd..862d98a96 100644
--- a/xorg-server/os/access.c
+++ b/xorg-server/os/access.c
@@ -311,7 +311,7 @@ ifioctl (int fd, int cmd, char *arg)
     struct strioctl ioc;

     int ret;

 

-    bzero((char *) &ioc, sizeof(ioc));

+    memset((char *) &ioc, 0, sizeof(ioc));

     ioc.ic_cmd = cmd;

     ioc.ic_timout = 0;

     if (cmd == SIOCGIFCONF)

@@ -329,7 +329,7 @@ ifioctl (int fd, int cmd, char *arg)
 #ifdef SVR4

 	((struct ifconf *) arg)->ifc_len = ioc.ic_len;

 #endif

-    return(ret);

+    return ret;

 }

 #else /* Case sun, SCO325 and others  */

 #define ifioctl ioctl

@@ -1038,7 +1038,7 @@ ResetHosts (char *display)
 		len = sizeof(saddr.sa);

 		if (ConvertAddr (&saddr.sa, &len, (pointer *)&addr) == FamilyDECnet)

 		{

-		    bzero ((char *) &dnaddr, sizeof (dnaddr));

+		    memset((char *) &dnaddr, 0, sizeof (dnaddr));

 		    dnaddr.a_len = np->n_length;

 		    acopy (np->n_addr, dnaddr.a_addr, np->n_length);

 		    dnaddrp = &dnaddr;

@@ -1343,13 +1343,13 @@ AddHost (ClientPtr	client,
 	if ((len = CheckAddr (family, pAddr, length)) < 0)

 	{

 	    client->errorValue = length;

-	    return (BadValue);

+	    return BadValue;

 	}

 	break;

     case FamilyLocal:

     default:

 	client->errorValue = family;

-	return (BadValue);

+	return BadValue;

     }

     if (NewHost (family, pAddr, len, FALSE))

 	return Success;

@@ -1441,13 +1441,13 @@ RemoveHost (
     	if ((len = CheckAddr (family, pAddr, length)) < 0)

     	{

 	    client->errorValue = length;

-            return(BadValue);

+            return BadValue;

     	}

 	break;

     case FamilyLocal:

     default:

 	client->errorValue = family;

-        return(BadValue);

+        return BadValue;

     }

     for (prev = &validhosts;

          (host = *prev) && (!addrEqual (family, pAddr, len, host));

@@ -1458,7 +1458,7 @@ RemoveHost (
         *prev = host->next;

         FreeHost (host);

     }

-    return (Success);

+    return Success;

 }

 

 /* Get all hosts in the access control list */

@@ -1486,7 +1486,7 @@ GetHosts (
         *data = ptr = malloc(n);

 	if (!ptr)

 	{

-	    return(BadAlloc);

+	    return BadAlloc;

 	}

         for (host = validhosts; host; host = host->next)

 	{

@@ -1502,7 +1502,7 @@ GetHosts (
     }

     *pnHosts = nHosts;

     *pLen = n;

-    return(Success);

+    return Success;

 }

 

 /* Check for valid address family and length, and return address length. */

@@ -1555,7 +1555,7 @@ CheckAddr (
       default:

         len = -1;

     }

-    return (len);

+    return len;

 }

 

 /* Check if a host is not in the access control list. 

@@ -1572,7 +1572,7 @@ InvalidHost (
     register HOST 		*selfhost, *host;

 

     if (!AccessEnabled)   /* just let them in */

-        return(0);    

+        return 0;

     family = ConvertAddr (saddr, &len, (pointer *)&addr);

     if (family == -1)

         return 1;

@@ -1600,15 +1600,15 @@ InvalidHost (
     {

 	if ((host->family == FamilyServerInterpreted)) {

 	    if (siAddrMatch (family, addr, len, host, client)) {

-		return (0);

+		return 0;

 	    }

 	} else {

 	    if (addrEqual (family, addr, len, host))

-		return (0);

+		return 0;

 	}

 

     }

-    return (1);

+    return 1;

 }

 

 static int

@@ -1618,7 +1618,7 @@ ConvertAddr (
     pointer			*addr)

 {

     if (*len == 0)

-        return (FamilyLocal);

+        return FamilyLocal;

     switch (saddr->sa_family)

     {

     case AF_UNSPEC:

diff --git a/xorg-server/os/connection.c b/xorg-server/os/connection.c
index 20d1dee28..648164ef3 100644
--- a/xorg-server/os/connection.c
+++ b/xorg-server/os/connection.c
@@ -183,7 +183,7 @@ struct _ct_node *ct_head[256];
 

 void InitConnectionTranslation(void)

 {

-    bzero(ct_head, sizeof(ct_head));

+    memset(ct_head, 0, sizeof(ct_head));

 }

 

 int GetConnectionTranslation(int conn)

@@ -267,7 +267,7 @@ lookup_trans_conn (int fd)
 		return ListenTransConns[i];

     }

 

-    return (NULL);

+    return NULL;

 }

 

 /* Set MaxClients and lastfdesc, and allocate ConnectionTranslation */

diff --git a/xorg-server/os/io.c b/xorg-server/os/io.c
index 82a2c5875..c617405b3 100644
--- a/xorg-server/os/io.c
+++ b/xorg-server/os/io.c
@@ -508,7 +508,7 @@ InsertFakeRequest(ClientPtr client, char *data, int count)
 

 	ibuf = (char *)realloc(oci->buffer, gotnow + count);

 	if (!ibuf)

-	    return(FALSE);

+	    return FALSE;

 	oci->size = gotnow + count;

 	oci->buffer = ibuf;

 	oci->bufptr = ibuf + oci->bufcnt - gotnow;

@@ -529,7 +529,7 @@ InsertFakeRequest(ClientPtr client, char *data, int count)
 	FD_SET(fd, &ClientsWithInput);

     else

 	YieldControlNoInput(fd);

-    return(TRUE);

+    return TRUE;

 }

 

 /*****************************************************************

@@ -706,7 +706,7 @@ WriteToClient (ClientPtr who, int count, const void *__buf)
     Bool multicount = FALSE;

 #endif

     if (!count || !who || who == serverClient || who->clientGone)

-	return(0);

+	return 0;

     oc = who->osPrivate;

     oco = oc->output;

 #ifdef DEBUG_COMMUNICATION

@@ -826,7 +826,7 @@ WriteToClient (ClientPtr who, int count, const void *__buf)
     FD_SET(oc->fd, &OutputPending);

     memmove((char *)oco->buf + oco->count, buf, count);

     oco->count += count + padBytes;

-    return(count);

+    return count;

 }

 

  /********************

@@ -948,7 +948,7 @@ FlushClient(ClientPtr who, OsCommPtr oc, const void *__extraBuf, int extraCount)
 		    oc->trans_conn = NULL;

 		    MarkClientException(who);

 		    oco->count = 0;

-		    return(-1);

+		    return -1;

 		}

 		oco->size = notWritten + BUFSIZE;

 		oco->buf = obuf;

@@ -981,7 +981,7 @@ FlushClient(ClientPtr who, OsCommPtr oc, const void *__extraBuf, int extraCount)
 	    }

 	    MarkClientException(who);

 	    oco->count = 0;

-	    return(-1);

+	    return -1;

 	}

     }

 

diff --git a/xorg-server/os/strcasecmp.c b/xorg-server/os/strcasecmp.c
index ca1051dc1..c95bc5220 100644
--- a/xorg-server/os/strcasecmp.c
+++ b/xorg-server/os/strcasecmp.c
@@ -1,70 +1,70 @@
-/*
- * Copyright (c) 1987, 1993
- *      The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#include <ctype.h>
-#include "dix.h"
-
-#ifdef NEED_STRCASECMP
-int
-xstrcasecmp(const char *str1, const char *str2)
-{
-    const u_char *us1 = (const u_char *)str1, *us2 = (const u_char *)str2;
-
-    while (tolower(*us1) == tolower(*us2)) {
-        if (*us1++ == '\0')
-            return (0);
-        us2++;
-    }
-
-    return (tolower(*us1) - tolower(*us2));
-}
-#endif
-
-#ifdef NEED_STRNCASECMP
-int
-xstrncasecmp(const char *s1, const char *s2, size_t n)
-{
-    if (n != 0) {
-        const u_char *us1 = (const u_char *)s1, *us2 = (const u_char *)s2;
-
-        do {
-            if (tolower(*us1) != tolower(*us2++))
-                return (tolower(*us1) - tolower(*--us2));
-            if (*us1++ == '\0')
-                break;
-        } while (--n != 0);
-    }
-
-    return 0;
-}
-#endif
+/*

+ * Copyright (c) 1987, 1993

+ *      The Regents of the University of California.  All rights reserved.

+ *

+ * Redistribution and use in source and binary forms, with or without

+ * modification, are permitted provided that the following conditions

+ * are met:

+ * 1. Redistributions of source code must retain the above copyright

+ *    notice, this list of conditions and the following disclaimer.

+ * 2. Redistributions in binary form must reproduce the above copyright

+ *    notice, this list of conditions and the following disclaimer in the

+ *    documentation and/or other materials provided with the distribution.

+ * 4. Neither the name of the University nor the names of its contributors

+ *    may be used to endorse or promote products derived from this software

+ *    without specific prior written permission.

+ *

+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND

+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE

+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL

+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS

+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)

+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT

+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY

+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF

+ * SUCH DAMAGE.

+ */

+

+#ifdef HAVE_DIX_CONFIG_H

+#include <dix-config.h>

+#endif

+

+#include <ctype.h>

+#include "dix.h"

+

+#ifdef NEED_STRCASECMP

+int

+xstrcasecmp(const char *str1, const char *str2)

+{

+    const u_char *us1 = (const u_char *)str1, *us2 = (const u_char *)str2;

+

+    while (tolower(*us1) == tolower(*us2)) {

+        if (*us1++ == '\0')

+            return 0;

+        us2++;

+    }

+

+    return (tolower(*us1) - tolower(*us2));

+}

+#endif

+

+#ifdef NEED_STRNCASECMP

+int

+xstrncasecmp(const char *s1, const char *s2, size_t n)

+{

+    if (n != 0) {

+        const u_char *us1 = (const u_char *)s1, *us2 = (const u_char *)s2;

+

+        do {

+            if (tolower(*us1) != tolower(*us2++))

+                return (tolower(*us1) - tolower(*--us2));

+            if (*us1++ == '\0')

+                break;

+        } while (--n != 0);

+    }

+

+    return 0;

+}

+#endif

diff --git a/xorg-server/os/strcasestr.c b/xorg-server/os/strcasestr.c
index b3d45495c..75f220fd3 100644
--- a/xorg-server/os/strcasestr.c
+++ b/xorg-server/os/strcasestr.c
@@ -1,64 +1,64 @@
-/*-
- * Copyright (c) 1990, 1993
- *      The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#include <ctype.h>
-#include <string.h>
-#include "dix.h"
-
-/*
- * Find the first occurrence of find in s, ignore case.
- */
-#ifdef NEED_STRCASESTR
-char *
-xstrcasestr(const char *s, const char *find)
-{
-        char c, sc;
-        size_t len;
-
-        if ((c = *find++) != 0) {
-                c = tolower((unsigned char)c);
-                len = strlen(find);
-                do {
-                        do {
-                                if ((sc = *s++) == 0)
-                                        return (NULL);
-                        } while ((char)tolower((unsigned char)sc) != c);
-                } while (strncasecmp(s, find, len) != 0);
-                s--;
-        }
-        return ((char *)s);
-}
-#endif
+/*-

+ * Copyright (c) 1990, 1993

+ *      The Regents of the University of California.  All rights reserved.

+ *

+ * This code is derived from software contributed to Berkeley by

+ * Chris Torek.

+ *

+ * Redistribution and use in source and binary forms, with or without

+ * modification, are permitted provided that the following conditions

+ * are met:

+ * 1. Redistributions of source code must retain the above copyright

+ *    notice, this list of conditions and the following disclaimer.

+ * 2. Redistributions in binary form must reproduce the above copyright

+ *    notice, this list of conditions and the following disclaimer in the

+ *    documentation and/or other materials provided with the distribution.

+ * 4. Neither the name of the University nor the names of its contributors

+ *    may be used to endorse or promote products derived from this software

+ *    without specific prior written permission.

+ *

+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND

+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE

+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL

+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS

+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)

+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT

+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY

+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF

+ * SUCH DAMAGE.

+ */

+

+#ifdef HAVE_DIX_CONFIG_H

+#include <dix-config.h>

+#endif

+

+#include <ctype.h>

+#include <string.h>

+#include "dix.h"

+

+/*

+ * Find the first occurrence of find in s, ignore case.

+ */

+#ifdef NEED_STRCASESTR

+char *

+xstrcasestr(const char *s, const char *find)

+{

+        char c, sc;

+        size_t len;

+

+        if ((c = *find++) != 0) {

+                c = tolower((unsigned char)c);

+                len = strlen(find);

+                do {

+                        do {

+                                if ((sc = *s++) == 0)

+                                        return NULL;

+                        } while ((char)tolower((unsigned char)sc) != c);

+                } while (strncasecmp(s, find, len) != 0);

+                s--;

+        }

+        return ((char *)s);

+}

+#endif

diff --git a/xorg-server/os/strlcpy.c b/xorg-server/os/strlcpy.c
index aa9d042e0..647adb5e9 100644
--- a/xorg-server/os/strlcpy.c
+++ b/xorg-server/os/strlcpy.c
@@ -1,54 +1,54 @@
-/*
- * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND TODD C. MILLER DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL TODD C. MILLER BE LIABLE
- * FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
-#include <sys/types.h>
-#include <string.h>
-#include "os.h"
-
-/*
- * Copy src to string dst of size siz.  At most siz-1 characters
- * will be copied.  Always NUL terminates (unless siz == 0).
- * Returns strlen(src); if retval >= siz, truncation occurred.
- */
-size_t
-strlcpy(char *dst, const char *src, size_t siz)
-{
-	register char *d = dst;
-	register const char *s = src;
-	register size_t n = siz;
-
-	/* Copy as many bytes as will fit */
-	if (n != 0 && --n != 0) {
-		do {
-			if ((*d++ = *s++) == 0)
-				break;
-		} while (--n != 0);
-	}
-
-	/* Not enough room in dst, add NUL and traverse rest of src */
-	if (n == 0) {
-		if (siz != 0)
-			*d = '\0';		/* NUL-terminate dst */
-		while (*s++)
-			;
-	}
-
-	return(s - src - 1);	/* count does not include NUL */
-}
+/*

+ * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>

+ *

+ * Permission to use, copy, modify, and distribute this software for any

+ * purpose with or without fee is hereby granted, provided that the above

+ * copyright notice and this permission notice appear in all copies.

+ *

+ * THE SOFTWARE IS PROVIDED "AS IS" AND TODD C. MILLER DISCLAIMS ALL

+ * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES

+ * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL TODD C. MILLER BE LIABLE

+ * FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES

+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION

+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN

+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

+ */

+

+#ifdef HAVE_XORG_CONFIG_H

+#include <xorg-config.h>

+#endif

+

+#include <sys/types.h>

+#include <string.h>

+#include "os.h"

+

+/*

+ * Copy src to string dst of size siz.  At most siz-1 characters

+ * will be copied.  Always NUL terminates (unless siz == 0).

+ * Returns strlen(src); if retval >= siz, truncation occurred.

+ */

+size_t

+strlcpy(char *dst, const char *src, size_t siz)

+{

+	register char *d = dst;

+	register const char *s = src;

+	register size_t n = siz;

+

+	/* Copy as many bytes as will fit */

+	if (n != 0 && --n != 0) {

+		do {

+			if ((*d++ = *s++) == 0)

+				break;

+		} while (--n != 0);

+	}

+

+	/* Not enough room in dst, add NUL and traverse rest of src */

+	if (n == 0) {

+		if (siz != 0)

+			*d = '\0';		/* NUL-terminate dst */

+		while (*s++)

+			;

+	}

+

+	return s - src - 1;	/* count does not include NUL */

+}

diff --git a/xorg-server/os/utils.c b/xorg-server/os/utils.c
index 7f556a912..dbe826579 100644
--- a/xorg-server/os/utils.c
+++ b/xorg-server/os/utils.c
@@ -548,12 +548,12 @@ void UseMsg(void)
 static int 

 VerifyDisplayName(const char *d)

 {

-    if ( d == (char *)0 ) return( 0 );  /*  null  */

-    if ( *d == '\0' ) return( 0 );  /*  empty  */

-    if ( *d == '-' ) return( 0 );  /*  could be confused for an option  */

-    if ( *d == '.' ) return( 0 );  /*  must not equal "." or ".."  */

-    if ( strchr(d, '/') != (char *)0 ) return( 0 );  /*  very important!!!  */

-    return( 1 );

+    if ( d == (char *)0 ) return 0;  /*  null  */

+    if ( *d == '\0' ) return 0;  /*  empty  */

+    if ( *d == '-' ) return 0;  /*  could be confused for an option  */

+    if ( *d == '.' ) return 0;  /*  must not equal "." or ".."  */

+    if ( strchr(d, '/') != (char *)0 ) return 0;  /*  very important!!!  */

+    return 1;

 }

 

 /*

@@ -979,7 +979,7 @@ set_font_authorizations(char **authorizations, int *authlen, pointer client)
 

 	gethostname(hname, 1024);

 #if defined(IPv6) && defined(AF_INET6)

-	bzero(&hints, sizeof(hints));

+	memset(&hints, 0, sizeof(hints));

 	hints.ai_flags = AI_CANONNAME;

 	if (getaddrinfo(hname, NULL, &hints, &ai) == 0) {

 	    hnameptr = ai->ai_canonname;

@@ -1178,7 +1178,7 @@ SmartScheduleInit (void)
     if (SmartScheduleDisable)

 	return TRUE;

     

-    bzero ((char *) &act, sizeof(struct sigaction));

+    memset((char *) &act, 0, sizeof(struct sigaction));

 

     /* Set up the timer signal function */

     act.sa_handler = SmartScheduleTimer;

@@ -1284,7 +1284,7 @@ System(char *command)
     int status;

 

     if (!command)

-	return(1);

+	return 1;

 

 #ifdef SIGCHLD

     csig = signal(SIGCHLD, SIG_DFL);

diff --git a/xorg-server/os/xdmauth.c b/xorg-server/os/xdmauth.c
index b58d1d7cc..13da77a37 100644
--- a/xorg-server/os/xdmauth.c
+++ b/xorg-server/os/xdmauth.c
@@ -139,7 +139,7 @@ HexToBinary (const char *in, char *out, int len)
 void

 XdmAuthenticationInit (const char *cookie, int cookie_len)

 {

-    bzero (privateKey.data, 8);

+    memset(privateKey.data, 0, 8);

     if (!strncmp (cookie, "0x", 2) || !strncmp (cookie, "0X", 2))

     {

 	if (cookie_len > 2 + 2 * 8)

diff --git a/xorg-server/os/xdmcp.c b/xorg-server/os/xdmcp.c
index 0368102f6..b10ca4b2c 100644
--- a/xorg-server/os/xdmcp.c
+++ b/xorg-server/os/xdmcp.c
@@ -251,48 +251,48 @@ XdmcpOptions(int argc, char **argv, int i)
 	get_manager_by_name(argc, argv, i++);

 	XDM_INIT_STATE = XDM_QUERY;

 	AccessUsingXdmcp ();

-	return (i + 1);

+	return i + 1;

     }

     if (strcmp(argv[i], "-broadcast") == 0) {

 	XDM_INIT_STATE = XDM_BROADCAST;

 	AccessUsingXdmcp ();

-	return (i + 1);

+	return i + 1;

     }

 #if defined(IPv6) && defined(AF_INET6)

     if (strcmp(argv[i], "-multicast") == 0) {

 	i = get_mcast_options(argc, argv, ++i);

 	XDM_INIT_STATE = XDM_MULTICAST;

 	AccessUsingXdmcp ();

-	return (i + 1);

+	return i + 1;

     }

 #endif

     if (strcmp(argv[i], "-indirect") == 0) {

 	get_manager_by_name(argc, argv, i++);

 	XDM_INIT_STATE = XDM_INDIRECT;

 	AccessUsingXdmcp ();

-	return (i + 1);

+	return i + 1;

     }

     if (strcmp(argv[i], "-port") == 0) {

         if (++i == argc)  {

 	    FatalError("Xserver: missing port number in command line\n");

 	}

 	xdm_udp_port = (unsigned short) atoi(argv[i]);

-	return (i + 1);

+	return i + 1;

     }

     if (strcmp(argv[i], "-from") == 0) {

 	get_fromaddr_by_name(argc, argv, ++i);

-	return (i + 1);

+	return i + 1;

     }

     if (strcmp(argv[i], "-once") == 0) {

 	OneSession = TRUE;

-	return (i + 1);

+	return i + 1;

     }

     if (strcmp(argv[i], "-class") == 0) {

         if (++i == argc)  {

 	    FatalError("Xserver: missing class name in command line\n");

 	}

 	defaultDisplayClass = argv[i];

-	return (i + 1);

+	return i + 1;

     }

 #ifdef HASXDMAUTH

     if (strcmp(argv[i], "-cookie") == 0) {

@@ -300,7 +300,7 @@ XdmcpOptions(int argc, char **argv, int i)
 	    FatalError("Xserver: missing cookie data in command line\n");

 	}

 	xdmAuthCookie = argv[i];

-	return (i + 1);

+	return i + 1;

     }

 #endif

     if (strcmp(argv[i], "-displayID") == 0) {

@@ -308,9 +308,9 @@ XdmcpOptions(int argc, char **argv, int i)
 	    FatalError("Xserver: missing displayID in command line\n");

 	}

 	XdmcpRegisterManufacturerDisplayID (argv[i], strlen (argv[i]));

-	return (i + 1);

+	return i + 1;

     }

-    return (i);

+    return i;

 }

 

 /*

@@ -338,7 +338,7 @@ XdmcpRegisterBroadcastAddress (const struct sockaddr_in *addr)
     if (NumBroadcastAddresses >= MAX_BROADCAST)

 	return;

     bcast = &BroadcastAddresses[NumBroadcastAddresses++];

-    bzero (bcast, sizeof (struct sockaddr_in));

+    memset(bcast, 0, sizeof (struct sockaddr_in));

 #ifdef BSD44SOCKETS

     bcast->sin_len = addr->sin_len;

 #endif

@@ -1483,7 +1483,7 @@ get_addr_by_name(
     char *pport = portstr;

     int gaierr;

 

-    bzero(&hints, sizeof(hints));

+    memset(&hints, 0, sizeof(hints));

     hints.ai_socktype = socktype;

 

     if (port == 0) {

@@ -1616,7 +1616,7 @@ get_mcast_options(int argc, char **argv, int i)
     } else {

 	FatalError("Xserver: port out of range: %d\n", xdm_udp_port);

     }

-    bzero(&hints, sizeof(hints));

+    memset(&hints, 0, sizeof(hints));

     hints.ai_socktype = SOCK_DGRAM;

 

     if ((gaierr = getaddrinfo(address, portstr, &hints, &firstai)) == 0) {