xserver: Branch 'master' - 3 commits
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Fri Feb 23 00:00:19 UTC 2024
hw/xfree86/drivers/modesetting/drmmode_display.c | 8 ++++----
hw/xwayland/xwayland.c | 6 +++---
xkb/xkb.c | 3 +--
3 files changed, 8 insertions(+), 9 deletions(-)
New commits:
commit 7a37e5df126dd3ec92d09ef8212177d1caba5267
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Tue Feb 6 14:10:23 2024 +0100
xwayland: fix int size mismatch
GCC reports:
[1/2] Compiling C object hw/xwayland/Xwayland.p/xwayland.c.o
../hw/xwayland/xwayland.c: In function ‘try_raising_nofile_limit’:
../hw/xwayland/xwayland.c:161:72: warning: format ‘%li’ expects argument of type ‘long int’, but argument 4 has type ‘rlim_t’ {aka ‘long long unsigned int’} [-Wformat=]
161 | LogMessageVerb(X_INFO, 3, "Raising the file descriptors limit to %li\n",
| ~~^
| |
| long int
| %lli
162 | rlim.rlim_max);
| ~~~~~~~~~~~~~
| |
| rlim_t {aka long long unsigned int}
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1257>
diff --git a/hw/xwayland/xwayland.c b/hw/xwayland/xwayland.c
index 0879db69e..56964bbfb 100644
--- a/hw/xwayland/xwayland.c
+++ b/hw/xwayland/xwayland.c
@@ -158,9 +158,9 @@ try_raising_nofile_limit(void)
return;
}
- LogMessageVerb(X_INFO, 3, "Raising the file descriptors limit to %li\n",
- rlim.rlim_max);
-#endif
+ LogMessageVerb(X_INFO, 3, "Raising the file descriptors limit to %llu\n",
+ (long long unsigned int) rlim.rlim_max);
+#endif /* RLIMIT_NOFILE */
}
static void
commit 37b9b9a85482f6ab85a8643d6dee969e9fc51d37
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Wed Jan 24 17:18:16 2024 +0100
modesetting: fix int size mismatch
GCC repors:
../hw/xfree86/drivers/modesetting/drmmode_display.c:4135:49: warning: format ‘%ld’ expects argument of type ‘long int’, but argument 5 has type ‘uint64_t’ {aka ‘long long unsigned int’} [-Wformat=]
4135 | "Gamma ramp set to %ld entries on CRTC %d\n",
| ~~^
| |
| long int
| %lld
4136 | size, num);
| ~~~~
| |
| uint64_t {aka long long unsigned int}
../hw/xfree86/drivers/modesetting/drmmode_display.c:4139:57: warning: format ‘%ld’ expects argument of type ‘long int’, but argument 4 has type ‘uint64_t’ {aka ‘long long unsigned int’} [-Wformat=]
4139 | "Failed to allocate memory for %ld gamma ramp entries "
| ~~^
| |
| long int
| %lld
4140 | "on CRTC %d.\n",
4141 | size, num);
| ~~~~
| |
| uint64_t {aka long long unsigned int}
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1257>
diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c
index 1c1d79f30..5c8b47b53 100644
--- a/hw/xfree86/drivers/modesetting/drmmode_display.c
+++ b/hw/xfree86/drivers/modesetting/drmmode_display.c
@@ -4132,13 +4132,13 @@ drmmode_crtc_upgrade_lut(xf86CrtcPtr crtc, int num)
crtc->gamma_blue = gamma + size * 2;
xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, MS_LOGLEVEL_DEBUG,
- "Gamma ramp set to %ld entries on CRTC %d\n",
- size, num);
+ "Gamma ramp set to %lld entries on CRTC %d\n",
+ (long long)size, num);
} else {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
- "Failed to allocate memory for %ld gamma ramp entries "
+ "Failed to allocate memory for %lld gamma ramp entries "
"on CRTC %d.\n",
- size, num);
+ (long long)size, num);
return FALSE;
}
}
commit bc90c44e60c309564a7feec5d288ecafcbb2a62b
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Wed Jan 24 17:18:16 2024 +0100
xkb: fix int size mismatch
GCC reports:
../xkb/xkb.c: In function ‘_XkbSetMapCheckLength’:
../xkb/xkb.c:2464:54: warning: format ‘%ld’ expects argument of type ‘long int’, but argument 2 has type ‘size_t’ {aka ‘unsigned int’} [-Wformat=]
2464 | ErrorF("[xkb] BOGUS LENGTH in SetMap: expected %ld got %ld\n",
| ~~^
| |
| long int
| %d
2465 | len, req_len);
| ~~~
| |
| size_t {aka unsigned int}
../xkb/xkb.c:2464:62: warning: format ‘%ld’ expects argument of type ‘long int’, but argument 3 has type ‘size_t’ {aka ‘unsigned int’} [-Wformat=]
2464 | ErrorF("[xkb] BOGUS LENGTH in SetMap: expected %ld got %ld\n",
| ~~^
| |
| long int
| %d
2465 | len, req_len);
| ~~~~~~~
| |
| size_t {aka unsigned int}
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1257>
diff --git a/xkb/xkb.c b/xkb/xkb.c
index b240b6f6c..8d52e25df 100644
--- a/xkb/xkb.c
+++ b/xkb/xkb.c
@@ -2460,8 +2460,7 @@ _XkbSetMapCheckLength(xkbSetMapReq *req)
if (len == req_len)
return Success;
bad:
- ErrorF("[xkb] BOGUS LENGTH in SetMap: expected %ld got %ld\n",
- len, req_len);
+ ErrorF("[xkb] BOGUS LENGTH in SetMap: expected %zd got %zd\n", len, req_len);
return BadLength;
}
More information about the xorg-commit
mailing list