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

xfree86: use LogMessageVerb() instead of xf86MsgVerb() 

Both are doing same job, so no need to keep using an duplicated implementation.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1681>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-09-10 15:52:06 +02:00 committed by Marge Bot
parent 8e8bf63908
commit 6fc4f35f62
12 changed files with 58 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -205,14 +205,14 @@ xf86AutoConfig(void)
free(md.matches[i]); free(md.matches[i]);
} }
xf86MsgVerb(X_DEFAULT, 0, LogMessageVerb(X_DEFAULT, 0,
"Using default built-in configuration (%d lines)\n", "Using default built-in configuration (%d lines)\n",
builtinLines); builtinLines);
xf86MsgVerb(X_DEFAULT, 3, "--- Start of built-in configuration ---\n"); LogMessageVerb(X_DEFAULT, 3, "--- Start of built-in configuration ---\n");
for (cp = builtinConfig; *cp; cp++) for (cp = builtinConfig; *cp; cp++)
xf86ErrorFVerb(3, "\t%s", *cp); xf86ErrorFVerb(3, "\t%s", *cp);
xf86MsgVerb(X_DEFAULT, 3, "--- End of built-in configuration ---\n"); LogMessageVerb(X_DEFAULT, 3, "--- End of built-in configuration ---\n");
xf86initConfigFiles(); xf86initConfigFiles();
xf86setBuiltinConfig(builtinConfig); xf86setBuiltinConfig(builtinConfig);

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

@ -2347,7 +2347,7 @@ xf86HandleConfigFile(Bool autoconfig)
dirname = xf86openConfigDirFiles(dirsearch, xf86ConfigDir, PROJECTROOT); dirname = xf86openConfigDirFiles(dirsearch, xf86ConfigDir, PROJECTROOT);
filename = xf86openConfigFile(filesearch, xf86ConfigFile, PROJECTROOT); filename = xf86openConfigFile(filesearch, xf86ConfigFile, PROJECTROOT);
if (filename) { if (filename) {
xf86MsgVerb(filefrom, 0, "Using config file: \"%s\"\n", filename); LogMessageVerb(filefrom, 0, "Using config file: \"%s\"\n", filename);
xf86ConfigFile = XNFstrdup(filename); xf86ConfigFile = XNFstrdup(filename);
} }
else { else {
@ -2356,7 +2356,7 @@ xf86HandleConfigFile(Bool autoconfig)
xf86ConfigFile); xf86ConfigFile);
} }
if (dirname) { if (dirname) {
xf86MsgVerb(dirfrom, 0, "Using config directory: \"%s\"\n", LogMessageVerb(dirfrom, 0, "Using config directory: \"%s\"\n",
dirname); dirname);
xf86ConfigDir = XNFstrdup(dirname); xf86ConfigDir = XNFstrdup(dirname);
} }
@ -2367,7 +2367,7 @@ xf86HandleConfigFile(Bool autoconfig)
xf86ConfigDir); xf86ConfigDir);
} }
if (sysdirname) if (sysdirname)
xf86MsgVerb(X_DEFAULT, 0, "Using system config directory \"%s\"\n", LogMessageVerb(X_DEFAULT, 0, "Using system config directory \"%s\"\n",
sysdirname); sysdirname);
if (!filename && !dirname && !sysdirname) if (!filename && !dirname && !sysdirname)
return CONFIG_NOFILE; return CONFIG_NOFILE;

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

@ -1697,7 +1697,7 @@ xf86IsUnblank(int mode)
case SCREEN_SAVER_CYCLE: case SCREEN_SAVER_CYCLE:
return FALSE; return FALSE;
default: default:
xf86MsgVerb(X_WARNING, 0, "Unexpected save screen mode: %d\n", mode); LogMessageVerb(X_WARNING, 0, "Unexpected save screen mode: %d\n", mode);
return TRUE; return TRUE;
} }
} }

4
hw/xfree86/common/xf86Init.c
View File

@ -309,7 +309,7 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
t = time(NULL); t = time(NULL);
ct = ctime(&t); ct = ctime(&t);
xf86MsgVerb(xf86LogFileFrom, 0, "Log file: \"%s\", Time: %s", LogMessageVerb(xf86LogFileFrom, 0, "Log file: \"%s\", Time: %s",
xf86LogFile, ct); xf86LogFile, ct);
} }
@ -580,7 +580,7 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
if (xf86OSPMClose) if (xf86OSPMClose)
xf86OSPMClose(); xf86OSPMClose();
if ((xf86OSPMClose = xf86OSPMOpen()) != NULL) if ((xf86OSPMClose = xf86OSPMOpen()) != NULL)
xf86MsgVerb(X_INFO, 3, "APM registered successfully\n"); LogMessageVerb(X_INFO, 3, "APM registered successfully\n");
/* Make sure full I/O access is enabled */ /* Make sure full I/O access is enabled */
if (xorgHWAccess) if (xorgHWAccess)

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

@ -208,7 +208,7 @@ xf86HandlePMEvents(int fd, void *data)
const char *str = NULL; const char *str = NULL;
int verb = eventName(events[i], &str); int verb = eventName(events[i], &str);
xf86MsgVerb(X_INFO, verb, "PM Event received: %s\n", str); LogMessageVerb(X_INFO, verb, "PM Event received: %s\n", str);
DoApmEvent(events[i], FALSE); DoApmEvent(events[i], FALSE);
switch (xf86PMConfirmEventToOs(fd, events[i])) { switch (xf86PMConfirmEventToOs(fd, events[i])) {
case PM_WAIT: case PM_WAIT:

50
hw/xfree86/common/xf86pciBus.c
View File

@ -825,11 +825,11 @@ xf86MatchPciInstances(const char *driverName, int vendorID,
devList[j]->screen == instances[i].screen) { devList[j]->screen == instances[i].screen) {
if (devBus) if (devBus)
xf86MsgVerb(X_WARNING, 0, LogMessageVerb(X_WARNING, 0,
"%s: More than one matching Device section for " "%s: More than one matching Device section for "
"instances\n\t(BusID: %s) found: %s\n", "instances\n\t(BusID: %s) found: %s\n",
driverName, devList[j]->busID, driverName, devList[j]->busID,
devList[j]->identifier); devList[j]->identifier);
else else
devBus = devList[j]; devBus = devList[j];
} }
@ -843,10 +843,10 @@ xf86MatchPciInstances(const char *driverName, int vendorID,
xf86Msg(X_PROBED, "Assigning device section with no busID" xf86Msg(X_PROBED, "Assigning device section with no busID"
" to primary device\n"); " to primary device\n");
if (dev || devBus) if (dev || devBus)
xf86MsgVerb(X_WARNING, 0, LogMessageVerb(X_WARNING, 0,
"%s: More than one matching Device section " "%s: More than one matching Device section "
"found: %s\n", driverName, "found: %s\n", driverName,
devList[j]->identifier); devList[j]->identifier);
else else
dev = devList[j]; dev = devList[j];
} }
@ -856,10 +856,10 @@ xf86MatchPciInstances(const char *driverName, int vendorID,
dev = devBus; /* busID preferred */ dev = devBus; /* busID preferred */
if (!dev) { if (!dev) {
if (xf86CheckPciSlot(pPci) && pciDeviceHasBars(pPci)) { if (xf86CheckPciSlot(pPci) && pciDeviceHasBars(pPci)) {
xf86MsgVerb(X_WARNING, 0, "%s: No matching Device section " LogMessageVerb(X_WARNING, 0, "%s: No matching Device section "
"for instance (BusID PCI:%u@%u:%u:%u) found\n", "for instance (BusID PCI:%u@%u:%u:%u) found\n",
driverName, pPci->bus, pPci->domain, pPci->dev, driverName, pPci->bus, pPci->domain, pPci->dev,
pPci->func); pPci->func);
} }
} }
else { else {
@ -888,10 +888,10 @@ xf86MatchPciInstances(const char *driverName, int vendorID,
if (c->token == -1) { if (c->token == -1) {
instances[i].claimed = FALSE; instances[i].claimed = FALSE;
numClaimedInstances--; numClaimedInstances--;
xf86MsgVerb(X_WARNING, 0, "%s: Chipset \"%s\" in Device " LogMessageVerb(X_WARNING, 0, "%s: Chipset \"%s\" in Device "
"section \"%s\" isn't valid for this driver\n", "section \"%s\" isn't valid for this driver\n",
driverName, instances[i].dev->chipset, driverName, instances[i].dev->chipset,
instances[i].dev->identifier); instances[i].dev->identifier);
} }
else { else {
instances[i].chip = c->token; instances[i].chip = c->token;
@ -908,10 +908,10 @@ xf86MatchPciInstances(const char *driverName, int vendorID,
else { else {
instances[i].claimed = FALSE; instances[i].claimed = FALSE;
numClaimedInstances--; numClaimedInstances--;
xf86MsgVerb(X_WARNING, 0, "%s: Chipset \"%s\" in Device " LogMessageVerb(X_WARNING, 0, "%s: Chipset \"%s\" in Device "
"section \"%s\" isn't a valid PCI chipset\n", "section \"%s\" isn't a valid PCI chipset\n",
driverName, instances[i].dev->chipset, driverName, instances[i].dev->chipset,
instances[i].dev->identifier); instances[i].dev->identifier);
} }
} }
} }
@ -923,10 +923,10 @@ xf86MatchPciInstances(const char *driverName, int vendorID,
if (id->numChipset == -1) { if (id->numChipset == -1) {
instances[i].claimed = FALSE; instances[i].claimed = FALSE;
numClaimedInstances--; numClaimedInstances--;
xf86MsgVerb(X_WARNING, 0, "%s: ChipID 0x%04X in Device " LogMessageVerb(X_WARNING, 0, "%s: ChipID 0x%04X in Device "
"section \"%s\" isn't valid for this driver\n", "section \"%s\" isn't valid for this driver\n",
driverName, instances[i].dev->chipID, driverName, instances[i].dev->chipID,
instances[i].dev->identifier); instances[i].dev->identifier);
} }
else { else {
instances[i].chip = id->numChipset; instances[i].chip = id->numChipset;

30
hw/xfree86/common/xf86sbusBus.c
View File

@ -464,11 +464,11 @@ xf86MatchSbusInstances(const char *driverName, int sbusDevId,
if (devList[j]->busID && *devList[j]->busID) { if (devList[j]->busID && *devList[j]->busID) {
if (xf86CompareSbusBusString(devList[j]->busID, psdp->fbNum)) { if (xf86CompareSbusBusString(devList[j]->busID, psdp->fbNum)) {
if (devBus) if (devBus)
xf86MsgVerb(X_WARNING, 0, LogMessageVerb(X_WARNING, 0,
"%s: More than one matching Device section for " "%s: More than one matching Device section for "
"instance (BusID: %s) found: %s\n", "instance (BusID: %s) found: %s\n",
driverName, devList[j]->identifier, driverName, devList[j]->identifier,
devList[j]->busID); devList[j]->busID);
else else
devBus = devList[j]; devBus = devList[j];
} }
@ -486,24 +486,24 @@ xf86MatchSbusInstances(const char *driverName, int sbusDevId,
dev = devList[j]; dev = devList[j];
} }
else else
xf86MsgVerb(X_WARNING, 0, LogMessageVerb(X_WARNING, 0,
"%s: More than one matching Device section " "%s: More than one matching Device section "
"found: %s\n", driverName, "found: %s\n", driverName,
devList[j]->identifier); devList[j]->identifier);
} }
} }
if (devBus) if (devBus)
dev = devBus; /* busID preferred */ dev = devBus; /* busID preferred */
if (!dev && psdp->fd != -2) { if (!dev && psdp->fd != -2) {
if (promPath) { if (promPath) {
xf86MsgVerb(X_WARNING, 0, "%s: No matching Device section " LogMessageVerb(X_WARNING, 0, "%s: No matching Device section "
"for instance (BusID SBUS:%s) found\n", "for instance (BusID SBUS:%s) found\n",
driverName, promPath); driverName, promPath);
} }
else else
xf86MsgVerb(X_WARNING, 0, "%s: No matching Device section " LogMessageVerb(X_WARNING, 0, "%s: No matching Device section "
"for instance (BusID SBUS:fb%d) found\n", "for instance (BusID SBUS:fb%d) found\n",
driverName, psdp->fbNum); driverName, psdp->fbNum);
} }
else if (dev) { else if (dev) {
numClaimedInstances++; numClaimedInstances++;

11
hw/xfree86/doc/ddxDesign.xml
View File

@ -5630,17 +5630,6 @@ strongly encouraged to improve the consistency of driver behaviour.
</blockquote></para></blockquote> </blockquote></para></blockquote>
<blockquote><para>
<programlisting>
xf86MsgVerb(MessageType type, int verb, const char *format, ...);
</programlisting>
<blockquote><para>
Like <function>xf86Msg()</function>, but with the verbosity level given
explicitly.
</para>
</blockquote></para></blockquote>
<blockquote><para> <blockquote><para>
<programlisting> <programlisting>
xf86DrvMsg(int scrnIndex, MessageType type, const char *format, ...); xf86DrvMsg(int scrnIndex, MessageType type, const char *format, ...);

2
hw/xfree86/int10/helper_exec.c
View File

@ -211,7 +211,7 @@ stack_trace(xf86Int10InfoPtr pInt)
if (stack >= tail) if (stack >= tail)
return; return;
xf86MsgVerb(X_INFO, 3, "stack at 0x%8.8lx:\n", stack); LogMessageVerb(X_INFO, 3, "stack at 0x%8.8lx:\n", stack);
for (; stack < tail; stack++) { for (; stack < tail; stack++) {
xf86ErrorFVerb(3, " %2.2x", MEM_RB(pInt, stack)); xf86ErrorFVerb(3, " %2.2x", MEM_RB(pInt, stack));
i = (i + 1) % 0x10; i = (i + 1) % 0x10;

6
hw/xfree86/os-support/bsd/ppc_video.c
View File

@ -60,13 +60,13 @@ xf86EnableIO()
{ {
int fd = xf86Info.consoleFd; int fd = xf86Info.consoleFd;
xf86MsgVerb(X_WARNING, 3, "xf86EnableIO %d\n", fd); LogMessageVerb(X_WARNING, 3, "xf86EnableIO %d\n", fd);
if (ioBase == MAP_FAILED) { if (ioBase == MAP_FAILED) {
ioBase = mmap(NULL, 0x10000, PROT_READ | PROT_WRITE, MAP_SHARED, fd, ioBase = mmap(NULL, 0x10000, PROT_READ | PROT_WRITE, MAP_SHARED, fd,
0xf2000000); 0xf2000000);
xf86MsgVerb(X_INFO, 3, "xf86EnableIO: %08x\n", ioBase); LogMessageVerb(X_INFO, 3, "xf86EnableIO: %08x\n", ioBase);
if (ioBase == MAP_FAILED) { if (ioBase == MAP_FAILED) {
xf86MsgVerb(X_WARNING, 3, "Can't map IO space!\n"); LogMessageVerb(X_WARNING, 3, "Can't map IO space!\n");
return FALSE; return FALSE;
} }
} }

4
hw/xfree86/os-support/linux/lnx_acpi.c
View File

@ -149,7 +149,7 @@ lnxACPIOpen(void)
strcpy(addr.sun_path, ACPI_SOCKET); strcpy(addr.sun_path, ACPI_SOCKET);
if ((r = connect(fd, (struct sockaddr *) &addr, sizeof(addr))) == -1) { if ((r = connect(fd, (struct sockaddr *) &addr, sizeof(addr))) == -1) {
if (!warned) if (!warned)
xf86MsgVerb(X_WARNING, 3, "Open ACPI failed (%s) (%s)\n", LogMessageVerb(X_WARNING, 3, "Open ACPI failed (%s) (%s)\n",
ACPI_SOCKET, strerror(errno)); ACPI_SOCKET, strerror(errno));
warned = 1; warned = 1;
shutdown(fd, 2); shutdown(fd, 2);
@ -161,7 +161,7 @@ lnxACPIOpen(void)
xf86PMGetEventFromOs = lnxACPIGetEventFromOs; xf86PMGetEventFromOs = lnxACPIGetEventFromOs;
xf86PMConfirmEventToOs = lnxACPIConfirmEventToOs; xf86PMConfirmEventToOs = lnxACPIConfirmEventToOs;
ACPIihPtr = xf86AddGeneralHandler(fd, xf86HandlePMEvents, NULL); ACPIihPtr = xf86AddGeneralHandler(fd, xf86HandlePMEvents, NULL);
xf86MsgVerb(X_INFO, 3, "Open ACPI successful (%s)\n", ACPI_SOCKET); LogMessageVerb(X_INFO, 3, "Open ACPI successful (%s)\n", ACPI_SOCKET);
warned = 0; warned = 0;
return lnxCloseACPI; return lnxCloseACPI;

4
hw/xfree86/os-support/linux/lnx_apm.c
View File

@ -165,7 +165,7 @@ lnxAPMOpen(void)
DebugF("APM: Opening device\n"); DebugF("APM: Opening device\n");
if ((fd = open(APM_DEVICE, O_RDWR)) > -1) { if ((fd = open(APM_DEVICE, O_RDWR)) > -1) {
if (access(APM_PROC, R_OK) || ((pfd = open(APM_PROC, O_RDONLY)) == -1)) { if (access(APM_PROC, R_OK) || ((pfd = open(APM_PROC, O_RDONLY)) == -1)) {
xf86MsgVerb(X_WARNING, 3, "Cannot open APM (%s) (%s)\n", LogMessageVerb(X_WARNING, 3, "Cannot open APM (%s) (%s)\n",
APM_PROC, strerror(errno)); APM_PROC, strerror(errno));
close(fd); close(fd);
return NULL; return NULL;
@ -175,7 +175,7 @@ lnxAPMOpen(void)
xf86PMGetEventFromOs = lnxPMGetEventFromOs; xf86PMGetEventFromOs = lnxPMGetEventFromOs;
xf86PMConfirmEventToOs = lnxPMConfirmEventToOs; xf86PMConfirmEventToOs = lnxPMConfirmEventToOs;
APMihPtr = xf86AddGeneralHandler(fd, xf86HandlePMEvents, NULL); APMihPtr = xf86AddGeneralHandler(fd, xf86HandlePMEvents, NULL);
xf86MsgVerb(X_INFO, 3, "Open APM successful\n"); LogMessageVerb(X_INFO, 3, "Open APM successful\n");
return lnxCloseAPM; return lnxCloseAPM;
} }
return NULL; return NULL;