xfree86/parser: simplify #ifdef ladder
Rather than 'hacking' around symbol names and providing macros such as 'Local' just fold things and make the code more readable. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
parent
537276a5b8
commit
577bebe206
|
@ -73,14 +73,7 @@
|
|||
#define HAS_NO_UIDS
|
||||
#endif
|
||||
|
||||
#ifdef HAS_NO_UIDS
|
||||
#define doWriteConfigFile xf86writeConfigFile
|
||||
#define Local /**/
|
||||
#else
|
||||
#define Local static
|
||||
#endif
|
||||
|
||||
Local int
|
||||
static int
|
||||
doWriteConfigFile(const char *filename, XF86ConfigPtr cptr)
|
||||
{
|
||||
FILE *cf;
|
||||
|
@ -134,24 +127,19 @@ doWriteConfigFile(const char *filename, XF86ConfigPtr cptr)
|
|||
return 1;
|
||||
}
|
||||
|
||||
#ifndef HAS_NO_UIDS
|
||||
|
||||
int
|
||||
xf86writeConfigFile(const char *filename, XF86ConfigPtr cptr)
|
||||
{
|
||||
#ifndef HAS_NO_UIDS
|
||||
int ret;
|
||||
|
||||
#if !defined(HAS_SAVED_IDS_AND_SETEUID)
|
||||
int pid, p;
|
||||
int status;
|
||||
void (*csig) (int);
|
||||
#else
|
||||
int ruid, euid;
|
||||
#endif
|
||||
|
||||
if (getuid() != geteuid()) {
|
||||
|
||||
#if !defined(HAS_SAVED_IDS_AND_SETEUID)
|
||||
int pid, p;
|
||||
int status;
|
||||
void (*csig) (int);
|
||||
|
||||
/* Need to fork to change ruid without loosing euid */
|
||||
csig = signal(SIGCHLD, SIG_DFL);
|
||||
switch ((pid = fork())) {
|
||||
|
@ -178,6 +166,7 @@ xf86writeConfigFile(const char *filename, XF86ConfigPtr cptr)
|
|||
return 0;
|
||||
|
||||
#else /* HAS_SAVED_IDS_AND_SETEUID */
|
||||
int ruid, euid;
|
||||
|
||||
ruid = getuid();
|
||||
euid = geteuid();
|
||||
|
@ -198,9 +187,7 @@ xf86writeConfigFile(const char *filename, XF86ConfigPtr cptr)
|
|||
#endif /* HAS_SAVED_IDS_AND_SETEUID */
|
||||
|
||||
}
|
||||
else {
|
||||
return doWriteConfigFile(filename, cptr);
|
||||
}
|
||||
}
|
||||
|
||||
else
|
||||
#endif /* !HAS_NO_UIDS */
|
||||
return doWriteConfigFile(filename, cptr);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user