From nobody Mon Jan 30 05:10:57 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4P4x8x4q2tz3cP7K; Mon, 30 Jan 2023 05:10:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P4x8x4K5vz3DT4; Mon, 30 Jan 2023 05:10:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675055457; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qJk14l7xKonPCAnMIe3N3QD2r2DB8xK0AJ9fKxQUe44=; b=QtIupY7ug63yNl4YqonU+7VVOzij2sBBDIpOY/dk3+H0Ij2D387Y4ZQWGpdV04eKECPqDY c1eSN6499N8QAtdX0E+pBAgCu5NldrOyTLPybEGFuIKVQFsA3DAYY6/Utq8MKq/EQyBUhs cGv4I1a/yR1rfQHVK9K2HyDnAjDYFszMBEXtO6vwIoN3NomPwDmGWXAGvKR2JT8xS/SKqp 59ITFYAy4m9TPPT1tukaxzgMwlBmAYiFekRvd0YUThgh/THTk+8C8jXEhF9lBCfFNbOrdq 0uZgv3wInD9wSTi7Rrcy4YYidzqqGEGZvIOvxf5ecdeyBMvPFZdVBU77ByYasA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675055457; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qJk14l7xKonPCAnMIe3N3QD2r2DB8xK0AJ9fKxQUe44=; b=O54hHgvpJkr3dxjAYDCcyumnHvgNZhAe4uom+8RQAwaz71P4rXh4y/AWNBuW1ptkaf2oU2 JaACXqSCkdA0tUlHQI8KM7BzTHvTcZdCV3BTTG5wksNzoAgva9vCG6CyZAfXxNVFLE919N pV/mv1acHAHRyQVwJFA5fRP4U5FH5wLVFtlnun/3DJxSBZL69Vechkfl+YeYHqHfbNp+ZO 4iFJlnzyaEwpI8owKKKy7Jqs4Ak1+HgZeuFcxjReMVD34aLAtfj7+I7nRk6ZUSf3DEg58r c7Yd+4fUAGaUnPwEP1QamibBZEm5mNeBoXb+GOItk/4rJWEhSEkjAtKRQWsE7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675055457; a=rsa-sha256; cv=none; b=HsPxBokQOWFlu8C4YKuVZWVONqLtaucN9acdehXoMmUhqwKF+eCEMwrY+oqi5ugxHdtm7y RcIFkr2WRTWSAJ/8rW/fjhPq7teuWyq7wBZqp/2rw/PKGZLCYitqZqYARoS7lj9sekpXK6 OJFy0ik/bCdU3jWIk7P1bbQ+1/XQ+SxeaaLRre4sM9bgpEcgG0uy7W0ikwPCbuu85dZdDP mfRjfcganQt3hnBqUx4GmtfsZwnbaZBXgCoNrO/bd2RO0B5hYt+6NYmBp2HEhjVyOdadnd QzOyIseT9LxfDFzBNXJLVhTBpB/5M92nMQfHuoVufSSuFxtJIsiY6RZWw8rVUg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4P4x8x3NByzvfy; Mon, 30 Jan 2023 05:10:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30U5Avb2071058; Mon, 30 Jan 2023 05:10:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30U5AvLW071057; Mon, 30 Jan 2023 05:10:57 GMT (envelope-from git) Date: Mon, 30 Jan 2023 05:10:57 GMT Message-Id: <202301300510.30U5AvLW071057@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Phil Shafer Subject: git: 34b867ca3047 - main - Merge commit '7087c8de43b0d5d27c52da6ba2ba4957b7e336ff' into new_merge List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: phil X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 34b867ca30479cec104fd069178df294f8ea35f1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by phil: URL: https://cgit.FreeBSD.org/src/commit/?id=34b867ca30479cec104fd069178df294f8ea35f1 commit 34b867ca30479cec104fd069178df294f8ea35f1 Merge: 4bbf45cf5610 7087c8de43b0 Author: Phil Shafer AuthorDate: 2023-01-30 05:04:21 +0000 Commit: Phil Shafer CommitDate: 2023-01-30 05:04:21 +0000 Merge commit '7087c8de43b0d5d27c52da6ba2ba4957b7e336ff' into new_merge contrib/libxo/.gitignore | 58 ++- contrib/libxo/.svnignore | 18 - contrib/libxo/Makefile.am | 2 +- contrib/libxo/configure.ac | 10 +- contrib/libxo/doc/Makefile.am | 6 +- contrib/libxo/doc/api.rst | 59 ++- contrib/libxo/doc/faq.rst | 5 +- contrib/libxo/doc/field-formatting.rst | 1 + contrib/libxo/doc/field-roles.rst | 5 + contrib/libxo/doc/xolint-errors.rst | 444 ++++++++++++++++++++++ contrib/libxo/doc/xolint.rst | 484 ++---------------------- contrib/libxo/libxo/Makefile.am | 1 + contrib/libxo/libxo/gen-wide.sh | 0 contrib/libxo/libxo/libxo-csv.7 | 274 ++++++++++++++ contrib/libxo/libxo/libxo.3 | 91 +++++ contrib/libxo/libxo/libxo.c | 30 +- contrib/libxo/libxo/xo_create.3 | 2 +- contrib/libxo/libxo/xo_emit.3 | 4 +- contrib/libxo/libxo/xo_emit_f.3 | 4 +- contrib/libxo/libxo/xo_emit_field.3 | 113 ++++++ contrib/libxo/libxo/xo_encoder.c | 29 +- contrib/libxo/libxo/xo_format.5 | 7 + contrib/libxo/libxo/xo_open_container.3 | 2 +- contrib/libxo/libxo/xo_open_list.3 | 6 +- contrib/libxo/libxo/xo_parse_args.3 | 92 +---- contrib/libxo/tests/core/Makefile.am | 40 +- contrib/libxo/tests/core/saved/test_01.E.out | 8 +- contrib/libxo/tests/core/saved/test_01.H.out | 5 +- contrib/libxo/tests/core/saved/test_01.HIPx.out | 241 ++++++------ contrib/libxo/tests/core/saved/test_01.HP.out | 3 + contrib/libxo/tests/core/saved/test_01.J.out | 2 +- contrib/libxo/tests/core/saved/test_01.JP.out | 5 +- contrib/libxo/tests/core/saved/test_01.JPu.err | 0 contrib/libxo/tests/core/saved/test_01.JPu.out | 185 +++++++++ contrib/libxo/tests/core/saved/test_01.T.out | 3 +- contrib/libxo/tests/core/saved/test_01.X.out | 2 +- contrib/libxo/tests/core/saved/test_01.XP.out | 5 +- contrib/libxo/tests/core/saved/test_02.E.out | 1 + contrib/libxo/tests/core/saved/test_02.H.out | 2 +- contrib/libxo/tests/core/saved/test_02.HIPx.out | 7 + contrib/libxo/tests/core/saved/test_02.HP.out | 7 + contrib/libxo/tests/core/saved/test_02.J.out | 2 +- contrib/libxo/tests/core/saved/test_02.JP.out | 1 + contrib/libxo/tests/core/saved/test_02.JPu.err | 1 + contrib/libxo/tests/core/saved/test_02.JPu.out | 99 +++++ contrib/libxo/tests/core/saved/test_02.T.out | 1 + contrib/libxo/tests/core/saved/test_02.X.out | 2 +- contrib/libxo/tests/core/saved/test_02.XP.out | 1 + contrib/libxo/tests/core/saved/test_03.JPu.err | 0 contrib/libxo/tests/core/saved/test_03.JPu.out | 33 ++ contrib/libxo/tests/core/saved/test_04.JPu.err | 0 contrib/libxo/tests/core/saved/test_04.JPu.out | 21 + contrib/libxo/tests/core/saved/test_05.JPu.err | 0 contrib/libxo/tests/core/saved/test_05.JPu.out | 91 +++++ contrib/libxo/tests/core/saved/test_06.JPu.err | 0 contrib/libxo/tests/core/saved/test_06.JPu.out | 21 + contrib/libxo/tests/core/saved/test_07.JPu.err | 0 contrib/libxo/tests/core/saved/test_07.JPu.out | 71 ++++ contrib/libxo/tests/core/saved/test_08.JPu.err | 18 + contrib/libxo/tests/core/saved/test_08.JPu.out | 185 +++++++++ contrib/libxo/tests/core/saved/test_09.JPu.err | 0 contrib/libxo/tests/core/saved/test_09.JPu.out | 39 ++ contrib/libxo/tests/core/saved/test_10.JPu.err | 0 contrib/libxo/tests/core/saved/test_10.JPu.out | 113 ++++++ contrib/libxo/tests/core/saved/test_11.JPu.err | 0 contrib/libxo/tests/core/saved/test_11.JPu.out | 22 ++ contrib/libxo/tests/core/saved/test_12.JPu.err | 4 + contrib/libxo/tests/core/saved/test_12.JPu.out | 94 +++++ contrib/libxo/tests/core/test_01.c | 11 +- contrib/libxo/tests/core/test_02.c | 2 + contrib/libxo/tests/core/test_08.c | 8 +- contrib/libxo/tests/xo/xo_01.sh | 0 contrib/libxo/tests/xo/xo_02.sh | 0 contrib/libxo/xo/xo.1 | 2 +- contrib/libxo/xolint/xolint.pl | 0 75 files changed, 2326 insertions(+), 779 deletions(-) diff --cc contrib/libxo/.gitignore index 8d70b6cc1550,000000000000..f4ace8fe0a81 mode 100644,000000..100644 --- a/contrib/libxo/.gitignore +++ b/contrib/libxo/.gitignore @@@ -1,46 -1,0 +1,32 @@@ - # Object files - *.o - - # Libraries - *.lib - *.a - - # Shared objects (inc. Windows DLLs) - *.dll - *.so - *.so.* - *.dylib - - # Executables - *.exe - *.app - - *~ - *.orig - ++tag.sh ++Makefile.in +aclocal.m4 +ar-lib +autom4te.cache - build ++bin ++build* +compile ++configure +config.guess - config.h.in +config.sub +depcomp ++doc/Makefile.in ++info* +install-sh +ltmain.sh - missing +m4 - - Makefile.in - configure - .DS_Store - - xoconfig.h.in - xo_config.h.in - - .gdbinit - .gdbinit.local - xtest - xtest.dSYM - tests/w ++missing ++patches* ++doc/Makefile.in ++encoder/Makefile.in ++encoder/cbor/Makefile.in ++encoder/test/Makefile.in ++libxo/Makefile.in ++tests/Makefile.in ++tests/core/Makefile.in ++tests/gettext/Makefile.in ++tests/xo/Makefile.in ++xo/Makefile.in ++xohtml/Makefile.in ++xolint/Makefile.in ++xopo/Makefile.in diff --cc contrib/libxo/doc/xolint-errors.rst index 000000000000,c3e518b9cddf..c3e518b9cddf mode 000000,100644..100644 --- a/contrib/libxo/doc/xolint-errors.rst +++ b/contrib/libxo/doc/xolint-errors.rst diff --cc contrib/libxo/libxo/gen-wide.sh index b0342874b179,b0342874b179..b0342874b179 mode 100755,100644..100644 --- a/contrib/libxo/libxo/gen-wide.sh +++ b/contrib/libxo/libxo/gen-wide.sh diff --cc contrib/libxo/libxo/libxo-csv.7 index 000000000000,6e043820a010..6e043820a010 mode 000000,100644..100644 --- a/contrib/libxo/libxo/libxo-csv.7 +++ b/contrib/libxo/libxo/libxo-csv.7 diff --cc contrib/libxo/libxo/xo_emit_field.3 index 000000000000,4f9636cee8e7..4f9636cee8e7 mode 000000,100644..100644 --- a/contrib/libxo/libxo/xo_emit_field.3 +++ b/contrib/libxo/libxo/xo_emit_field.3 diff --cc contrib/libxo/tests/core/saved/test_01.JPu.err index 000000000000,000000000000..e69de29bb2d1 new file mode 100644 --- /dev/null +++ b/contrib/libxo/tests/core/saved/test_01.JPu.err diff --cc contrib/libxo/tests/core/saved/test_01.JPu.out index 000000000000,747db16f07a7..747db16f07a7 mode 000000,100644..100644 --- a/contrib/libxo/tests/core/saved/test_01.JPu.out +++ b/contrib/libxo/tests/core/saved/test_01.JPu.out diff --cc contrib/libxo/tests/core/saved/test_02.JPu.err index 000000000000,cedb03e0da31..cedb03e0da31 mode 000000,100644..100644 --- a/contrib/libxo/tests/core/saved/test_02.JPu.err +++ b/contrib/libxo/tests/core/saved/test_02.JPu.err diff --cc contrib/libxo/tests/core/saved/test_02.JPu.out index 000000000000,d0b868a5f8ee..d0b868a5f8ee mode 000000,100644..100644 --- a/contrib/libxo/tests/core/saved/test_02.JPu.out +++ b/contrib/libxo/tests/core/saved/test_02.JPu.out diff --cc contrib/libxo/tests/core/saved/test_03.JPu.err index 000000000000,000000000000..e69de29bb2d1 new file mode 100644 --- /dev/null +++ b/contrib/libxo/tests/core/saved/test_03.JPu.err diff --cc contrib/libxo/tests/core/saved/test_03.JPu.out index 000000000000,d0c3ccf45b59..d0c3ccf45b59 mode 000000,100644..100644 --- a/contrib/libxo/tests/core/saved/test_03.JPu.out +++ b/contrib/libxo/tests/core/saved/test_03.JPu.out diff --cc contrib/libxo/tests/core/saved/test_04.JPu.err index 000000000000,000000000000..e69de29bb2d1 new file mode 100644 --- /dev/null +++ b/contrib/libxo/tests/core/saved/test_04.JPu.err diff --cc contrib/libxo/tests/core/saved/test_04.JPu.out index 000000000000,b0f802dc03fd..b0f802dc03fd mode 000000,100644..100644 --- a/contrib/libxo/tests/core/saved/test_04.JPu.out +++ b/contrib/libxo/tests/core/saved/test_04.JPu.out diff --cc contrib/libxo/tests/core/saved/test_05.JPu.err index 000000000000,000000000000..e69de29bb2d1 new file mode 100644 --- /dev/null +++ b/contrib/libxo/tests/core/saved/test_05.JPu.err diff --cc contrib/libxo/tests/core/saved/test_05.JPu.out index 000000000000,9bcbf69df916..9bcbf69df916 mode 000000,100644..100644 --- a/contrib/libxo/tests/core/saved/test_05.JPu.out +++ b/contrib/libxo/tests/core/saved/test_05.JPu.out diff --cc contrib/libxo/tests/core/saved/test_06.JPu.err index 000000000000,000000000000..e69de29bb2d1 new file mode 100644 --- /dev/null +++ b/contrib/libxo/tests/core/saved/test_06.JPu.err diff --cc contrib/libxo/tests/core/saved/test_06.JPu.out index 000000000000,b0f802dc03fd..b0f802dc03fd mode 000000,100644..100644 --- a/contrib/libxo/tests/core/saved/test_06.JPu.out +++ b/contrib/libxo/tests/core/saved/test_06.JPu.out diff --cc contrib/libxo/tests/core/saved/test_07.JPu.err index 000000000000,000000000000..e69de29bb2d1 new file mode 100644 --- /dev/null +++ b/contrib/libxo/tests/core/saved/test_07.JPu.err diff --cc contrib/libxo/tests/core/saved/test_07.JPu.out index 000000000000,c33bb26eea03..c33bb26eea03 mode 000000,100644..100644 --- a/contrib/libxo/tests/core/saved/test_07.JPu.out +++ b/contrib/libxo/tests/core/saved/test_07.JPu.out diff --cc contrib/libxo/tests/core/saved/test_08.JPu.err index 000000000000,011858cd30d7..011858cd30d7 mode 000000,100644..100644 --- a/contrib/libxo/tests/core/saved/test_08.JPu.err +++ b/contrib/libxo/tests/core/saved/test_08.JPu.err diff --cc contrib/libxo/tests/core/saved/test_08.JPu.out index 000000000000,46f3de5ff6c5..46f3de5ff6c5 mode 000000,100644..100644 --- a/contrib/libxo/tests/core/saved/test_08.JPu.out +++ b/contrib/libxo/tests/core/saved/test_08.JPu.out diff --cc contrib/libxo/tests/core/saved/test_09.JPu.err index 000000000000,000000000000..e69de29bb2d1 new file mode 100644 --- /dev/null +++ b/contrib/libxo/tests/core/saved/test_09.JPu.err diff --cc contrib/libxo/tests/core/saved/test_09.JPu.out index 000000000000,48e20c146673..48e20c146673 mode 000000,100644..100644 --- a/contrib/libxo/tests/core/saved/test_09.JPu.out +++ b/contrib/libxo/tests/core/saved/test_09.JPu.out diff --cc contrib/libxo/tests/core/saved/test_10.JPu.err index 000000000000,000000000000..e69de29bb2d1 new file mode 100644 --- /dev/null +++ b/contrib/libxo/tests/core/saved/test_10.JPu.err diff --cc contrib/libxo/tests/core/saved/test_10.JPu.out index 000000000000,2dd55419304a..2dd55419304a mode 000000,100644..100644 --- a/contrib/libxo/tests/core/saved/test_10.JPu.out +++ b/contrib/libxo/tests/core/saved/test_10.JPu.out diff --cc contrib/libxo/tests/core/saved/test_11.JPu.err index 000000000000,000000000000..e69de29bb2d1 new file mode 100644 --- /dev/null +++ b/contrib/libxo/tests/core/saved/test_11.JPu.err diff --cc contrib/libxo/tests/core/saved/test_11.JPu.out index 000000000000,f82139be8779..f82139be8779 mode 000000,100644..100644 --- a/contrib/libxo/tests/core/saved/test_11.JPu.out +++ b/contrib/libxo/tests/core/saved/test_11.JPu.out diff --cc contrib/libxo/tests/core/saved/test_12.JPu.err index 000000000000,6e563c3c236c..6e563c3c236c mode 000000,100644..100644 --- a/contrib/libxo/tests/core/saved/test_12.JPu.err +++ b/contrib/libxo/tests/core/saved/test_12.JPu.err diff --cc contrib/libxo/tests/core/saved/test_12.JPu.out index 000000000000,0095d8dcc59a..0095d8dcc59a mode 000000,100644..100644 --- a/contrib/libxo/tests/core/saved/test_12.JPu.out +++ b/contrib/libxo/tests/core/saved/test_12.JPu.out diff --cc contrib/libxo/tests/xo/xo_01.sh index 472c58c48050,472c58c48050..472c58c48050 mode 100755,100644..100644 --- a/contrib/libxo/tests/xo/xo_01.sh +++ b/contrib/libxo/tests/xo/xo_01.sh diff --cc contrib/libxo/tests/xo/xo_02.sh index 3f4917a62603,3f4917a62603..3f4917a62603 mode 100755,100644..100644 --- a/contrib/libxo/tests/xo/xo_02.sh +++ b/contrib/libxo/tests/xo/xo_02.sh diff --cc contrib/libxo/xolint/xolint.pl index 0d2be9384181,0d2be9384181..0d2be9384181 mode 100755,100644..100644 --- a/contrib/libxo/xolint/xolint.pl +++ b/contrib/libxo/xolint/xolint.pl