diff options
author | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-03-04 18:11:10 +1030 |
---|---|---|
committer | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-03-04 18:11:10 +1030 |
commit | 4f2cd0ed96d3b10c78774c721c2ffbfb0556dddd (patch) | |
tree | 9f477ddd4af2162152057bded1426102b475e67c /os | |
parent | 23ae68a4c74a2ec90b4130c37b0d0aec3f4082ce (diff) | |
parent | 453661a9e193a511cf5e54e6d330454163817316 (diff) |
Merge branch 'master' into mpx
This merge reverts Magnus' device coorindate scaling changes. MPX core event
generation is very different, so we can't scale in GetPointerEvents.
Conflicts:
Xi/opendev.c
dix/devices.c
dix/dixfonts.c
dix/getevents.c
dix/resource.c
dix/window.c
hw/xfree86/common/xf86Xinput.c
mi/mipointer.c
xkb/ddxBeep.c
xkb/ddxCtrls.c
xkb/ddxKeyClick.c
xkb/ddxList.c
xkb/ddxLoad.c
xkb/xkb.c
xkb/xkbAccessX.c
xkb/xkbEvents.c
xkb/xkbInit.c
xkb/xkbPrKeyEv.c
xkb/xkbUtils.c
Diffstat (limited to 'os')
-rw-r--r-- | os/WaitFor.c | 8 | ||||
-rw-r--r-- | os/utils.c | 26 |
2 files changed, 4 insertions, 30 deletions
diff --git a/os/WaitFor.c b/os/WaitFor.c index c58f24888..36e01ca38 100644 --- a/os/WaitFor.c +++ b/os/WaitFor.c @@ -254,13 +254,13 @@ WaitForSomething(int *pClientsReady) } else if (selecterr == EINVAL) { - FatalError("WaitForSomething(): select: errno=%d\n", - selecterr); + FatalError("WaitForSomething(): select: %s\n", + strerror(selecterr)); } else if (selecterr != EINTR && selecterr != EAGAIN) { - ErrorF("WaitForSomething(): select: errno=%d\n", - selecterr); + ErrorF("WaitForSomething(): select: %s\n", + strerror(selecterr)); } } #ifdef SMART_SCHEDULE diff --git a/os/utils.c b/os/utils.c index 0cb583157..3f4355f46 100644 --- a/os/utils.c +++ b/os/utils.c @@ -2004,18 +2004,6 @@ enum BadCode { #define BUGADDRESS "xorg@freedesktop.org" #endif -#define ARGMSG \ - "\nIf the arguments used are valid, and have been rejected incorrectly\n" \ - "please send details of the arguments and why they are valid to\n" \ - "%s. In the meantime, you can start the Xserver as\n" \ - "the \"super user\" (root).\n" - -#define ENVMSG \ - "\nIf the environment is valid, and have been rejected incorrectly\n" \ - "please send details of the environment and why it is valid to\n" \ - "%s. In the meantime, you can start the Xserver as\n" \ - "the \"super user\" (root).\n" - void CheckUserParameters(int argc, char **argv, char **envp) { @@ -2062,10 +2050,6 @@ CheckUserParameters(int argc, char **argv, char **envp) /* Check for bad environment variables and values */ #if REMOVE_ENV_LD while (envp[i] && (strncmp(envp[i], "LD", 2) == 0)) { -#ifdef ENVDEBUG - ErrorF("CheckUserParameters: removing %s from the " - "environment\n", strtok(envp[i], "=")); -#endif for (j = i; envp[j]; j++) { envp[j] = envp[j+1]; } @@ -2073,10 +2057,6 @@ CheckUserParameters(int argc, char **argv, char **envp) #endif if (envp[i] && (strlen(envp[i]) > MAX_ENV_LENGTH)) { #if REMOVE_LONG_ENV -#ifdef ENVDEBUG - ErrorF("CheckUserParameters: removing %s from the " - "environment\n", strtok(envp[i], "=")); -#endif for (j = i; envp[j]; j++) { envp[j] = envp[j+1]; } @@ -2129,20 +2109,16 @@ CheckUserParameters(int argc, char **argv, char **envp) return; case UnsafeArg: ErrorF("Command line argument number %d is unsafe\n", i); - ErrorF(ARGMSG, BUGADDRESS); break; case ArgTooLong: ErrorF("Command line argument number %d is too long\n", i); - ErrorF(ARGMSG, BUGADDRESS); break; case UnprintableArg: ErrorF("Command line argument number %d contains unprintable" " characters\n", i); - ErrorF(ARGMSG, BUGADDRESS); break; case EnvTooLong: ErrorF("Environment variable `%s' is too long\n", e); - ErrorF(ENVMSG, BUGADDRESS); break; case OutputIsPipe: ErrorF("Stdout and/or stderr is a pipe\n"); @@ -2152,8 +2128,6 @@ CheckUserParameters(int argc, char **argv, char **envp) break; default: ErrorF("Unknown error\n"); - ErrorF(ARGMSG, BUGADDRESS); - ErrorF(ENVMSG, BUGADDRESS); break; } FatalError("X server aborted because of unsafe environment\n"); |