aboutsummaryrefslogtreecommitdiff
path: root/xkbcomp/utils.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-07-25 18:22:39 +0000
committermarha <marha@users.sourceforge.net>2009-07-25 18:22:39 +0000
commitdc3c299dd0995549e2a6973ca0f25b254afd38a5 (patch)
tree4e041ba8c2c1348b14e7a28c803d860373747a04 /xkbcomp/utils.c
parentcd50a4bbac9375d3cd460bbdf88395f802609daf (diff)
downloadvcxsrv-dc3c299dd0995549e2a6973ca0f25b254afd38a5.tar.gz
vcxsrv-dc3c299dd0995549e2a6973ca0f25b254afd38a5.tar.bz2
vcxsrv-dc3c299dd0995549e2a6973ca0f25b254afd38a5.zip
Added xkbcomp-1.1.0.tar.gz
Diffstat (limited to 'xkbcomp/utils.c')
-rw-r--r--xkbcomp/utils.c335
1 files changed, 179 insertions, 156 deletions
diff --git a/xkbcomp/utils.c b/xkbcomp/utils.c
index aa4dc8987..55efbe11f 100644
--- a/xkbcomp/utils.c
+++ b/xkbcomp/utils.c
@@ -1,11 +1,10 @@
/*\
- * $Xorg: utils.c,v 1.4 2000/08/17 19:54:33 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.
@@ -24,8 +23,7 @@
* documentation, and that the name of Digital Equipment Corporation not be
* used in advertising or publicity pertaining to distribution of the
* software without specific, written prior permission.
- \*/
-/* $XFree86: xc/programs/xkbcomp/utils.c,v 3.6 2001/07/25 15:05:24 dawes Exp $ */
+ \*/
#include "utils.h"
#include <ctype.h>
@@ -37,43 +35,46 @@
Opaque
uAlloc(unsigned size)
{
- return((Opaque)malloc(size));
+ return ((Opaque) malloc(size));
}
/***====================================================================***/
Opaque
-uCalloc(unsigned n,unsigned size)
+uCalloc(unsigned n, unsigned size)
{
- return((Opaque)calloc(n,size));
+ return ((Opaque) calloc(n, size));
}
/***====================================================================***/
Opaque
-uRealloc(Opaque old,unsigned newSize)
+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));
}
/***====================================================================***/
Opaque
-uRecalloc(Opaque old,unsigned nOld,unsigned nNew,unsigned itemSize)
+uRecalloc(Opaque old, unsigned nOld, unsigned nNew, unsigned itemSize)
{
-char *rtrn;
-
- 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);
- }
+ char *rtrn;
+
+ 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);
+ }
}
- return (Opaque)rtrn;
+ return (Opaque) rtrn;
}
/***====================================================================***/
@@ -81,8 +82,8 @@ char *rtrn;
void
uFree(Opaque ptr)
{
- if (ptr!=(Opaque)NULL)
- free((char *)ptr);
+ if (ptr != (Opaque) NULL)
+ free((char *) ptr);
return;
}
@@ -90,51 +91,58 @@ uFree(Opaque ptr)
/*** FUNCTION ENTRY TRACKING ***/
/***====================================================================***/
-static FILE *entryFile= NULL;
- int uEntryLevel;
+static FILE *entryFile = NULL;
+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 args;
+ int i;
+ va_list args;
- for (i=0;i<uEntryLevel;i++) {
- putc(' ',entryFile);
+ for (i = 0; i < uEntryLevel; i++)
+ {
+ putc(' ', entryFile);
}
va_start(args, s);
- vfprintf(entryFile,s,args);
+ vfprintf(entryFile, s, args);
va_end(args);
- uEntryLevel+= l;
+ uEntryLevel += l;
}
void
-uExit(int l,char *rtVal)
+uExit(int l, char *rtVal)
{
-int i;
-
- uEntryLevel-= l;
- if (uEntryLevel<0) uEntryLevel= 0;
- for (i=0;i<uEntryLevel;i++) {
- putc(' ',entryFile);
+ int i;
+
+ uEntryLevel -= l;
+ if (uEntryLevel < 0)
+ uEntryLevel = 0;
+ for (i = 0; i < uEntryLevel; i++)
+ {
+ putc(' ', entryFile);
}
- fprintf(entryFile,"---> %p\n",rtVal);
+ fprintf(entryFile, "---> %p\n", rtVal);
return;
}
@@ -142,83 +150,92 @@ 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 args;
+ int i;
+ va_list args;
- for (i=(uDebugIndentLevel*uDebugIndentSize);i>0;i--) {
- putc(' ',uDebugFile);
+ for (i = (uDebugIndentLevel * uDebugIndentSize); i > 0; i--)
+ {
+ putc(' ', uDebugFile);
}
va_start(args, s);
- vfprintf(uDebugFile,s,args);
+ vfprintf(uDebugFile, s, args);
va_end(args);
fflush(uDebugFile);
}
void
-uDebugNOI(char *s,...)
+uDebugNOI(char *s, ...)
{
-va_list args;
+ va_list args;
va_start(args, s);
- vfprintf(uDebugFile,s,args);
+ vfprintf(uDebugFile, s, args);
va_end(args);
fflush(uDebugFile);
}
/***====================================================================***/
-static FILE *errorFile= NULL;
-static int outCount= 0;
-static char *preMsg= NULL;
-static char *postMsg= NULL;
-static char *prefix= NULL;
+static FILE *errorFile = NULL;
+static int outCount = 0;
+static char *preMsg = NULL;
+static char *postMsg = NULL;
+static char *prefix = 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(const char *s, ...)
{
-va_list args;
+ va_list args;
va_start(args, s);
- vfprintf(errorFile,s,args);
+ vfprintf(errorFile, s, args);
va_end(args);
fflush(errorFile);
}
@@ -228,13 +245,13 @@ va_list args;
void
uAction(const char *s, ...)
{
-va_list args;
+ va_list args;
- if (prefix!=NULL)
- fprintf(errorFile,"%s",prefix);
- fprintf(errorFile," ");
+ if (prefix != NULL)
+ fprintf(errorFile, "%s", prefix);
+ fprintf(errorFile, " ");
va_start(args, s);
- vfprintf(errorFile,s,args);
+ vfprintf(errorFile, s, args);
va_end(args);
fflush(errorFile);
}
@@ -244,15 +261,15 @@ va_list args;
void
uWarning(const char *s, ...)
{
-va_list args;
+ va_list args;
- if ((outCount==0)&&(preMsg!=NULL))
- fprintf(errorFile,"%s\n",preMsg);
- if (prefix!=NULL)
- fprintf(errorFile,"%s",prefix);
- fprintf(errorFile,"Warning: ");
+ if ((outCount == 0) && (preMsg != NULL))
+ fprintf(errorFile, "%s\n", preMsg);
+ if (prefix != NULL)
+ fprintf(errorFile, "%s", prefix);
+ fprintf(errorFile, "Warning: ");
va_start(args, s);
- vfprintf(errorFile,s,args);
+ vfprintf(errorFile, s, args);
va_end(args);
fflush(errorFile);
outCount++;
@@ -263,15 +280,15 @@ va_list args;
void
uError(const char *s, ...)
{
-va_list args;
+ va_list args;
- if ((outCount==0)&&(preMsg!=NULL))
- fprintf(errorFile,"%s\n",preMsg);
- if (prefix!=NULL)
- fprintf(errorFile,"%s",prefix);
- fprintf(errorFile,"Error: ");
+ if ((outCount == 0) && (preMsg != NULL))
+ fprintf(errorFile, "%s\n", preMsg);
+ if (prefix != NULL)
+ fprintf(errorFile, "%s", prefix);
+ fprintf(errorFile, "Error: ");
va_start(args, s);
- vfprintf(errorFile,s,args);
+ vfprintf(errorFile, s, args);
va_end(args);
fflush(errorFile);
outCount++;
@@ -282,17 +299,17 @@ va_list args;
void
uFatalError(const char *s, ...)
{
-va_list args;
+ va_list args;
- if ((outCount==0)&&(preMsg!=NULL))
- fprintf(errorFile,"%s\n",preMsg);
- if (prefix!=NULL)
- fprintf(errorFile,"%s",prefix);
- fprintf(errorFile,"Fatal Error: ");
+ if ((outCount == 0) && (preMsg != NULL))
+ fprintf(errorFile, "%s\n", preMsg);
+ if (prefix != NULL)
+ fprintf(errorFile, "%s", prefix);
+ fprintf(errorFile, "Fatal Error: ");
va_start(args, s);
- vfprintf(errorFile,s,args);
+ vfprintf(errorFile, s, args);
va_end(args);
- fprintf(errorFile," Exiting\n");
+ fprintf(errorFile, " Exiting\n");
fflush(errorFile);
outCount++;
exit(1);
@@ -304,15 +321,15 @@ va_list args;
void
uInternalError(const char *s, ...)
{
-va_list args;
+ va_list args;
- if ((outCount==0)&&(preMsg!=NULL))
- fprintf(errorFile,"%s\n",preMsg);
- if (prefix!=NULL)
- fprintf(errorFile,"%s",prefix);
- fprintf(errorFile,"Internal error: ");
+ if ((outCount == 0) && (preMsg != NULL))
+ fprintf(errorFile, "%s\n", preMsg);
+ if (prefix != NULL)
+ fprintf(errorFile, "%s", prefix);
+ fprintf(errorFile, "Internal error: ");
va_start(args, s);
- vfprintf(errorFile,s,args);
+ vfprintf(errorFile, s, args);
va_end(args);
fflush(errorFile);
outCount++;
@@ -321,30 +338,30 @@ va_list args;
void
uSetPreErrorMessage(char *msg)
{
- outCount= 0;
- preMsg= msg;
+ outCount = 0;
+ preMsg = msg;
return;
}
void
uSetPostErrorMessage(char *msg)
{
- postMsg= msg;
+ postMsg = msg;
return;
}
void
uSetErrorPrefix(char *pre)
{
- prefix= pre;
+ prefix = pre;
return;
}
void
uFinishUp(void)
{
- if ((outCount>0)&&(postMsg!=NULL))
- fprintf(errorFile,"%s\n",postMsg);
+ if ((outCount > 0) && (postMsg != NULL))
+ fprintf(errorFile, "%s\n", postMsg);
return;
}
@@ -354,12 +371,12 @@ uFinishUp(void)
char *
uStringDup(const 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
@@ -368,24 +385,26 @@ char *rtrn;
int
uStrCaseCmp(const char *str1, const 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));
@@ -396,15 +415,19 @@ uStrCasePrefix(const char *my_prefix, char *str)
{
char c1;
char c2;
- while (((c1=*my_prefix)!='\0')&&((c2=*str)!='\0')) {
- if (isupper(c1)) c1= tolower(c1);
- if (isupper(c2)) c2= tolower(c2);
- if (c1!=c2)
- return 0;
- my_prefix++; str++;
+ while (((c1 = *my_prefix) != '\0') && ((c2 = *str) != '\0'))
+ {
+ if (isupper(c1))
+ c1 = tolower(c1);
+ if (isupper(c2))
+ c2 = tolower(c2);
+ if (c1 != c2)
+ return 0;
+ my_prefix++;
+ str++;
}
- if (c1!='\0')
- return 0;
+ if (c1 != '\0')
+ return 0;
return 1;
}