diff options
| author | Jeremy White <jwhite@codeweavers.com> | 2020-03-19 12:58:09 -0500 |
|---|---|---|
| committer | Jeremy White <jwhite@codeweavers.com> | 2020-04-20 12:19:59 -0500 |
| commit | 9e3ba91a788b612cdaadfa416dffb0e07c57d52d (patch) | |
| tree | 02598472e3b94658c2fc06e7e242b819262d09cb | |
| parent | 5e52043b4ebf4705d68064589b48dff6c6228a33 (diff) | |
Rename xcb.c to xcbtest.c to avoid name confusion.
Our functions should really not be named xcb_xxx.
| -rw-r--r-- | src/tests/Makefile.am | 4 | ||||
| -rw-r--r-- | src/tests/tests.c | 8 | ||||
| -rw-r--r-- | src/tests/xcbtest.c (renamed from src/tests/xcb.c) | 2 | ||||
| -rw-r--r-- | src/tests/xcbtest.h (renamed from src/tests/xcb.h) | 6 |
4 files changed, 10 insertions, 10 deletions
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am index b129be9..8b0bb75 100644 --- a/src/tests/Makefile.am +++ b/src/tests/Makefile.am @@ -8,8 +8,8 @@ x11spice_test_SOURCES = \ tests.h \ x11spice_test.c \ x11spice_test.h \ - xcb.c \ - xcb.h \ + xcbtest.c \ + xcbtest.h \ xdummy.c \ xdummy.h \ util.c \ diff --git a/src/tests/tests.c b/src/tests/tests.c index e6add93..6c873f5 100644 --- a/src/tests/tests.c +++ b/src/tests/tests.c @@ -27,7 +27,7 @@ #include "tests.h" #include "util.h" -#include "xcb.h" +#include "xcbtest.h" #include "x11spice_test.h" static int test_common_start(test_t * test, x11spice_server_t * server, @@ -138,7 +138,7 @@ void test_basic(xdummy_t *xdummy, gconstpointer user_data) return; snprintf(buf, sizeof(buf), ":%s", xdummy->display); - if (xcb_draw_grid(buf)) { + if (xcbtest_draw_grid(buf)) { g_warning("Could not draw the grid"); g_test_fail(); } @@ -171,7 +171,7 @@ void test_resize(xdummy_t *xdummy, gconstpointer user_data) system(buf); snprintf(buf, sizeof(buf), ":%s", xdummy->display); - if (xcb_draw_grid(buf)) { + if (xcbtest_draw_grid(buf)) { g_warning("Could not draw the grid"); g_test_fail(); break; @@ -204,7 +204,7 @@ void test_tallscreen(xdummy_t *xdummy, gconstpointer user_data) system(buf); snprintf(buf, sizeof(buf), ":%s", xdummy->display); - if (xcb_draw_grid(buf)) { + if (xcbtest_draw_grid(buf)) { g_warning("Could not draw the grid"); g_test_fail(); } diff --git a/src/tests/xcb.c b/src/tests/xcbtest.c index 709cdfd..c131248 100644 --- a/src/tests/xcb.c +++ b/src/tests/xcbtest.c @@ -73,7 +73,7 @@ static void create_rectangles(xcb_rectangle_t * red, xcb_rectangle_t * green, in } } -int xcb_draw_grid(const char *display) +int xcbtest_draw_grid(const char *display) { uint32_t pixels[2]; diff --git a/src/tests/xcb.h b/src/tests/xcbtest.h index 54b0a37..aa78662 100644 --- a/src/tests/xcb.h +++ b/src/tests/xcbtest.h @@ -18,13 +18,13 @@ along with x11spice. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef XCB_H_ -#define XCB_H_ +#ifndef XCBTEST_H_ +#define XCBTEST_H_ /*---------------------------------------------------------------------------- ** Prototypes **--------------------------------------------------------------------------*/ -int xcb_draw_grid(const char *display); +int xcbtest_draw_grid(const char *display); #endif |