Convert sources to X.Org standard coding style

Via util/modular/x-indent-all.sh

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

1 files changed, 134 insertions, 121 deletions

diff --git a/utils.c b/utils.c
index e729af4..7038110 100644
--- a/utils.c
+++ b/utils.c
@@ -2,15 +2,15 @@
   /*\
    * $Xorg: utils.c,v 1.5 2000/08/17 19:54:50 cpqbld Exp $
    *
-   *		              COPYRIGHT 1990
-   *		        DIGITAL EQUIPMENT CORPORATION
-   *		           MAYNARD, MASSACHUSETTS
-   *			    ALL RIGHTS RESERVED.
+   *                          COPYRIGHT 1990
+   *                    DIGITAL EQUIPMENT CORPORATION
+   *                       MAYNARD, MASSACHUSETTS
+   *                        ALL RIGHTS RESERVED.
    *
    * THE INFORMATION IN THIS SOFTWARE IS SUBJECT TO CHANGE WITHOUT NOTICE AND
    * SHOULD NOT BE CONSTRUED AS A COMMITMENT BY DIGITAL EQUIPMENT CORPORATION.
-   * DIGITAL MAKES NO REPRESENTATIONS ABOUT THE SUITABILITY OF THIS SOFTWARE 
-   * FOR ANY PURPOSE.  IT IS SUPPLIED "AS IS" WITHOUT EXPRESS OR IMPLIED 
+   * DIGITAL MAKES NO REPRESENTATIONS ABOUT THE SUITABILITY OF THIS SOFTWARE
+   * FOR ANY PURPOSE.  IT IS SUPPLIED "AS IS" WITHOUT EXPRESS OR IMPLIED
    * WARRANTY.
    *
    * IF THE SOFTWARE IS MODIFIED IN A MANNER CREATING DERIVATIVE COPYRIGHT
@@ -22,7 +22,7 @@
    * that the above copyright notice appear in all copies and that both that
    * copyright notice and this permission notice appear in supporting
    * documentation, and that the name of Digital Equipment Corporation not be
-   * used in advertising or publicity pertaining to distribution of the 
+   * used in advertising or publicity pertaining to distribution of the
    * software without specific, written prior permission.
   \*/
 /* $XFree86: xc/programs/xkbprint/utils.c,v 3.4 2001/01/17 23:46:11 dawes Exp $ */
@@ -39,7 +39,7 @@ unsigned int debugFlags;
 Opaque
 uAlloc(unsigned size)
 {
-    return((Opaque)malloc(size));
+    return ((Opaque) malloc(size));
 }
 
 /***====================================================================***/
@@ -47,7 +47,7 @@ uAlloc(unsigned size)
 Opaque
 uCalloc(unsigned n, unsigned size)
 {
-    return((Opaque)calloc(n,size));
+    return ((Opaque) calloc(n, size));
 }
 
 /***====================================================================***/
@@ -55,9 +55,10 @@ uCalloc(unsigned n, unsigned size)
 Opaque
 uRealloc(Opaque old, unsigned newSize)
 {
-    if (old==NULL)
-	 return((Opaque)malloc(newSize));
-    else return((Opaque)realloc((char *)old,newSize));
+    if (old == NULL)
+        return ((Opaque) malloc(newSize));
+    else
+        return ((Opaque) realloc((char *) old, newSize));
 }
 
 /***====================================================================***/
@@ -65,17 +66,17 @@ uRealloc(Opaque old, unsigned newSize)
 Opaque
 uRecalloc(Opaque old, unsigned nOld, unsigned nNew, unsigned itemSize)
 {
-char *rtrn;
+    char *rtrn;
 
-    if (old==NULL)
-	 rtrn= (char *)calloc(nNew,itemSize);
+    if (old == NULL)
+        rtrn = (char *) calloc(nNew, itemSize);
     else {
-	rtrn= (char *)realloc((char *)old,nNew*itemSize);
-   	if ((rtrn)&&(nNew>nOld)) {
-	    bzero(&rtrn[nOld*itemSize],(nNew-nOld)*itemSize);
-	}
+        rtrn = (char *) realloc((char *) old, nNew * itemSize);
+        if ((rtrn) && (nNew > nOld)) {
+            bzero(&rtrn[nOld * itemSize], (nNew - nOld) * itemSize);
+        }
     }
-    return (Opaque)rtrn;
+    return (Opaque) rtrn;
 }
 
 /***====================================================================***/
@@ -83,8 +84,8 @@ char *rtrn;
 void
 uFree(Opaque ptr)
 {
-    if (ptr!=(Opaque)NULL)
-	free((char *)ptr);
+    if (ptr != (Opaque) NULL)
+        free((char *) ptr);
     return;
 }
 
@@ -92,37 +93,39 @@ uFree(Opaque ptr)
 /***                  FUNCTION ENTRY TRACKING                           ***/
 /***====================================================================***/
 
-static	FILE	*entryFile=	NULL;
-static	int	 uEntryLevel;
+static FILE *   entryFile = NULL;
+static int      uEntryLevel;
 
 Boolean
 uSetEntryFile(char *name)
 {
-    if ((entryFile!=NULL)&&(entryFile!=stderr)) {
-	fprintf(entryFile,"switching to %s\n",name?name:"stderr");
-	fclose(entryFile);
+    if ((entryFile != NULL) && (entryFile != stderr)) {
+        fprintf(entryFile, "switching to %s\n", name ? name : "stderr");
+        fclose(entryFile);
     }
-    if (name!=NullString)	entryFile=	fopen(name,"w");
-    else			entryFile=	stderr;
-    if (entryFile==NULL) {
-	entryFile=	stderr;
-	return(False);
+    if (name != NullString)
+        entryFile = fopen(name, "w");
+    else
+        entryFile = stderr;
+    if (entryFile == NULL) {
+        entryFile = stderr;
+        return (False);
     }
-    return(True);
+    return (True);
 }
 
 void
-uEntry(int l, char *s,...)
+uEntry(int l, char *s, ...)
 {
-int	i;
-va_list ap;
+    int i;
+    va_list ap;
 
     va_start(ap, s);
-    for (i=0;i<uEntryLevel;i++) {
-	putc(' ',entryFile);
+    for (i = 0; i < uEntryLevel; i++) {
+        putc(' ', entryFile);
     }
-    vfprintf(entryFile,s,ap);
-    uEntryLevel+= l;
+    vfprintf(entryFile, s, ap);
+    uEntryLevel += l;
     va_end(ap);
     return;
 }
@@ -130,14 +133,15 @@ va_list ap;
 void
 uExit(int l, char *rtVal)
 {
-int	i;
+    int i;
 
-    uEntryLevel-= l;
-    if (uEntryLevel<0)	uEntryLevel=	0;
-    for (i=0;i<uEntryLevel;i++) {
-	putc(' ',entryFile);
+    uEntryLevel -= l;
+    if (uEntryLevel < 0)
+        uEntryLevel = 0;
+    for (i = 0; i < uEntryLevel; i++) {
+        putc(' ', entryFile);
     }
-    fprintf(entryFile,"---> 0x%p\n",rtVal);
+    fprintf(entryFile, "---> 0x%p\n", rtVal);
     return;
 }
 
@@ -145,49 +149,51 @@ int	i;
 /***			PRINT FUNCTIONS					***/
 /***====================================================================***/
 
-	FILE	*uDebugFile=		NULL;
-	int	 uDebugIndentLevel=	0;
-	int	 uDebugIndentSize=	4;
+FILE *uDebugFile = NULL;
+int uDebugIndentLevel = 0;
+int uDebugIndentSize = 4;
 
 Boolean
 uSetDebugFile(char *name)
 {
-    if ((uDebugFile!=NULL)&&(uDebugFile!=stderr)) {
-	fprintf(uDebugFile,"switching to %s\n",name?name:"stderr");
-	fclose(uDebugFile);
+    if ((uDebugFile != NULL) && (uDebugFile != stderr)) {
+        fprintf(uDebugFile, "switching to %s\n", name ? name : "stderr");
+        fclose(uDebugFile);
     }
-    if (name!=NullString)	uDebugFile=	fopen(name,"w");
-    else			uDebugFile=	stderr;
-    if (uDebugFile==NULL) {
-	uDebugFile=	stderr;
-	return(False);
+    if (name != NullString)
+        uDebugFile = fopen(name, "w");
+    else
+        uDebugFile = stderr;
+    if (uDebugFile == NULL) {
+        uDebugFile = stderr;
+        return (False);
     }
-    return(True);
+    return (True);
 }
 
 void
-uDebug(char *s,...)
+uDebug(char *s, ...)
 {
-int	i;
-va_list ap;
+    int i;
+    va_list ap;
 
     va_start(ap, s);
-    for (i=(uDebugIndentLevel*uDebugIndentSize);i>0;i--) {
-	putc(' ',uDebugFile);
+    for (i = (uDebugIndentLevel * uDebugIndentSize); i > 0; i--) {
+        putc(' ', uDebugFile);
     }
-    vfprintf(uDebugFile,s,ap);
+    vfprintf(uDebugFile, s, ap);
     fflush(uDebugFile);
     va_end(ap);
     return;
 }
 
 void
-uDebugNOI(char *s,...)
+uDebugNOI(char *s, ...)
 {
-va_list ap;
+    va_list ap;
 
     va_start(ap, s);
-    vfprintf(uDebugFile,s,ap);
+    vfprintf(uDebugFile, s, ap);
     fflush(uDebugFile);
     va_end(ap);
     return;
@@ -195,31 +201,33 @@ va_list ap;
 
 /***====================================================================***/
 
-static	FILE	*errorFile=	NULL;
+static FILE *errorFile = NULL;
 
 Boolean
 uSetErrorFile(char *name)
 {
-    if ((errorFile!=NULL)&&(errorFile!=stderr)) {
-	fprintf(errorFile,"switching to %s\n",name?name:"stderr");
-	fclose(errorFile);
+    if ((errorFile != NULL) && (errorFile != stderr)) {
+        fprintf(errorFile, "switching to %s\n", name ? name : "stderr");
+        fclose(errorFile);
     }
-    if (name!=NullString)	errorFile=	fopen(name,"w");
-    else			errorFile=	stderr;
-    if (errorFile==NULL) {
-	errorFile=	stderr;
-	return(False);
+    if (name != NullString)
+        errorFile = fopen(name, "w");
+    else
+        errorFile = stderr;
+    if (errorFile == NULL) {
+        errorFile = stderr;
+        return (False);
     }
-    return(True);
+    return (True);
 }
 
 void
-uInformation(char *s,...)
+uInformation(char *s, ...)
 {
     va_list ap;
 
     va_start(ap, s);
-    vfprintf(errorFile,s,ap);
+    vfprintf(errorFile, s, ap);
     fflush(errorFile);
     va_end(ap);
     return;
@@ -228,13 +236,13 @@ uInformation(char *s,...)
 /***====================================================================***/
 
 void
-uAction(char *s,...)
+uAction(char *s, ...)
 {
     va_list ap;
 
     va_start(ap, s);
-    fprintf(errorFile,"                  ");
-    vfprintf(errorFile,s,ap);
+    fprintf(errorFile, "                  ");
+    vfprintf(errorFile, s, ap);
     fflush(errorFile);
     va_end(ap);
     return;
@@ -243,13 +251,13 @@ uAction(char *s,...)
 /***====================================================================***/
 
 void
-uWarning(char *s,...)
+uWarning(char *s, ...)
 {
     va_list ap;
 
     va_start(ap, s);
-    fprintf(errorFile,"Warning:          ");
-    vfprintf(errorFile,s,ap);
+    fprintf(errorFile, "Warning:          ");
+    vfprintf(errorFile, s, ap);
     fflush(errorFile);
     va_end(ap);
     return;
@@ -258,13 +266,13 @@ uWarning(char *s,...)
 /***====================================================================***/
 
 void
-uError(char *s,...)
+uError(char *s, ...)
 {
     va_list ap;
 
     va_start(ap, s);
-    fprintf(errorFile,"Error:            ");
-    vfprintf(errorFile,s,ap);
+    fprintf(errorFile, "Error:            ");
+    vfprintf(errorFile, s, ap);
     fflush(errorFile);
     va_end(ap);
     return;
@@ -273,14 +281,14 @@ uError(char *s,...)
 /***====================================================================***/
 
 void
-uFatalError(char *s,...)
+uFatalError(char *s, ...)
 {
     va_list ap;
 
     va_start(ap, s);
-    fprintf(errorFile,"Fatal Error:      ");
-    vfprintf(errorFile,s,ap);
-    fprintf(errorFile,"                  Exiting\n");
+    fprintf(errorFile, "Fatal Error:      ");
+    vfprintf(errorFile, s, ap);
+    fprintf(errorFile, "                  Exiting\n");
     fflush(errorFile);
     va_end(ap);
     exit(1);
@@ -290,13 +298,13 @@ uFatalError(char *s,...)
 /***====================================================================***/
 
 void
-uInternalError(char *s,...)
+uInternalError(char *s, ...)
 {
     va_list ap;
 
     va_start(ap, s);
-    fprintf(errorFile,"Internal error:   ");
-    vfprintf(errorFile,s,ap);
+    fprintf(errorFile, "Internal error:   ");
+    vfprintf(errorFile, s, ap);
     fflush(errorFile);
     va_end(ap);
     return;
@@ -308,12 +316,12 @@ uInternalError(char *s,...)
 char *
 uStringDup(char *str)
 {
-char *rtrn;
+    char *rtrn;
 
-    if (str==NULL)
-	return NULL;
-    rtrn= (char *)uAlloc(strlen(str)+1);
-    strcpy(rtrn,str);
+    if (str == NULL)
+        return NULL;
+    rtrn = (char *) uAlloc(strlen(str) + 1);
+    strcpy(rtrn, str);
     return rtrn;
 }
 #endif
@@ -322,24 +330,25 @@ char *rtrn;
 int
 uStrCaseCmp(char *str1, char *str2)
 {
-    char buf1[512],buf2[512];
+    char buf1[512], buf2[512];
     char c, *s;
+
     register int n;
 
-    for (n=0, s = buf1; (c = *str1++); n++) {
-	if (isupper(c))
-	    c = tolower(c);
-	if (n>510)
-	    break;
-	*s++ = c;
+    for (n = 0, s = buf1; (c = *str1++); n++) {
+        if (isupper(c))
+            c = tolower(c);
+        if (n > 510)
+            break;
+        *s++ = c;
     }
     *s = '\0';
-    for (n=0, s = buf2; (c = *str2++); n++) {
-	if (isupper(c))
-	    c = tolower(c);
-	if (n>510)
-	    break;
-	*s++ = c;
+    for (n = 0, s = buf2; (c = *str2++); n++) {
+        if (isupper(c))
+            c = tolower(c);
+        if (n > 510)
+            break;
+        *s++ = c;
     }
     *s = '\0';
     return (strcmp(buf1, buf2));
@@ -350,15 +359,19 @@ uStrCasePrefix(char *prefix, char *str)
 {
     char c1;
     char c2;
-    while (((c1=*prefix)!='\0')&&((c2=*str)!='\0')) {
-	if (isupper(c1))	c1= tolower(c1);
-	if (isupper(c2))	c2= tolower(c2);
-	if (c1!=c2)
-	    return 0;
-	prefix++; str++;
+
+    while (((c1 = *prefix) != '\0') && ((c2 = *str) != '\0')) {
+        if (isupper(c1))
+            c1 = tolower(c1);
+        if (isupper(c2))
+            c2 = tolower(c2);
+        if (c1 != c2)
+            return 0;
+        prefix++;
+        str++;
     }
-    if (c1!='\0')
-	return 0;
+    if (c1 != '\0')
+        return 0;
     return 1;
 }