diff options
author | Jakub Jelinek <jakub@redhat.com> | 2007-12-12 18:13:35 +0000 |
---|---|---|
committer | Jakub Jelinek <jakub@redhat.com> | 2007-12-12 18:13:35 +0000 |
commit | 574e283890a6ca92325a06dafa76ff307a8019a2 (patch) | |
tree | 055e44e24a55fb4863e5d9cdc04e320cde52ffe9 /posix/tst-rfc3484-2.c | |
parent | a162e5955f7e324be82d9318bbcbe869c66ffb86 (diff) |
Updated to fedora-glibc-20071212T1051
Diffstat (limited to 'posix/tst-rfc3484-2.c')
-rw-r--r-- | posix/tst-rfc3484-2.c | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/posix/tst-rfc3484-2.c b/posix/tst-rfc3484-2.c index f318523ed5..d29f0725cc 100644 --- a/posix/tst-rfc3484-2.c +++ b/posix/tst-rfc3484-2.c @@ -18,6 +18,12 @@ __check_pf (bool *p1, bool *p2, struct in6addrinfo **in6ai, size_t *in6ailen) *in6ai = NULL; *in6ailen = 0; } +void +attribute_hidden +__check_native (uint32_t a1_index, int *a1_native, + uint32_t a2_index, int *a2_native) +{ +} int __idna_to_ascii_lz (const char *input, char **output, int flags) { @@ -60,6 +66,7 @@ do_test (void) { labels = default_labels; precedence = default_precedence; + scopes = default_scopes; struct sockaddr_in so1; so1.sin_family = AF_INET; @@ -99,6 +106,8 @@ do_test (void) results[0].source_addr_len = sizeof (so1); results[0].source_addr_flags = 0; results[0].service_order = 0; + results[0].prefixlen = 16; + results[0].index = 0; memcpy (&results[0].source_addr, &so1, sizeof (so1)); results[1].dest_addr = &ai2; @@ -106,10 +115,13 @@ do_test (void) results[1].source_addr_len = sizeof (so2); results[1].source_addr_flags = 0; results[1].service_order = 1; + results[1].prefixlen = 16; + results[1].index = 0; memcpy (&results[1].source_addr, &so2, sizeof (so2)); - qsort (results, 2, sizeof (results[0]), rfc3484_sort); + struct sort_result_combo combo = { .results = results, .nresults = 2 }; + qsort_r (results, 2, sizeof (results[0]), rfc3484_sort, &combo); int result = 0; if (results[0].dest_addr->ai_family == AF_INET6) @@ -125,6 +137,8 @@ do_test (void) results[1].source_addr_len = sizeof (so1); results[1].source_addr_flags = 0; results[1].service_order = 1; + results[1].prefixlen = 16; + results[1].index = 0; memcpy (&results[1].source_addr, &so1, sizeof (so1)); results[0].dest_addr = &ai2; @@ -132,10 +146,12 @@ do_test (void) results[0].source_addr_len = sizeof (so2); results[0].source_addr_flags = 0; results[0].service_order = 0; + results[0].prefixlen = 16; + results[0].index = 0; memcpy (&results[0].source_addr, &so2, sizeof (so2)); - qsort (results, 2, sizeof (results[0]), rfc3484_sort); + qsort_r (results, 2, sizeof (results[0]), rfc3484_sort, &combo); if (results[0].dest_addr->ai_family == AF_INET6) { |