mirror of
https://github.com/X11Libre/xserver.git
synced 2026-10-09 23:22:22 +00:00
Introduce a consistent coding style
This is strictly the application of the script 'x-indent-all.sh' from util/modular. Compared to the patch that Daniel posted in January, I've added a few indent flags: -bap -psl -T PrivatePtr -T pmWait -T _XFUNCPROTOBEGIN -T _XFUNCPROTOEND -T _X_EXPORT The typedefs were needed to make the output of sdksyms.sh match the previous output, otherwise, the code is formatted badly enough that sdksyms.sh generates incorrect output. The generated code was compared with the previous version and found to be essentially identical -- "assert" line numbers and BUILD_TIME were the only differences found. The comparison was done with this script: dir1=$1 dir2=$2 for dir in $dir1 $dir2; do (cd $dir && find . -name '*.o' | while read file; do dir=`dirname $file` base=`basename $file .o` dump=$dir/$base.dump objdump -d $file > $dump done) done find $dir1 -name '*.dump' | while read dump; do otherdump=`echo $dump | sed "s;$dir1;$dir2;"` diff -u $dump $otherdump done Signed-off-by: Keith Packard <keithp@keithp.com> Acked-by: Daniel Stone <daniel@fooishbar.org> Acked-by: Alan Coopersmith <alan.coopersmith@oracle.com>
This commit is contained in:
Keith Packard
parent
75199129c6
commit
9838b7032e
1258 changed files with 264655 additions and 259938 deletions
|
|
@ -52,7 +52,6 @@
|
|||
* authorization from the copyright holder(s) and author(s).
|
||||
*/
|
||||
|
||||
|
||||
/* View/edit this file with tab stops set to 4 */
|
||||
|
||||
#ifdef HAVE_XORG_CONFIG_H
|
||||
|
|
@ -66,168 +65,161 @@
|
|||
|
||||
extern LexRec val;
|
||||
|
||||
static xf86ConfigSymTabRec PointerTab[] =
|
||||
{
|
||||
{PROTOCOL, "protocol"},
|
||||
{EMULATE3, "emulate3buttons"},
|
||||
{EM3TIMEOUT, "emulate3timeout"},
|
||||
{ENDSUBSECTION, "endsubsection"},
|
||||
{ENDSECTION, "endsection"},
|
||||
{PDEVICE, "device"},
|
||||
{PDEVICE, "port"},
|
||||
{BAUDRATE, "baudrate"},
|
||||
{SAMPLERATE, "samplerate"},
|
||||
{CLEARDTR, "cleardtr"},
|
||||
{CLEARRTS, "clearrts"},
|
||||
{CHORDMIDDLE, "chordmiddle"},
|
||||
{PRESOLUTION, "resolution"},
|
||||
{DEVICE_NAME, "devicename"},
|
||||
{ALWAYSCORE, "alwayscore"},
|
||||
{PBUTTONS, "buttons"},
|
||||
{ZAXISMAPPING, "zaxismapping"},
|
||||
{-1, ""},
|
||||
static xf86ConfigSymTabRec PointerTab[] = {
|
||||
{PROTOCOL, "protocol"},
|
||||
{EMULATE3, "emulate3buttons"},
|
||||
{EM3TIMEOUT, "emulate3timeout"},
|
||||
{ENDSUBSECTION, "endsubsection"},
|
||||
{ENDSECTION, "endsection"},
|
||||
{PDEVICE, "device"},
|
||||
{PDEVICE, "port"},
|
||||
{BAUDRATE, "baudrate"},
|
||||
{SAMPLERATE, "samplerate"},
|
||||
{CLEARDTR, "cleardtr"},
|
||||
{CLEARRTS, "clearrts"},
|
||||
{CHORDMIDDLE, "chordmiddle"},
|
||||
{PRESOLUTION, "resolution"},
|
||||
{DEVICE_NAME, "devicename"},
|
||||
{ALWAYSCORE, "alwayscore"},
|
||||
{PBUTTONS, "buttons"},
|
||||
{ZAXISMAPPING, "zaxismapping"},
|
||||
{-1, ""},
|
||||
};
|
||||
|
||||
static xf86ConfigSymTabRec ZMapTab[] =
|
||||
{
|
||||
{XAXIS, "x"},
|
||||
{YAXIS, "y"},
|
||||
{-1, ""},
|
||||
static xf86ConfigSymTabRec ZMapTab[] = {
|
||||
{XAXIS, "x"},
|
||||
{YAXIS, "y"},
|
||||
{-1, ""},
|
||||
};
|
||||
|
||||
#define CLEANUP xf86freeInputList
|
||||
|
||||
XF86ConfInputPtr
|
||||
xf86parsePointerSection (void)
|
||||
xf86parsePointerSection(void)
|
||||
{
|
||||
char *s;
|
||||
unsigned long val1;
|
||||
int token;
|
||||
parsePrologue (XF86ConfInputPtr, XF86ConfInputRec)
|
||||
char *s;
|
||||
unsigned long val1;
|
||||
int token;
|
||||
|
||||
while ((token = xf86getToken (PointerTab)) != ENDSECTION)
|
||||
{
|
||||
switch (token)
|
||||
{
|
||||
case COMMENT:
|
||||
ptr->inp_comment = xf86addComment(ptr->inp_comment, val.str);
|
||||
break;
|
||||
case PROTOCOL:
|
||||
if (xf86getSubToken (&(ptr->inp_comment)) != STRING)
|
||||
Error (QUOTE_MSG, "Protocol");
|
||||
ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
|
||||
strdup("Protocol"),
|
||||
val.str);
|
||||
break;
|
||||
case PDEVICE:
|
||||
if (xf86getSubToken (&(ptr->inp_comment)) != STRING)
|
||||
Error (QUOTE_MSG, "Device");
|
||||
ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
|
||||
strdup("Device"),
|
||||
val.str);
|
||||
break;
|
||||
case EMULATE3:
|
||||
ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
|
||||
strdup("Emulate3Buttons"),
|
||||
NULL);
|
||||
break;
|
||||
case EM3TIMEOUT:
|
||||
if (xf86getSubToken (&(ptr->inp_comment)) != NUMBER || val.num < 0)
|
||||
Error (POSITIVE_INT_MSG, "Emulate3Timeout");
|
||||
s = xf86uLongToString(val.num);
|
||||
ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
|
||||
strdup("Emulate3Timeout"),
|
||||
s);
|
||||
break;
|
||||
case CHORDMIDDLE:
|
||||
ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
|
||||
strdup("ChordMiddle"),
|
||||
NULL);
|
||||
break;
|
||||
case PBUTTONS:
|
||||
if (xf86getSubToken (&(ptr->inp_comment)) != NUMBER || val.num < 0)
|
||||
Error (POSITIVE_INT_MSG, "Buttons");
|
||||
s = xf86uLongToString(val.num);
|
||||
ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
|
||||
strdup("Buttons"), s);
|
||||
break;
|
||||
case BAUDRATE:
|
||||
if (xf86getSubToken (&(ptr->inp_comment)) != NUMBER || val.num < 0)
|
||||
Error (POSITIVE_INT_MSG, "BaudRate");
|
||||
s = xf86uLongToString(val.num);
|
||||
ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
|
||||
strdup("BaudRate"), s);
|
||||
break;
|
||||
case SAMPLERATE:
|
||||
if (xf86getSubToken (&(ptr->inp_comment)) != NUMBER || val.num < 0)
|
||||
Error (POSITIVE_INT_MSG, "SampleRate");
|
||||
s = xf86uLongToString(val.num);
|
||||
ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
|
||||
strdup("SampleRate"), s);
|
||||
break;
|
||||
case PRESOLUTION:
|
||||
if (xf86getSubToken (&(ptr->inp_comment)) != NUMBER || val.num < 0)
|
||||
Error (POSITIVE_INT_MSG, "Resolution");
|
||||
s = xf86uLongToString(val.num);
|
||||
ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
|
||||
strdup("Resolution"), s);
|
||||
break;
|
||||
case CLEARDTR:
|
||||
ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
|
||||
strdup("ClearDTR"), NULL);
|
||||
break;
|
||||
case CLEARRTS:
|
||||
ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
|
||||
strdup("ClearRTS"), NULL);
|
||||
break;
|
||||
case ZAXISMAPPING:
|
||||
switch (xf86getToken(ZMapTab)) {
|
||||
case NUMBER:
|
||||
if (val.num < 0)
|
||||
Error (ZAXISMAPPING_MSG);
|
||||
val1 = val.num;
|
||||
if (xf86getSubToken (&(ptr->inp_comment)) != NUMBER || val.num < 0) {
|
||||
Error (ZAXISMAPPING_MSG);
|
||||
}
|
||||
if (asprintf(&s, "%lu %u", val1, val.num) == -1)
|
||||
s = NULL;
|
||||
break;
|
||||
case XAXIS:
|
||||
s = strdup("x");
|
||||
break;
|
||||
case YAXIS:
|
||||
s = strdup("y");
|
||||
break;
|
||||
default:
|
||||
Error (ZAXISMAPPING_MSG);
|
||||
break;
|
||||
}
|
||||
ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
|
||||
strdup("ZAxisMapping"),
|
||||
s);
|
||||
break;
|
||||
case ALWAYSCORE:
|
||||
break;
|
||||
case EOF_TOKEN:
|
||||
Error (UNEXPECTED_EOF_MSG);
|
||||
break;
|
||||
default:
|
||||
Error (INVALID_KEYWORD_MSG, xf86tokenString ());
|
||||
break;
|
||||
}
|
||||
}
|
||||
parsePrologue(XF86ConfInputPtr, XF86ConfInputRec)
|
||||
|
||||
ptr->inp_identifier = strdup(CONF_IMPLICIT_POINTER);
|
||||
ptr->inp_driver = strdup("mouse");
|
||||
ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
|
||||
strdup("CorePointer"), NULL);
|
||||
while ((token = xf86getToken(PointerTab)) != ENDSECTION) {
|
||||
switch (token) {
|
||||
case COMMENT:
|
||||
ptr->inp_comment = xf86addComment(ptr->inp_comment, val.str);
|
||||
break;
|
||||
case PROTOCOL:
|
||||
if (xf86getSubToken(&(ptr->inp_comment)) != STRING)
|
||||
Error(QUOTE_MSG, "Protocol");
|
||||
ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
|
||||
strdup("Protocol"), val.str);
|
||||
break;
|
||||
case PDEVICE:
|
||||
if (xf86getSubToken(&(ptr->inp_comment)) != STRING)
|
||||
Error(QUOTE_MSG, "Device");
|
||||
ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
|
||||
strdup("Device"), val.str);
|
||||
break;
|
||||
case EMULATE3:
|
||||
ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
|
||||
strdup("Emulate3Buttons"),
|
||||
NULL);
|
||||
break;
|
||||
case EM3TIMEOUT:
|
||||
if (xf86getSubToken(&(ptr->inp_comment)) != NUMBER || val.num < 0)
|
||||
Error(POSITIVE_INT_MSG, "Emulate3Timeout");
|
||||
s = xf86uLongToString(val.num);
|
||||
ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
|
||||
strdup("Emulate3Timeout"),
|
||||
s);
|
||||
break;
|
||||
case CHORDMIDDLE:
|
||||
ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
|
||||
strdup("ChordMiddle"), NULL);
|
||||
break;
|
||||
case PBUTTONS:
|
||||
if (xf86getSubToken(&(ptr->inp_comment)) != NUMBER || val.num < 0)
|
||||
Error(POSITIVE_INT_MSG, "Buttons");
|
||||
s = xf86uLongToString(val.num);
|
||||
ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
|
||||
strdup("Buttons"), s);
|
||||
break;
|
||||
case BAUDRATE:
|
||||
if (xf86getSubToken(&(ptr->inp_comment)) != NUMBER || val.num < 0)
|
||||
Error(POSITIVE_INT_MSG, "BaudRate");
|
||||
s = xf86uLongToString(val.num);
|
||||
ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
|
||||
strdup("BaudRate"), s);
|
||||
break;
|
||||
case SAMPLERATE:
|
||||
if (xf86getSubToken(&(ptr->inp_comment)) != NUMBER || val.num < 0)
|
||||
Error(POSITIVE_INT_MSG, "SampleRate");
|
||||
s = xf86uLongToString(val.num);
|
||||
ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
|
||||
strdup("SampleRate"), s);
|
||||
break;
|
||||
case PRESOLUTION:
|
||||
if (xf86getSubToken(&(ptr->inp_comment)) != NUMBER || val.num < 0)
|
||||
Error(POSITIVE_INT_MSG, "Resolution");
|
||||
s = xf86uLongToString(val.num);
|
||||
ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
|
||||
strdup("Resolution"), s);
|
||||
break;
|
||||
case CLEARDTR:
|
||||
ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
|
||||
strdup("ClearDTR"), NULL);
|
||||
break;
|
||||
case CLEARRTS:
|
||||
ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
|
||||
strdup("ClearRTS"), NULL);
|
||||
break;
|
||||
case ZAXISMAPPING:
|
||||
switch (xf86getToken(ZMapTab)) {
|
||||
case NUMBER:
|
||||
if (val.num < 0)
|
||||
Error(ZAXISMAPPING_MSG);
|
||||
val1 = val.num;
|
||||
if (xf86getSubToken(&(ptr->inp_comment)) != NUMBER ||
|
||||
val.num < 0) {
|
||||
Error(ZAXISMAPPING_MSG);
|
||||
}
|
||||
if (asprintf(&s, "%lu %u", val1, val.num) == -1)
|
||||
s = NULL;
|
||||
break;
|
||||
case XAXIS:
|
||||
s = strdup("x");
|
||||
break;
|
||||
case YAXIS:
|
||||
s = strdup("y");
|
||||
break;
|
||||
default:
|
||||
Error(ZAXISMAPPING_MSG);
|
||||
break;
|
||||
}
|
||||
ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
|
||||
strdup("ZAxisMapping"), s);
|
||||
break;
|
||||
case ALWAYSCORE:
|
||||
break;
|
||||
case EOF_TOKEN:
|
||||
Error(UNEXPECTED_EOF_MSG);
|
||||
break;
|
||||
default:
|
||||
Error(INVALID_KEYWORD_MSG, xf86tokenString());
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
ptr->inp_identifier = strdup(CONF_IMPLICIT_POINTER);
|
||||
ptr->inp_driver = strdup("mouse");
|
||||
ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
|
||||
strdup("CorePointer"), NULL);
|
||||
|
||||
#ifdef DEBUG
|
||||
printf ("Pointer section parsed\n");
|
||||
printf("Pointer section parsed\n");
|
||||
#endif
|
||||
|
||||
return ptr;
|
||||
return ptr;
|
||||
}
|
||||
|
||||
#undef CLEANUP
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue