diff options
| author | Julien Cristau <jcristau@debian.org> | 2008-12-23 13:08:49 +0100 |
|---|---|---|
| committer | Julien Cristau <jcristau@debian.org> | 2009-01-11 05:36:12 +0100 |
| commit | 7a05c8b1e70680ddd3b3e09ad448788f8d70a428 (patch) | |
| tree | 361fcb3d11e000e48b6e1af95f59a91024f6cd48 /hw | |
| parent | 0d8184de591c75794083c8a8ca3fb8459e9394bc (diff) | |
xfree86/linux: fix log flood on acpid open error
When we can't open the acpid socket, warn once, not once every second
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/xfree86/os-support/linux/lnx_acpi.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/hw/xfree86/os-support/linux/lnx_acpi.c b/hw/xfree86/os-support/linux/lnx_acpi.c index bb975cc5d..8e11f4a59 100644 --- a/hw/xfree86/os-support/linux/lnx_acpi.c +++ b/hw/xfree86/os-support/linux/lnx_acpi.c @@ -133,6 +133,7 @@ lnxACPIOpen(void) int fd; struct sockaddr_un addr; int r = -1; + static int warned = 0; #ifdef DEBUG ErrorF("ACPI: OSPMOpen called\n"); @@ -148,8 +149,10 @@ lnxACPIOpen(void) addr.sun_family = AF_UNIX; strcpy(addr.sun_path, ACPI_SOCKET); if ((r = connect(fd, (struct sockaddr*)&addr, sizeof(addr))) == -1) { - xf86MsgVerb(X_WARNING,3,"Open ACPI failed (%s) (%s)\n", ACPI_SOCKET, - strerror(errno)); + if (!warned) + xf86MsgVerb(X_WARNING,3,"Open ACPI failed (%s) (%s)\n", + ACPI_SOCKET, strerror(errno)); + warned = 1; shutdown(fd, 2); close(fd); return NULL; @@ -160,6 +163,7 @@ lnxACPIOpen(void) xf86PMConfirmEventToOs = lnxACPIConfirmEventToOs; ACPIihPtr = xf86AddGeneralHandler(fd,xf86HandlePMEvents,NULL); xf86MsgVerb(X_INFO,3,"Open ACPI successful (%s)\n", ACPI_SOCKET); + warned = 0; return lnxCloseACPI; } |