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

(submit/cleanup-api-xfree86) xfree86: parser: move private defs from xf86Parser.h to xf86Parser_priv.h 

public server module API headers shouldn't be clobbered with non-exported
definitions, so move them out to private header file.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-02-09 18:00:36 +01:00
parent 572506116f
commit dfd72003bf
9 changed files with 33 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/xfree86/common/xf86AutoConfig.c
View File

@ -34,7 +34,7 @@
#endif
#include "xf86.h"
#include "xf86Parser.h"
#include "xf86Parser_priv.h"
#include "xf86tokens.h"
#include "xf86Config.h"
#include "xf86MatchDrivers.h"

2
hw/xfree86/common/xf86Config.c
View File

@ -54,7 +54,7 @@
#include "xf86.h"
#include "xf86Modes.h"
#include "xf86Parser.h"
#include "xf86Parser_priv.h"
#include "xf86tokens.h"
#include "xf86Config.h"
#include "xf86Priv.h"

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

@ -46,6 +46,7 @@
#endif
#include "misc.h"
#include "loaderProcs.h"
#include "xf86Parser_priv.h"
typedef struct _DevToConfig {
GDevRec GDev;

2
hw/xfree86/parser/Layout.c
View File

@ -56,7 +56,7 @@
#include <xorg-config.h>
#endif
#include "xf86Parser.h"
#include "xf86Parser_priv.h"
#include "xf86tokens.h"
#include "Configint.h"
#include <string.h>

2
hw/xfree86/parser/read.c
View File

@ -57,7 +57,7 @@
#endif
#include "xf86Config.h"
#include "xf86Parser.h"
#include "xf86Parser_priv.h"
#include "xf86tokens.h"
#include "Configint.h"

1
hw/xfree86/parser/scan.c
View File

@ -66,6 +66,7 @@
#include <X11/Xdefs.h>
#include <X11/Xfuncproto.h>
#include <limits.h>
#include "xf86Parser_priv.h"
#if !defined(MAXHOSTNAMELEN)
#define MAXHOSTNAMELEN 32

2
hw/xfree86/parser/write.c
View File

@ -56,7 +56,7 @@
#endif
#include "os.h"
#include "xf86Parser.h"
#include "xf86Parser_priv.h"
#include "xf86tokens.h"
#include "Configint.h"

15
hw/xfree86/parser/xf86Parser.h
View File

@ -442,17 +442,6 @@ typedef struct {
/*
* prototypes for public functions
*/
extern void xf86initConfigFiles(void);
extern char *xf86openConfigFile(const char *path, const char *cmdline,
const char *projroot);
extern char *xf86openConfigDirFiles(const char *path, const char *cmdline,
const char *projroot);
extern void xf86setBuiltinConfig(const char *config[]);
extern XF86ConfigPtr xf86readConfigFile(void);
extern void xf86closeConfigFile(void);
extern XF86ConfigPtr xf86allocateConfig(void);
extern void xf86freeConfig(XF86ConfigPtr p);
extern int xf86writeConfigFile(const char *, XF86ConfigPtr);
extern _X_EXPORT XF86ConfDevicePtr xf86findDevice(const char *ident,
XF86ConfDevicePtr p);
extern _X_EXPORT XF86ConfLayoutPtr xf86findLayout(const char *name,
@ -472,14 +461,10 @@ extern _X_EXPORT XF86ConfInputPtr xf86findInputByDriver(const char *driver,
extern _X_EXPORT XF86ConfVideoAdaptorPtr xf86findVideoAdaptor(const char *ident,
XF86ConfVideoAdaptorPtr
p);
extern int xf86layoutAddInputDevices(XF86ConfigPtr config,
XF86ConfLayoutPtr layout);
extern _X_EXPORT GenericListPtr xf86addListItem(GenericListPtr head,
GenericListPtr c_new);
extern _X_EXPORT int xf86itemNotSublist(GenericListPtr list_1,
GenericListPtr list_2);
extern _X_EXPORT int xf86pathIsAbsolute(const char *path);
extern _X_EXPORT int xf86pathIsSafe(const char *path);
extern _X_EXPORT char *xf86addComment(char *cur, const char *add);

26
hw/xfree86/parser/xf86Parser_priv.h Normal file
View File

@ -0,0 +1,26 @@
/* SPDX-License-Identifier: MIT OR X11
*
* Copyright © 2024 Enrico Weigelt, metux IT consult <info@metux.net>
* Copyright © 1997 Metro Link Incorporated
*/
#ifndef _XSERVER_XF86_PARSER_PRIV
#define _XSERVER_XF86_PARSER_PRIV
#include "xf86Parser.h"
void xf86initConfigFiles(void);
char *xf86openConfigFile(const char *path,
const char *cmdline,
const char *projroot);
char *xf86openConfigDirFiles(const char *path,
const char *cmdline,
const char *projroot);
void xf86setBuiltinConfig(const char *config[]);
XF86ConfigPtr xf86readConfigFile(void);
void xf86closeConfigFile(void);
XF86ConfigPtr xf86allocateConfig(void);
void xf86freeConfig(XF86ConfigPtr p);
int xf86writeConfigFile(const char *filename, XF86ConfigPtr cptr);
int xf86layoutAddInputDevices(XF86ConfigPtr config, XF86ConfLayoutPtr layout);
#endif /* _XSERVER_XF86_PARSER_PRIV */