frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xfree86: Fix up some bad indentation 

indent(1) gets confused by function-like macros with no trailing
semicolon, which is fair enough really.

Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Adam Jackson 2016-04-13 15:58:33 -04:00
parent 5c577da5f3
commit d7879c4672
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
hw/xfree86/common/xf86Configure.c
View File

@ -157,7 +157,7 @@ configureInputSection(void)
{ {
XF86ConfInputPtr mouse = NULL; XF86ConfInputPtr mouse = NULL;
parsePrologue(XF86ConfInputPtr, XF86ConfInputRec) parsePrologue(XF86ConfInputPtr, XF86ConfInputRec);
ptr->inp_identifier = xnfstrdup("Keyboard0"); ptr->inp_identifier = xnfstrdup("Keyboard0");
ptr->inp_driver = xnfstrdup("kbd"); ptr->inp_driver = xnfstrdup("kbd");
@ -196,7 +196,7 @@ configureScreenSection(int screennum)
int i; int i;
int depths[] = { 1, 4, 8, 15, 16, 24 /*, 32 */ }; int depths[] = { 1, 4, 8, 15, 16, 24 /*, 32 */ };
char *tmp; char *tmp;
parsePrologue(XF86ConfScreenPtr, XF86ConfScreenRec) parsePrologue(XF86ConfScreenPtr, XF86ConfScreenRec);
XNFasprintf(&tmp, "Screen%d", screennum); XNFasprintf(&tmp, "Screen%d", screennum);
ptr->scrn_identifier = tmp; ptr->scrn_identifier = tmp;
@ -254,9 +254,9 @@ configureDeviceSection(int screennum)
int i = 0; int i = 0;
char *identifier; char *identifier;
parsePrologue(XF86ConfDevicePtr, XF86ConfDeviceRec) parsePrologue(XF86ConfDevicePtr, XF86ConfDeviceRec);
/* Move device info to parser structure */ /* Move device info to parser structure */
if (asprintf(&identifier, "Card%d", screennum) == -1) if (asprintf(&identifier, "Card%d", screennum) == -1)
identifier = NULL; identifier = NULL;
ptr->dev_identifier = identifier; ptr->dev_identifier = identifier;
@ -326,9 +326,9 @@ configureLayoutSection(void)
{ {
int scrnum = 0; int scrnum = 0;
parsePrologue(XF86ConfLayoutPtr, XF86ConfLayoutRec) parsePrologue(XF86ConfLayoutPtr, XF86ConfLayoutRec);
ptr->lay_identifier = "X.org Configured"; ptr->lay_identifier = "X.org Configured";
{ {
XF86ConfInputrefPtr iptr; XF86ConfInputrefPtr iptr;
@ -389,9 +389,9 @@ configureLayoutSection(void)
static XF86ConfFlagsPtr static XF86ConfFlagsPtr
configureFlagsSection(void) configureFlagsSection(void)
{ {
parsePrologue(XF86ConfFlagsPtr, XF86ConfFlagsRec) parsePrologue(XF86ConfFlagsPtr, XF86ConfFlagsRec);
return ptr; return ptr;
} }
static XF86ConfModulePtr static XF86ConfModulePtr
@ -405,9 +405,9 @@ configureModuleSection(void)
"fonts", "fonts",
NULL NULL
}; };
parsePrologue(XF86ConfModulePtr, XF86ConfModuleRec) parsePrologue(XF86ConfModulePtr, XF86ConfModuleRec);
elist = LoaderListDirs(esubdirs, NULL); elist = LoaderListDirs(esubdirs, NULL);
if (elist) { if (elist) {
for (el = elist; *el; el++) { for (el = elist; *el; el++) {
XF86LoadPtr module; XF86LoadPtr module;
@ -427,9 +427,9 @@ configureModuleSection(void)
static XF86ConfFilesPtr static XF86ConfFilesPtr
configureFilesSection(void) configureFilesSection(void)
{ {
parsePrologue(XF86ConfFilesPtr, XF86ConfFilesRec) parsePrologue(XF86ConfFilesPtr, XF86ConfFilesRec);
if (xf86ModulePath) if (xf86ModulePath)
ptr->file_modulepath = xnfstrdup(xf86ModulePath); ptr->file_modulepath = xnfstrdup(xf86ModulePath);
if (defaultFontPath) if (defaultFontPath)
ptr->file_fontpath = xnfstrdup(defaultFontPath); ptr->file_fontpath = xnfstrdup(defaultFontPath);
@ -441,7 +441,7 @@ static XF86ConfMonitorPtr
configureMonitorSection(int screennum) configureMonitorSection(int screennum)
{ {
char *tmp; char *tmp;
parsePrologue(XF86ConfMonitorPtr, XF86ConfMonitorRec) parsePrologue(XF86ConfMonitorPtr, XF86ConfMonitorRec);
XNFasprintf(&tmp, "Monitor%d", screennum); XNFasprintf(&tmp, "Monitor%d", screennum);
ptr->mon_identifier = tmp; ptr->mon_identifier = tmp;
@ -486,7 +486,7 @@ configureDDCMonitorSection(int screennum)
int displaySizeLen; int displaySizeLen;
char *tmp; char *tmp;
parsePrologue(XF86ConfMonitorPtr, XF86ConfMonitorRec) parsePrologue(XF86ConfMonitorPtr, XF86ConfMonitorRec);
XNFasprintf(&tmp, "Monitor%d", screennum); XNFasprintf(&tmp, "Monitor%d", screennum);
ptr->mon_identifier = tmp; ptr->mon_identifier = tmp;