andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

test: fix up InputAttributes helper function test.

Browse Source 
Just some extra clarification as pointed out by Dan Nicholson,
and that memcpy should have been a memcmp.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
This commit is contained in:
Peter Hutterer 2010-05-24 16:24:03 +10:00
parent 6cccf0131c
commit 151659f963
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
test/input.c
View File

@ -803,12 +803,18 @@ static void cmp_attr_fields(InputAttributes *attr1,
tags1 = attr1->tags; tags1 = attr1->tags;
tags2 = attr2->tags; tags2 = attr2->tags;
/* if we don't have any tags, skip the tag checking bits */
if (!tags1) if (!tags1)
{ {
g_assert(!tags2); g_assert(!tags2);
return; return;
} }
/* Don't lug around empty arrays */
g_assert(*tags1);
g_assert(*tags2);
/* check for identical content, but duplicated */ /* check for identical content, but duplicated */
while (*tags1) while (*tags1)
{ {
@ -818,6 +824,7 @@ static void cmp_attr_fields(InputAttributes *attr1,
tags2++; tags2++;
} }
/* ensure tags1 and tags2 have the same no of elements */
g_assert(!*tags2); g_assert(!*tags2);
/* check for not sharing memory */ /* check for not sharing memory */
@ -842,7 +849,7 @@ static void dix_input_attributes(void)
g_assert(!new); g_assert(!new);
new = DuplicateInputAttributes(&orig); new = DuplicateInputAttributes(&orig);
g_assert(memcpy(&orig, new, sizeof(InputAttributes))); g_assert(memcmp(&orig, new, sizeof(InputAttributes)) == 0);
orig.product = "product name"; orig.product = "product name";
new = DuplicateInputAttributes(&orig); new = DuplicateInputAttributes(&orig);