diff options
author | Keith Packard <keithp@keithp.com> | 2012-03-21 12:55:09 -0700 |
---|---|---|
committer | Keith Packard <keithp@keithp.com> | 2012-03-21 13:54:42 -0700 |
commit | 9838b7032ea9792bec21af424c53c07078636d21 (patch) | |
tree | b72d0827dac50f0f3b8eab29b3b7639546d735d7 /hw/xfree86/parser/Video.c | |
parent | 75199129c603fc8567185ac31866c9518193cb78 (diff) |
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>
Diffstat (limited to 'hw/xfree86/parser/Video.c')
-rw-r--r-- | hw/xfree86/parser/Video.c | 346 |
1 files changed, 168 insertions, 178 deletions
diff --git a/hw/xfree86/parser/Video.c b/hw/xfree86/parser/Video.c index 19a5418b1..fc1f1e544 100644 --- a/hw/xfree86/parser/Video.c +++ b/hw/xfree86/parser/Video.c @@ -64,233 +64,223 @@ extern LexRec val; -static xf86ConfigSymTabRec VideoPortTab[] = -{ - {ENDSUBSECTION, "endsubsection"}, - {IDENTIFIER, "identifier"}, - {OPTION, "option"}, - {-1, ""}, +static xf86ConfigSymTabRec VideoPortTab[] = { + {ENDSUBSECTION, "endsubsection"}, + {IDENTIFIER, "identifier"}, + {OPTION, "option"}, + {-1, ""}, }; #define CLEANUP xf86freeVideoPortList static void -xf86freeVideoPortList (XF86ConfVideoPortPtr ptr) +xf86freeVideoPortList(XF86ConfVideoPortPtr ptr) { - XF86ConfVideoPortPtr prev; + XF86ConfVideoPortPtr prev; - while (ptr) - { - TestFree (ptr->vp_identifier); - TestFree (ptr->vp_comment); - xf86optionListFree (ptr->vp_option_lst); - prev = ptr; - ptr = ptr->list.next; - free (prev); - } + while (ptr) { + TestFree(ptr->vp_identifier); + TestFree(ptr->vp_comment); + xf86optionListFree(ptr->vp_option_lst); + prev = ptr; + ptr = ptr->list.next; + free(prev); + } } static XF86ConfVideoPortPtr -xf86parseVideoPortSubSection (void) +xf86parseVideoPortSubSection(void) { - int has_ident = FALSE; - int token; - parsePrologue (XF86ConfVideoPortPtr, XF86ConfVideoPortRec) + int has_ident = FALSE; + int token; + + parsePrologue(XF86ConfVideoPortPtr, XF86ConfVideoPortRec) - while ((token = xf86getToken (VideoPortTab)) != ENDSUBSECTION) - { - switch (token) - { - case COMMENT: - ptr->vp_comment = xf86addComment(ptr->vp_comment, val.str); - break; - case IDENTIFIER: - if (xf86getSubToken (&(ptr->vp_comment)) != STRING) - Error (QUOTE_MSG, "Identifier"); - if (has_ident == TRUE) - Error (MULTIPLE_MSG, "Identifier"); - ptr->vp_identifier = val.str; - has_ident = TRUE; - break; - case OPTION: - ptr->vp_option_lst = xf86parseOption(ptr->vp_option_lst); - break; + while ((token = xf86getToken(VideoPortTab)) != ENDSUBSECTION) { + switch (token) { + case COMMENT: + ptr->vp_comment = xf86addComment(ptr->vp_comment, val.str); + break; + case IDENTIFIER: + if (xf86getSubToken(&(ptr->vp_comment)) != STRING) + Error(QUOTE_MSG, "Identifier"); + if (has_ident == TRUE) + Error(MULTIPLE_MSG, "Identifier"); + ptr->vp_identifier = val.str; + has_ident = TRUE; + break; + case OPTION: + ptr->vp_option_lst = xf86parseOption(ptr->vp_option_lst); + break; - case EOF_TOKEN: - Error (UNEXPECTED_EOF_MSG); - break; - default: - Error (INVALID_KEYWORD_MSG, xf86tokenString ()); - break; - } - } + case EOF_TOKEN: + Error(UNEXPECTED_EOF_MSG); + break; + default: + Error(INVALID_KEYWORD_MSG, xf86tokenString()); + break; + } + } #ifdef DEBUG - printf ("VideoPort subsection parsed\n"); + printf("VideoPort subsection parsed\n"); #endif - return ptr; + return ptr; } #undef CLEANUP -static xf86ConfigSymTabRec VideoAdaptorTab[] = -{ - {ENDSECTION, "endsection"}, - {IDENTIFIER, "identifier"}, - {VENDOR, "vendorname"}, - {BOARD, "boardname"}, - {BUSID, "busid"}, - {DRIVER, "driver"}, - {OPTION, "option"}, - {SUBSECTION, "subsection"}, - {-1, ""}, +static xf86ConfigSymTabRec VideoAdaptorTab[] = { + {ENDSECTION, "endsection"}, + {IDENTIFIER, "identifier"}, + {VENDOR, "vendorname"}, + {BOARD, "boardname"}, + {BUSID, "busid"}, + {DRIVER, "driver"}, + {OPTION, "option"}, + {SUBSECTION, "subsection"}, + {-1, ""}, }; #define CLEANUP xf86freeVideoAdaptorList XF86ConfVideoAdaptorPtr -xf86parseVideoAdaptorSection (void) +xf86parseVideoAdaptorSection(void) { - int has_ident = FALSE; - int token; + int has_ident = FALSE; + int token; - parsePrologue (XF86ConfVideoAdaptorPtr, XF86ConfVideoAdaptorRec) + parsePrologue(XF86ConfVideoAdaptorPtr, XF86ConfVideoAdaptorRec) - while ((token = xf86getToken (VideoAdaptorTab)) != ENDSECTION) - { - switch (token) - { - case COMMENT: - ptr->va_comment = xf86addComment(ptr->va_comment, val.str); - break; - case IDENTIFIER: - if (xf86getSubToken (&(ptr->va_comment)) != STRING) - Error (QUOTE_MSG, "Identifier"); - ptr->va_identifier = val.str; - if (has_ident == TRUE) - Error (MULTIPLE_MSG, "Identifier"); - has_ident = TRUE; - break; - case VENDOR: - if (xf86getSubToken (&(ptr->va_comment)) != STRING) - Error (QUOTE_MSG, "Vendor"); - ptr->va_vendor = val.str; - break; - case BOARD: - if (xf86getSubToken (&(ptr->va_comment)) != STRING) - Error (QUOTE_MSG, "Board"); - ptr->va_board = val.str; - break; - case BUSID: - if (xf86getSubToken (&(ptr->va_comment)) != STRING) - Error (QUOTE_MSG, "BusID"); - ptr->va_busid = val.str; - break; - case DRIVER: - if (xf86getSubToken (&(ptr->va_comment)) != STRING) - Error (QUOTE_MSG, "Driver"); - ptr->va_driver = val.str; - break; - case OPTION: - ptr->va_option_lst = xf86parseOption(ptr->va_option_lst); - break; - case SUBSECTION: - if (xf86getSubToken (&(ptr->va_comment)) != STRING) - Error (QUOTE_MSG, "SubSection"); - { - HANDLE_LIST (va_port_lst, xf86parseVideoPortSubSection, - XF86ConfVideoPortPtr); - } - break; + while ((token = xf86getToken(VideoAdaptorTab)) != ENDSECTION) { + switch (token) { + case COMMENT: + ptr->va_comment = xf86addComment(ptr->va_comment, val.str); + break; + case IDENTIFIER: + if (xf86getSubToken(&(ptr->va_comment)) != STRING) + Error(QUOTE_MSG, "Identifier"); + ptr->va_identifier = val.str; + if (has_ident == TRUE) + Error(MULTIPLE_MSG, "Identifier"); + has_ident = TRUE; + break; + case VENDOR: + if (xf86getSubToken(&(ptr->va_comment)) != STRING) + Error(QUOTE_MSG, "Vendor"); + ptr->va_vendor = val.str; + break; + case BOARD: + if (xf86getSubToken(&(ptr->va_comment)) != STRING) + Error(QUOTE_MSG, "Board"); + ptr->va_board = val.str; + break; + case BUSID: + if (xf86getSubToken(&(ptr->va_comment)) != STRING) + Error(QUOTE_MSG, "BusID"); + ptr->va_busid = val.str; + break; + case DRIVER: + if (xf86getSubToken(&(ptr->va_comment)) != STRING) + Error(QUOTE_MSG, "Driver"); + ptr->va_driver = val.str; + break; + case OPTION: + ptr->va_option_lst = xf86parseOption(ptr->va_option_lst); + break; + case SUBSECTION: + if (xf86getSubToken(&(ptr->va_comment)) != STRING) + Error(QUOTE_MSG, "SubSection"); + { + HANDLE_LIST(va_port_lst, xf86parseVideoPortSubSection, + XF86ConfVideoPortPtr); + } + break; - case EOF_TOKEN: - Error (UNEXPECTED_EOF_MSG); - break; - default: - Error (INVALID_KEYWORD_MSG, xf86tokenString ()); - break; - } - } + case EOF_TOKEN: + Error(UNEXPECTED_EOF_MSG); + break; + default: + Error(INVALID_KEYWORD_MSG, xf86tokenString()); + break; + } + } - if (!has_ident) - Error (NO_IDENT_MSG); + if (!has_ident) + Error(NO_IDENT_MSG); #ifdef DEBUG - printf ("VideoAdaptor section parsed\n"); + printf("VideoAdaptor section parsed\n"); #endif - return ptr; + return ptr; } void -xf86printVideoAdaptorSection (FILE * cf, XF86ConfVideoAdaptorPtr ptr) +xf86printVideoAdaptorSection(FILE * cf, XF86ConfVideoAdaptorPtr ptr) { - XF86ConfVideoPortPtr pptr; + XF86ConfVideoPortPtr pptr; - while (ptr) - { - fprintf (cf, "Section \"VideoAdaptor\"\n"); - if (ptr->va_comment) - fprintf (cf, "%s", ptr->va_comment); - if (ptr->va_identifier) - fprintf (cf, "\tIdentifier \"%s\"\n", ptr->va_identifier); - if (ptr->va_vendor) - fprintf (cf, "\tVendorName \"%s\"\n", ptr->va_vendor); - if (ptr->va_board) - fprintf (cf, "\tBoardName \"%s\"\n", ptr->va_board); - if (ptr->va_busid) - fprintf (cf, "\tBusID \"%s\"\n", ptr->va_busid); - if (ptr->va_driver) - fprintf (cf, "\tDriver \"%s\"\n", ptr->va_driver); - xf86printOptionList(cf, ptr->va_option_lst, 1); - for (pptr = ptr->va_port_lst; pptr; pptr = pptr->list.next) - { - fprintf (cf, "\tSubSection \"VideoPort\"\n"); - if (pptr->vp_comment) - fprintf (cf, "%s", pptr->vp_comment); - if (pptr->vp_identifier) - fprintf (cf, "\t\tIdentifier \"%s\"\n", pptr->vp_identifier); - xf86printOptionList(cf, pptr->vp_option_lst, 2); - fprintf (cf, "\tEndSubSection\n"); - } - fprintf (cf, "EndSection\n\n"); - ptr = ptr->list.next; - } + while (ptr) { + fprintf(cf, "Section \"VideoAdaptor\"\n"); + if (ptr->va_comment) + fprintf(cf, "%s", ptr->va_comment); + if (ptr->va_identifier) + fprintf(cf, "\tIdentifier \"%s\"\n", ptr->va_identifier); + if (ptr->va_vendor) + fprintf(cf, "\tVendorName \"%s\"\n", ptr->va_vendor); + if (ptr->va_board) + fprintf(cf, "\tBoardName \"%s\"\n", ptr->va_board); + if (ptr->va_busid) + fprintf(cf, "\tBusID \"%s\"\n", ptr->va_busid); + if (ptr->va_driver) + fprintf(cf, "\tDriver \"%s\"\n", ptr->va_driver); + xf86printOptionList(cf, ptr->va_option_lst, 1); + for (pptr = ptr->va_port_lst; pptr; pptr = pptr->list.next) { + fprintf(cf, "\tSubSection \"VideoPort\"\n"); + if (pptr->vp_comment) + fprintf(cf, "%s", pptr->vp_comment); + if (pptr->vp_identifier) + fprintf(cf, "\t\tIdentifier \"%s\"\n", pptr->vp_identifier); + xf86printOptionList(cf, pptr->vp_option_lst, 2); + fprintf(cf, "\tEndSubSection\n"); + } + fprintf(cf, "EndSection\n\n"); + ptr = ptr->list.next; + } } void -xf86freeVideoAdaptorList (XF86ConfVideoAdaptorPtr ptr) +xf86freeVideoAdaptorList(XF86ConfVideoAdaptorPtr ptr) { - XF86ConfVideoAdaptorPtr prev; + XF86ConfVideoAdaptorPtr prev; - while (ptr) - { - TestFree (ptr->va_identifier); - TestFree (ptr->va_vendor); - TestFree (ptr->va_board); - TestFree (ptr->va_busid); - TestFree (ptr->va_driver); - TestFree (ptr->va_fwdref); - TestFree (ptr->va_comment); - xf86freeVideoPortList (ptr->va_port_lst); - xf86optionListFree (ptr->va_option_lst); - prev = ptr; - ptr = ptr->list.next; - free (prev); - } + while (ptr) { + TestFree(ptr->va_identifier); + TestFree(ptr->va_vendor); + TestFree(ptr->va_board); + TestFree(ptr->va_busid); + TestFree(ptr->va_driver); + TestFree(ptr->va_fwdref); + TestFree(ptr->va_comment); + xf86freeVideoPortList(ptr->va_port_lst); + xf86optionListFree(ptr->va_option_lst); + prev = ptr; + ptr = ptr->list.next; + free(prev); + } } XF86ConfVideoAdaptorPtr -xf86findVideoAdaptor (const char *ident, XF86ConfVideoAdaptorPtr p) +xf86findVideoAdaptor(const char *ident, XF86ConfVideoAdaptorPtr p) { - while (p) - { - if (xf86nameCompare (ident, p->va_identifier) == 0) - return p; + while (p) { + if (xf86nameCompare(ident, p->va_identifier) == 0) + return p; - p = p->list.next; - } - return NULL; + p = p->list.next; + } + return NULL; } |