xserver: Branch 'master' - 3 commits
Peter Hutterer
whot at kemper.freedesktop.org
Wed Sep 6 03:05:25 UTC 2017
glamor/glamor_vbo.c | 2 +-
hw/xwayland/xwayland-glamor-xv.c | 2 +-
test/signal-logging.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit ea82ececbf85a7ac3d0931687f44c57534fde17c
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date: Wed Sep 6 11:53:02 2017 +1000
test: fix compiler warning
signal-logging.c:182:12: warning: suggest parentheses around assignment used as truth value [-Wparentheses]
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
diff --git a/test/signal-logging.c b/test/signal-logging.c
index b00ee588e..9bf39e58d 100644
--- a/test/signal-logging.c
+++ b/test/signal-logging.c
@@ -179,7 +179,7 @@ static void logging_format(void)
strcpy(&buf[sizeof(buf) - 4], "end");
LogInit(log_file_path, NULL);
- assert(f = fopen(log_file_path, "r"));
+ assert((f = fopen(log_file_path, "r")));
#define read_log_msg(msg) do { \
msg = fgets(read_buf, sizeof(read_buf), f); \
commit e12e02b2e6ee4582ba902ec1d1e5309abc78e282
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Sun Apr 17 17:24:53 2016 +0100
glamor: use the lowercase xnf.*alloc API
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
Reviewed-by: Olivier Fourdan <ofourdan at redhat.com>
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
diff --git a/glamor/glamor_vbo.c b/glamor/glamor_vbo.c
index b8db0092b..2799e1b63 100644
--- a/glamor/glamor_vbo.c
+++ b/glamor/glamor_vbo.c
@@ -128,7 +128,7 @@ glamor_get_vbo_space(ScreenPtr screen, unsigned size, char **vbo_offset)
if (glamor_priv->vbo_size < size) {
glamor_priv->vbo_size = MAX(GLAMOR_VBO_SIZE, size);
free(glamor_priv->vb);
- glamor_priv->vb = XNFalloc(glamor_priv->vbo_size);
+ glamor_priv->vb = xnfalloc(glamor_priv->vbo_size);
}
*vbo_offset = NULL;
/* We point to the start of glamor_priv->vb every time, and
commit 17e488570067cdf499c7ad17ab198508c6f1531d
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Sun Apr 17 17:24:52 2016 +0100
xwayland: use the lowercase xnf.*alloc API
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
Reviewed-by: Olivier Fourdan <ofourdan at redhat.com>
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
diff --git a/hw/xwayland/xwayland-glamor-xv.c b/hw/xwayland/xwayland-glamor-xv.c
index 65f93c693..8e0f8da94 100644
--- a/hw/xwayland/xwayland-glamor-xv.c
+++ b/hw/xwayland/xwayland-glamor-xv.c
@@ -213,7 +213,7 @@ xwl_glamor_xv_add_formats(XvAdaptorPtr pa)
void *moreSpace;
totFormat *= 2;
- moreSpace = XNFreallocarray(pFormat, totFormat,
+ moreSpace = xnfreallocarray(pFormat, totFormat,
sizeof(XvFormatRec));
pFormat = moreSpace;
pf = pFormat + numFormat;
More information about the xorg-commit
mailing list