diff options
| author | marha <marha@users.sourceforge.net> | 2014-01-26 20:19:23 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-01-26 20:19:23 +0100 |
| commit | 5f455179ae4b279a82d99a7a3dabe61f58c42ad6 (patch) | |
| tree | fdecec022cf1b8b782b90a64c14e374fa6d400cb /xorg-server/test/hashtabletest.c | |
| parent | 78d84bd03c744b0ed420c450dd2807904ccaef21 (diff) | |
| parent | 30af30b78075159fce477ae99cc72540133714d0 (diff) | |
| download | vcxsrv-5f455179ae4b279a82d99a7a3dabe61f58c42ad6.tar.gz vcxsrv-5f455179ae4b279a82d99a7a3dabe61f58c42ad6.tar.bz2 vcxsrv-5f455179ae4b279a82d99a7a3dabe61f58c42ad6.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
xserver randrproto libxtrans fontconfig libxcb xcb-proto mesa git update 26 Jan 2014
Conflicts:
X11/xtrans/Xtrans.c
xorg-server/dix/dispatch.c
xorg-server/os/xdmcp.c
Diffstat (limited to 'xorg-server/test/hashtabletest.c')
| -rw-r--r-- | xorg-server/test/hashtabletest.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/xorg-server/test/hashtabletest.c b/xorg-server/test/hashtabletest.c index 6af14a8e6..ceadfa7a3 100644 --- a/xorg-server/test/hashtabletest.c +++ b/xorg-server/test/hashtabletest.c @@ -26,7 +26,6 @@ static int test1(void) { HashTable h; - XID id; int c; int ok = 1; const int numKeys = 420; @@ -36,7 +35,7 @@ test1(void) for (c = 0; c < numKeys; ++c) { int *dest; - id = c; + XID id = c; dest = ht_add(h, &id); if (dest) { *dest = 2 * c; @@ -85,7 +84,6 @@ static int test2(void) { HashTable h; - XID id; int c; int ok = 1; const int numKeys = 420; @@ -94,7 +92,7 @@ test2(void) h = ht_create(sizeof(XID), 0, ht_resourceid_hash, ht_resourceid_compare, NULL); for (c = 0; c < numKeys; ++c) { - id = c; + XID id = c; ht_add(h, &id); } |