git: 34b867ca3047 - main - Merge commit '7087c8de43b0d5d27c52da6ba2ba4957b7e336ff' into new_merge
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 30 Jan 2023 05:10:57 UTC
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 <phil@FreeBSD.org>
AuthorDate: 2023-01-30 05:04:21 +0000
Commit: Phil Shafer <phil@FreeBSD.org>
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