GNU C Library master sources branch master updated. glibc-2.29.9000-14-g6175507

[fw at sourceware dot org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  6175507c06de56e03407004bd2f289ed2cce034d (commit)
       via  baef19438741905fde4e740ee8f3fcf856d4e820 (commit)
       via  395599f0cf5168e821eed2a3451b18344ae7b5bd (commit)
      from  b06f4c0094d3c68be39ada0ed26ae99d51f48013 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=6175507c06de56e03407004bd2f289ed2cce034d

commit 6175507c06de56e03407004bd2f289ed2cce034d
Author: Florian Weimer <fweimer@redhat.com>
Date:   Fri Feb 1 14:04:42 2019 +0100

    support: Correct error message for TEST_COMPARE_STRING
    
    It should say "string", not "blob".

diff --git a/ChangeLog b/ChangeLog
index 09e9001..292d11d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2019-02-01  Florian Weimer  <fweimer@redhat.com>
 
+	* support/support_test_compare_string.c
+	(support_test_compare_string): Use "string" in error message.
+	* support/tst-test_compare_string.c (do_test): Adjust.
+
+2019-02-01  Florian Weimer  <fweimer@redhat.com>
+
 	* support/support_format_address_family.c
 	(support_format_address_family): Handle AF_LOCAL, AF_UNSPEC.
 
diff --git a/support/support_test_compare_string.c b/support/support_test_compare_string.c
index d6d6d55..36b248c 100644
--- a/support/support_test_compare_string.c
+++ b/support/support_test_compare_string.c
@@ -75,7 +75,7 @@ support_test_compare_string (const char *left, const char *right,
       || memcmp (left, right, left_length) != 0)
     {
       support_record_failure ();
-      printf ("%s:%d: error: blob comparison failed\n", file, line);
+      printf ("%s:%d: error: string comparison failed\n", file, line);
       if (left_length == right_length && right != NULL && left != NULL)
         printf ("  string length: %zu bytes\n", left_length);
       else
diff --git a/support/tst-test_compare_string.c b/support/tst-test_compare_string.c
index ec2ae12..f471a8b 100644
--- a/support/tst-test_compare_string.c
+++ b/support/tst-test_compare_string.c
@@ -60,22 +60,22 @@ do_test (void)
 
   TEST_VERIFY
     (strcmp (proc.out.buffer,
-"tst-test_compare_string.c:29: error: blob comparison failed\n"
+"tst-test_compare_string.c:29: error: string comparison failed\n"
 "  left string: 0 bytes\n"
 "  right string: NULL\n"
-"tst-test_compare_string.c:30: error: blob comparison failed\n"
+"tst-test_compare_string.c:30: error: string comparison failed\n"
 "  left string: 1 bytes\n"
 "  right string: 0 bytes\n"
 "  left (evaluated from \"X\"):\n"
 "      \"X\"\n"
 "      58\n"
-"tst-test_compare_string.c:31: error: blob comparison failed\n"
+"tst-test_compare_string.c:31: error: string comparison failed\n"
 "  left string: NULL\n"
 "  right string: 1 bytes\n"
 "  right (evaluated from \"X\"):\n"
 "      \"X\"\n"
 "      58\n"
-"tst-test_compare_string.c:32: error: blob comparison failed\n"
+"tst-test_compare_string.c:32: error: string comparison failed\n"
 "  string length: 4 bytes\n"
 "  left (evaluated from \"abcd\"):\n"
 "      \"abcd\"\n"
@@ -83,13 +83,13 @@ do_test (void)
 "  right (evaluated from \"abcD\"):\n"
 "      \"abcD\"\n"
 "      61 62 63 44\n"
-"tst-test_compare_string.c:33: error: blob comparison failed\n"
+"tst-test_compare_string.c:33: error: string comparison failed\n"
 "  left string: 4 bytes\n"
 "  right string: NULL\n"
 "  left (evaluated from \"abcd\"):\n"
 "      \"abcd\"\n"
 "      61 62 63 64\n"
-"tst-test_compare_string.c:34: error: blob comparison failed\n"
+"tst-test_compare_string.c:34: error: string comparison failed\n"
 "  left string: NULL\n"
 "  right string: 4 bytes\n"
 "  right (evaluated from \"abcd\"):\n"

http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=baef19438741905fde4e740ee8f3fcf856d4e820

commit baef19438741905fde4e740ee8f3fcf856d4e820
Author: Florian Weimer <fweimer@redhat.com>
Date:   Fri Feb 1 14:04:02 2019 +0100

    support: Handle AF_LOCAL, AF_UNSPEC in support_format_address_family

diff --git a/ChangeLog b/ChangeLog
index 646dd79..09e9001 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2019-02-01  Florian Weimer  <fweimer@redhat.com>
 
+	* support/support_format_address_family.c
+	(support_format_address_family): Handle AF_LOCAL, AF_UNSPEC.
+
+2019-02-01  Florian Weimer  <fweimer@redhat.com>
+
 	* manual/socket.texi (Internet Address Formats): Clarify the byte
 	order of struct sockaddr_in, struct sockaddr_in6.  Document
 	sin6_flowinfo and sin6_scope_id.
diff --git a/support/support_format_address_family.c b/support/support_format_address_family.c
index cc3fb86..8f439d5 100644
--- a/support/support_format_address_family.c
+++ b/support/support_format_address_family.c
@@ -29,6 +29,10 @@ support_format_address_family (int family)
       return xstrdup ("INET");
     case AF_INET6:
       return xstrdup ("INET6");
+    case AF_LOCAL:
+      return xstrdup ("LOCAL");
+    case AF_UNSPEC:
+      return xstrdup ("UNSPEC");
     default:
       return xasprintf ("<unknown address family %d>", family);
     }

http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=395599f0cf5168e821eed2a3451b18344ae7b5bd

commit 395599f0cf5168e821eed2a3451b18344ae7b5bd
Author: Florian Weimer <fweimer@redhat.com>
Date:   Fri Feb 1 14:03:39 2019 +0100

    manual: Update struct sockaddr_in, struct sockaddr_sin6 description
    
    Clarify the byte order of the the struct fields and document
    sin6_flowinfo and sin6_scope_id.

diff --git a/ChangeLog b/ChangeLog
index 2e741a7..646dd79 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2019-02-01  Florian Weimer  <fweimer@redhat.com>
+
+	* manual/socket.texi (Internet Address Formats): Clarify the byte
+	order of struct sockaddr_in, struct sockaddr_in6.  Document
+	sin6_flowinfo and sin6_scope_id.
+
 2019-02-01  Wilco Dijkstra  <wdijkstr@arm.com>
 
 	* sysdeps/posix/clock_getres.c (__clock_getres): Cleanup.
diff --git a/manual/socket.texi b/manual/socket.texi
index a6c44b7..cd7c0e7 100644
--- a/manual/socket.texi
+++ b/manual/socket.texi
@@ -779,16 +779,17 @@ Internet namespace.  It has the following members:
 @table @code
 @item sa_family_t sin_family
 This identifies the address family or format of the socket address.
-You should store the value @code{AF_INET} in this member.
-@xref{Socket Addresses}.
+You should store the value @code{AF_INET} in this member.  The address
+family is stored in host byte order.  @xref{Socket Addresses}.
 
 @item struct in_addr sin_addr
-This is the Internet address of the host machine.  @xref{Host
-Addresses}, and @ref{Host Names}, for how to get a value to store
-here.
+This is the IPv4 address.  @xref{Host Addresses}, and @ref{Host
+Names}, for how to get a value to store here.  The IPv4 address is
+stored in network byte order.
 
 @item unsigned short int sin_port
-This is the port number.  @xref{Ports}.
+This is the port number.  @xref{Ports}.  The port number is stored in
+network byte order.
 @end table
 @end deftp
 
@@ -804,18 +805,36 @@ namespace.  It has the following members:
 @item sa_family_t sin6_family
 This identifies the address family or format of the socket address.
 You should store the value of @code{AF_INET6} in this member.
-@xref{Socket Addresses}.
+@xref{Socket Addresses}.  The address family is stored in host byte
+order.
 
 @item struct in6_addr sin6_addr
 This is the IPv6 address of the host machine.  @xref{Host
 Addresses}, and @ref{Host Names}, for how to get a value to store
-here.
+here.  The address is stored in network byte order.
 
 @item uint32_t sin6_flowinfo
-This is a currently unimplemented field.
+@cindex flow label
+@cindex IPv6 flow label
+@cindex traffic class
+@cindex IPv6 traffic class
+This combines the IPv6 traffic class and flow label values, as found
+in the IPv6 header.  This field is stored in network byte order.  Only
+the 28 lower bits (of the number in network byte order) are used; the
+remainig bits must be zero.  The lower 20 bits are the flow label, and
+bits 20 to 27 are the the traffic class.  Typically, this field is
+zero.
+
+@item uint32_t sin6_scope_id
+@cindex scope ID
+@cindex IPv6 scope ID
+For link-local addresses, this identifies the interface on which this
+address is valid.  The scope ID is stored in host byte order.
+Typically, this field is zero.
 
 @item uint16_t sin6_port
-This is the port number.  @xref{Ports}.
+This is the port number.  @xref{Ports}.  The port number is stored in
+network byte order.
 
 @end table
 @end deftp

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                               |   17 +++++++++++++
 manual/socket.texi                      |   39 +++++++++++++++++++++++--------
 support/support_format_address_family.c |    4 +++
 support/support_test_compare_string.c   |    2 +-
 support/tst-test_compare_string.c       |   12 ++++----
 5 files changed, 57 insertions(+), 17 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources