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

os: unexport audit functions 

These aren't used by any drivers, so no need to keep them around in the
public driver API.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1326>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-02-26 15:24:11 +01:00 committed by Marge Bot
parent 8516bbe422
commit 3843a643e0
7 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Xext/security.c
View File

@ -30,6 +30,7 @@ in this Software without prior written authorization from The Open Group.
#include "dix/dix_priv.h" #include "dix/dix_priv.h"
#include "dix/registry_priv.h" #include "dix/registry_priv.h"
#include "os/audit.h"
#include "scrnintstr.h" #include "scrnintstr.h"
#include "inputstr.h" #include "inputstr.h"

1
dix/main.c
View File

@ -86,6 +86,7 @@ Equipment Corporation.
#include "dix/callback_priv.h" #include "dix/callback_priv.h"
#include "dix/dix_priv.h" #include "dix/dix_priv.h"
#include "dix/registry_priv.h" #include "dix/registry_priv.h"
#include "os/audit.h"
#include "scrnintstr.h" #include "scrnintstr.h"
#include "misc.h" #include "misc.h"

10
include/os.h
View File

@ -286,8 +286,6 @@ OsSignal(int /* sig */ , OsSigHandlerPtr /* handler */ );
extern _X_EXPORT OsSigWrapperPtr extern _X_EXPORT OsSigWrapperPtr
OsRegisterSigWrapper(OsSigWrapperPtr newWrap); OsRegisterSigWrapper(OsSigWrapperPtr newWrap);
extern _X_EXPORT int auditTrailLevel;
extern _X_EXPORT void extern _X_EXPORT void
LockServer(void); LockServer(void);
extern _X_EXPORT void extern _X_EXPORT void
@ -639,14 +637,6 @@ LogHdrMessage(MessageType type, const char *msg_format,
_X_ATTRIBUTE_PRINTF(2, 0) _X_ATTRIBUTE_PRINTF(2, 0)
_X_ATTRIBUTE_PRINTF(4, 5); _X_ATTRIBUTE_PRINTF(4, 5);
extern _X_EXPORT void
FreeAuditTimer(void);
extern _X_EXPORT void
AuditF(const char *f, ...)
_X_ATTRIBUTE_PRINTF(1, 2);
extern _X_EXPORT void
VAuditF(const char *f, va_list args)
_X_ATTRIBUTE_PRINTF(1, 0);
extern _X_EXPORT void extern _X_EXPORT void
FatalError(const char *f, ...) FatalError(const char *f, ...)
_X_ATTRIBUTE_PRINTF(1, 2) _X_ATTRIBUTE_PRINTF(1, 2)

18
os/audit.h Normal file
View File

@ -0,0 +1,18 @@
/* SPDX-License-Identifier: MIT OR X11
*
* Copyright © 2024 Enrico Weigelt, metux IT consult <info@metux.net>
*/
#ifndef _XSERVER_OS_AUDIT_H
#define _XSERVER_OS_AUDIT_H
#include <stdarg.h>
#include <X11/Xfuncproto.h>
extern int auditTrailLevel;
void FreeAuditTimer(void);
void AuditF(const char *f, ...) _X_ATTRIBUTE_PRINTF(1, 2);
void VAuditF(const char *f, va_list args) _X_ATTRIBUTE_PRINTF(1, 0);
#endif /* _XSERVER_OS_AUDIT_H */

1
os/connection.c
View File

@ -99,6 +99,7 @@ SOFTWARE.
#endif /* WIN32 */ #endif /* WIN32 */
#include "dix/dix_priv.h" #include "dix/dix_priv.h"
#include "os/audit.h"
#include "misc.h" /* for typedef of pointer */ #include "misc.h" /* for typedef of pointer */
#include "osdep.h" #include "osdep.h"

3
os/log.c
View File

@ -87,6 +87,7 @@ OR PERFORMANCE OF THIS SOFTWARE.
#include <stdlib.h> /* for malloc() */ #include <stdlib.h> /* for malloc() */
#include <errno.h> #include <errno.h>
#include "os/audit.h"
#include "os/fmt.h" #include "os/fmt.h"
#include "input.h" #include "input.h"
@ -902,6 +903,8 @@ static int nrepeat = 0;
static int oldlen = -1; static int oldlen = -1;
static OsTimerPtr auditTimer = NULL; static OsTimerPtr auditTimer = NULL;
int auditTrailLevel = 1;
void void
FreeAuditTimer(void) FreeAuditTimer(void)
{ {

8
os/utils.c
View File

@ -78,6 +78,9 @@ __stdcall unsigned long GetTickCount(void);
#define TRANS_SERVER #define TRANS_SERVER
#define TRANS_REOPEN #define TRANS_REOPEN
#include <X11/Xtrans/Xtrans.h> #include <X11/Xtrans/Xtrans.h>
#include "os/audit.h"
#include "input.h" #include "input.h"
#include "dixfont.h" #include "dixfont.h"
#include <X11/fonts/libxfont2.h> #include <X11/fonts/libxfont2.h>
@ -107,11 +110,8 @@ __stdcall unsigned long GetTickCount(void);
#include "dixstruct.h" #include "dixstruct.h"
#include "xkbsrv.h" #include "xkbsrv.h"
#include "picture.h" #include "picture.h"
#include "miinitext.h" #include "miinitext.h"
#include "present.h" #include "present.h"
Bool noTestExtensions; Bool noTestExtensions;
@ -192,8 +192,6 @@ Bool AllowByteSwappedClients = FALSE;
Bool PanoramiXExtensionDisabledHack = FALSE; Bool PanoramiXExtensionDisabledHack = FALSE;
#endif #endif
int auditTrailLevel = 1;
char *SeatId = NULL; char *SeatId = NULL;
sig_atomic_t inSignalContext = FALSE; sig_atomic_t inSignalContext = FALSE;