Age | Commit message (Expand) | Author | Files | Lines |
2022-11-10 | Translations: Rename poa4/fr_FR.po to po4a/fr.po. | Lasse Collin | 2 | -1/+1 |
2022-11-09 | xz: Update the man page about BCJ filters, including upcoming --arm64. | Lasse Collin | 1 | -37/+29 |
2022-11-09 | xz: Add --arm64 to --long-help and omit endianness from ARM(-Thumb). | Lasse Collin | 1 | -2/+3 |
2022-11-09 | Windows: Update the VS project files for ARM64 and .lz support. | Lasse Collin | 9 | -4/+49 |
2022-11-09 | DOS: Update Makefile and config.h to include ARM64 and .lz support. | Lasse Collin | 2 | -0/+11 |
2022-11-09 | CMake: Add lzip decoder files and #define to the build. | Lasse Collin | 1 | -0/+3 |
2022-11-09 | Docs: Update INSTALL and also add new prohibited options to PACKAGERS. | Lasse Collin | 2 | -8/+43 |
2022-11-09 | Tests: Test the .lz files in test_files.sh. | Lasse Collin | 1 | -0/+25 |
2022-11-09 | Tests: Add .lz (lzip) test files. | Lasse Collin | 19 | -11/+98 |
2022-11-09 | xz: Remove the commented-out FORMAT_GZIP, gzip, .gz, and .tgz. | Lasse Collin | 3 | -12/+0 |
2022-11-09 | xz: Add .lz (lzip) decompression support. | Lasse Collin | 6 | -13/+141 |
2022-11-09 | liblzma: Add .lz support to lzma_auto_decoder(). | Lasse Collin | 4 | -11/+47 |
2022-11-09 | liblzma: Add .lz (lzip) decompression support (format versions 0 and 1). | Lasse Collin | 6 | -2/+501 |
2022-11-09 | liblzma: Add the missing Makefile.inc change for --disable-microlzma. | Lasse Collin | 1 | -2/+10 |
2022-11-09 | xz: Add comments about stdin and src_st.st_size. | Lasse Collin | 2 | -0/+13 |
2022-11-09 | xz: Fix displaying of file sizes in progress indicator in passthru mode. | Lasse Collin | 1 | -1/+5 |
2022-11-09 | xz: Add a comment why --to-stdout is not in --help. | Lasse Collin | 1 | -0/+3 |
2022-11-08 | xz: Make xz -lvv show that the upcoming --arm64 needs 5.4.0 to decompress. | Lasse Collin | 1 | -5/+15 |
2022-11-08 | Docs: Update faq.txt a little. | Lasse Collin | 1 | -23/+43 |
2022-11-08 | Translations: Update Turkish translation. | Lasse Collin | 1 | -1/+1 |
2022-11-08 | Translations: Update Croatian translation. | Lasse Collin | 1 | -94/+96 |
2022-11-08 | liblzma: Update API docs about decoder flags. | Lasse Collin | 1 | -4/+17 |
2022-11-08 | liblzma: Use the return_if_error() macro in alone_decoder.c. | Lasse Collin | 1 | -4/+2 |
2022-11-08 | liblzma: Fix a comment in auto_decoder.c. | Lasse Collin | 1 | -2/+2 |
2022-11-08 | xz: Initialize the pledge(2) sandbox at the very beginning of main(). | Lasse Collin | 1 | -13/+14 |
2022-11-07 | xz: Extend --robot --info-memory output. | Lasse Collin | 2 | -15/+56 |
2022-11-07 | liblzma: Include cached memory in reported memusage in threaded decoder. | Lasse Collin | 1 | -3/+19 |
2022-11-07 | xz: Avoid a compiler warning in progress_speed() in message.c. | Jia Tan | 1 | -6/+3 |
2022-10-31 | Build: Clarify comment in configure.ac about SSE2. | Lasse Collin | 1 | -1/+4 |
2022-10-31 | Build: Remove obsolete commented-out lines from configure.ac. | Lasse Collin | 1 | -4/+0 |
2022-10-31 | Windows: Fix mythread_once() macro with Vista threads. | Lasse Collin | 1 | -3/+4 |
2022-10-31 | liblzma: Silence -Wconversion warning from crc64_fast.c. | Lasse Collin | 1 | -2/+3 |
2022-10-31 | CMake: Sync tuklib_cpucores.cmake with tuklib_cpucores.m4. | Lasse Collin | 1 | -0/+5 |
2022-10-27 | Tests: test_files.sh: Make it not fail if features were disabled at build. | Lasse Collin | 1 | -4/+46 |
2022-10-27 | Tests: test_files.sh: Suppress an expected warning from the log. | Lasse Collin | 1 | -2/+2 |
2022-10-27 | Tests: test_files.sh: Print the reason for skipping if xz & xzdec missing. | Lasse Collin | 1 | -0/+1 |
2022-10-27 | Tests: Keep test_compress_* working when some filters are unavailable. | Lasse Collin | 1 | -14/+20 |
2022-10-26 | Tests: test_bcj_exact_size skips properly now if PowerPC filter disabled. | Jia Tan | 1 | -0/+3 |
2022-10-26 | Tests: Test also unsupported-*.xz. | Lasse Collin | 1 | -0/+37 |
2022-10-25 | Build: Use AC_CONFIG_HEADERS instead of the ancient AC_CONFIG_HEADER. | Lasse Collin | 1 | -1/+1 |
2022-10-25 | Build: Update m4/ax_pthread.m4 from Autoconf Archive. | Lasse Collin | 1 | -7/+22 |
2022-10-25 | Build: Add configure option --disable-microlzma. | Lasse Collin | 1 | -0/+22 |
2022-10-25 | xz: Fix --single-stream with an empty .xz Stream. | Lasse Collin | 1 | -0/+9 |
2022-10-25 | xz: Add support for OpenBSD's pledge() sandbox. | Lasse Collin | 4 | -4/+34 |
2022-10-25 | xz: Fix decompressor behavior if input uses an unsupported check type. | Lasse Collin | 1 | -4/+15 |
2022-10-25 | xz: Clarify the man page: input file isn't removed if an error occurs. | Lasse Collin | 1 | -2/+3 |
2022-10-25 | xz: Refactor to remove is_empty_filename(). | Lasse Collin | 3 | -17/+3 |
2022-10-25 | xz: If input file cannot be removed, treat it as a warning, not error. | Lasse Collin | 1 | -2/+2 |
2022-10-24 | liblzma: Threaded decoder: Stop the worker threads on errors. | Lasse Collin | 1 | -7/+26 |
2022-10-20 | tuklib_cpucores: Use HW_NCPUONLINE on OpenBSD. | Lasse Collin | 2 | -0/+14 |
2022-10-19 | Tests: Skip tests in test_*.sh if encoders and/or decoders are disabled. | Lasse Collin | 3 | -0/+34 |
2022-10-19 | Test: Remove the (exit 1) lines. | Lasse Collin | 3 | -25/+0 |
2022-10-19 | Tests: Fix a warning in test_memlimit.c when decoders are disabled. | Lasse Collin | 1 | -0/+3 |
2022-10-19 | Tests: Add test_memlimit to .gitignore. | Lasse Collin | 1 | -0/+1 |
2022-10-06 | Tests: Refactor test_stream_flags.c. | Jia Tan | 1 | -117/+416 |
2022-10-06 | Tests: Refactor test_block_header.c. | Jia Tan | 1 | -116/+370 |
2022-10-06 | Tests: Fix compilation issues. | Jia Tan | 6 | -9/+56 |
2022-10-05 | Tests: Include mythread.h in the tests that use MYTHREAD_ENABLED. | Lasse Collin | 3 | -0/+3 |
2022-10-05 | liblzma: Fix a compilation issue when encoders are disabled. | Jia Tan | 1 | -3/+4 |
2022-10-05 | Tests: Fix compilation error when threading support has been disabled. | Jia Tan | 3 | -0/+12 |
2022-10-05 | tuklib_integer: Add 64-bit endianness-converting reads and writes. | Lasse Collin | 3 | -12/+51 |
2022-09-30 | liblzma: Add API doc note about the .xz decoder LZMA_MEMLIMIT_ERROR bug. | Lasse Collin | 1 | -0/+11 |
2022-09-28 | liblzma: Add dest and src NULL checks to lzma_index_cat. | Jia Tan | 1 | -0/+3 |
2022-09-28 | Tests: Create a test for the lzma_index_cat bug. | Jia Tan | 1 | -1/+42 |
2022-09-28 | liblzma: Fix copying of check type statistics in lzma_index_cat(). | Jia Tan | 1 | -1/+6 |
2022-09-28 | tuklib_physmem: Fix Unicode builds on Windows. | Lasse Collin | 1 | -1/+1 |
2022-09-28 | Tests: Add test_memlimit.c to test restarting after LZMA_MEMLIMIT_ERROR. | Lasse Collin | 2 | -0/+153 |
2022-09-28 | liblzma: Stream decoder: Fix restarting after LZMA_MEMLIMIT_ERROR. | Lasse Collin | 1 | -3/+13 |
2022-09-28 | liblzma: Stream decoder: Fix comments. | Lasse Collin | 1 | -7/+5 |
2022-09-20 | liblzma: ARM64: Add comments. | Lasse Collin | 1 | -0/+13 |
2022-09-20 | liblzma: ARM64: Fix wrong comment in API doc. | Lasse Collin | 1 | -2/+2 |
2022-09-19 | xz: Add --experimental-arm64[=width=WIDTH]. | Lasse Collin | 4 | -0/+60 |
2022-09-19 | liblzma: Add experimental ARM64 BCJ filter with a temporary Filter ID. | Lasse Collin | 11 | -3/+313 |
2022-09-17 | liblzma: Simple/BCJ filters: Allow disabling generic BCJ options. | Lasse Collin | 8 | -9/+10 |
2022-09-16 | Tests: Add a test file for lzma_index_append() integer overflow bug. | Lasse Collin | 3 | -0/+18 |
2022-09-16 | Translations: Add Turkish translation. | Lasse Collin | 2 | -0/+978 |
2022-09-16 | Update THANKS. | Lasse Collin | 1 | -0/+1 |
2022-09-16 | xzgrep: Fix compatibility with old shells. | Lasse Collin | 1 | -3/+3 |
2022-09-09 | Tests: Silence warnings about unused functions from tuktest.h. | Lasse Collin | 1 | -0/+10 |
2022-09-09 | liblzma: lzma_filters_copy: Keep dest[] unmodified if an error occurs. | Lasse Collin | 2 | -7/+15 |
2022-09-08 | liblzma: lzma_index_append: Add missing integer overflow check. | Jia Tan | 1 | -0/+4 |
2022-09-08 | Update THANKS. | Lasse Collin | 1 | -0/+1 |
2022-09-08 | CMake: Clarify a comment about Windows symlinks without file extension. | Jia Tan | 1 | -4/+3 |
2022-09-08 | CMake: Update for liblzma_*.map files and fix wrong common_w32res.rc dep. | Lasse Collin | 1 | -5/+19 |
2022-09-08 | liblzma: Vaccinate against an ill patch from RHEL/CentOS 7. | Lasse Collin | 10 | -15/+382 |
2022-08-31 | CMake: Add xz symlinks. | Lasse Collin | 1 | -1/+37 |
2022-08-31 | CMake: Put xz man page install under if(UNIX) like is for xzdec. | Lasse Collin | 1 | -3/+5 |
2022-08-22 | Bump version number for 5.3.3alpha.larhzu/v5.3.3alpha | Lasse Collin | 2 | -2/+2 |
2022-08-22 | Add NEWS for 5.3.3alpha. | Lasse Collin | 1 | -0/+119 |
2022-08-22 | Translations: Add Portuguese translation. | Lasse Collin | 2 | -0/+1002 |
2022-08-22 | Translations: Add Serbian translation. | Lasse Collin | 2 | -0/+988 |
2022-08-22 | Translations: Add Swedish translation. | Lasse Collin | 2 | -0/+984 |
2022-08-22 | Translations: Add Esperanto translation. | Lasse Collin | 2 | -0/+985 |
2022-08-22 | Translations: Add Catalan translation. | Lasse Collin | 2 | -0/+1077 |
2022-08-22 | Translations: Add Ukrainian translation. | Lasse Collin | 2 | -0/+997 |
2022-08-22 | Translators: Add Romanian translation. | Lasse Collin | 2 | -0/+1017 |
2022-08-22 | Translations: Update Brazilian Portuguese translation. | Lasse Collin | 1 | -94/+92 |
2022-08-22 | Translations: Add Croatian translation. | Lasse Collin | 2 | -0/+988 |
2022-08-22 | Translations: Add Spanish translation. | Lasse Collin | 2 | -0/+985 |
2022-08-22 | Translations: Add Korean translation. | Lasse Collin | 2 | -0/+973 |
2022-08-22 | Translations: Rebuild cs.po to avoid incorrect fuzzy strings. | Lasse Collin | 1 | -270/+322 |
2022-08-22 | Translations: Add partial Danish translation. | Lasse Collin | 2 | -0/+897 |
2022-08-22 | Translations: Add hu, zh_CN, and zh_TW. | Lasse Collin | 4 | -0/+2907 |
2022-08-22 | Translations: Update vi.po to match the file from the TP. | Lasse Collin | 1 | -228/+179 |
2022-08-22 | Translations: Add fi and pt_BR, and update de, fr, it, and pl. | Lasse Collin | 7 | -746/+2697 |
2022-08-22 | xz: Try to clarify --memlimit-mt-decompress vs. --memlimit-compress. | Lasse Collin | 1 | -12/+19 |
2022-08-22 | CMake: Add liblzma tests. | Lasse Collin | 1 | -1/+52 |
2022-08-19 | xz: Revise --info-memory output. | Lasse Collin | 2 | -6/+27 |
2022-08-19 | xz: Update the man page for threaded decompression and memlimits. | Lasse Collin | 1 | -27/+121 |
2022-08-18 | Build: Include the CMake files in the distribution. | Lasse Collin | 1 | -0/+2 |
2022-08-18 | Windows: Fix broken liblzma.dll build with Visual Studio project files. | Lasse Collin | 3 | -0/+18 |
2022-08-18 | liblzma: Threaded decoder: Improve LZMA_FAIL_FAST when LZMA_FINISH is used. | Lasse Collin | 2 | -0/+48 |
2022-08-12 | Add NEWS for 5.2.6. | Lasse Collin | 1 | -0/+121 |
2022-08-12 | Add Jia Tan to AUTHORS. | Lasse Collin | 1 | -1/+1 |
2022-07-25 | Build: Start the generated ChangeLog from around 5.2.0 instead of 5.0.0. | Lasse Collin | 1 | -1/+1 |
2022-07-25 | Translations: Change the copyright comment string to use with po4a. | Lasse Collin | 1 | -1/+1 |
2022-07-25 | liblzma: Refactor lzma_mf_is_supported() to use a switch-statement. | Jia Tan | 1 | -18/+14 |
2022-07-25 | Build: Don't allow empty LIST in --enable-match-finders=LIST. | Jia Tan | 1 | -0/+4 |
2022-07-24 | xz: Update the man page that change to --keep will be in 5.2.6. | Lasse Collin | 1 | -2/+2 |
2022-07-19 | Update THANKS. | Lasse Collin | 1 | -0/+1 |
2022-07-19 | CMake: Add missing source file to liblzma build | Nicholas Jackson | 1 | -0/+1 |
2022-07-19 | xzgrep man page: Document exit statuses. | Lasse Collin | 1 | -1/+14 |
2022-07-19 | xzgrep: Improve error handling, especially signals. | Lasse Collin | 1 | -19/+53 |
2022-07-19 | xzgrep: Make the fix for ZDI-CAN-16587 more robust. | Lasse Collin | 1 | -1/+4 |
2022-07-18 | xzgrep: Use grep -H --label when available (GNU, *BSDs). | Lasse Collin | 1 | -0/+21 |
2022-07-18 | xzgrep: Use -e to specify the pattern to grep. | Lasse Collin | 1 | -8/+4 |
2022-07-18 | Scripts: Use printf instead of echo in a few places. | Lasse Collin | 4 | -11/+11 |
2022-07-17 | xzgrep: Add more LC_ALL=C to avoid bugs with multibyte characters. | Lasse Collin | 1 | -6/+8 |
2022-07-17 | xzgrep: Fix parsing of certain options. | Lasse Collin | 1 | -2/+17 |
2022-07-14 | Tests: Add the .lzma files to test_files.sh. | Lasse Collin | 1 | -0/+20 |
2022-07-14 | Tests: Add .lzma test files. | Lasse Collin | 9 | -13/+50 |
2022-07-14 | liblzma: Rename a variable and improve a comment. | Lasse Collin | 1 | -4/+9 |
2022-07-13 | Update THANKS. | Lasse Collin | 1 | -0/+1 |
2022-07-13 | liblzma: Add optional autodetection of LZMA end marker. | Lasse Collin | 7 | -39/+95 |
2022-07-12 | xz: Document the special memlimit case of 2000 MiB on MIPS32. | Lasse Collin | 1 | -2/+6 |
2022-07-10 | Created script to generate code coverage reports. | Jia Tan | 2 | -0/+83 |
2022-06-16 | Tests: Add more tests into test_check. | Jia Tan | 2 | -7/+295 |
2022-06-16 | Tests: Use char[][24] array for enum_strings_lzma_ret. | Lasse Collin | 1 | -1/+1 |
2022-06-16 | Tests: tuktest.h: Add tuktest_error_impl to help with error conditions. | Lasse Collin | 1 | -40/+32 |
2022-06-16 | Tests: tuktest.h: Rename file_from_* and use tuktest_malloc there. | Lasse Collin | 2 | -31/+25 |
2022-06-16 | Tests: tuktest.h: Add malloc wrapper with automatic freeing. | Lasse Collin | 1 | -0/+124 |
2022-06-16 | Tests: tuktest.h: Move a function. | Lasse Collin | 1 | -22/+22 |
2022-06-14 | Tests: test_vli: Remove an invalid test-assertion. | Lasse Collin | 1 | -2/+0 |
2022-06-14 | Tests: test_vli: Add const where appropriate. | Lasse Collin | 1 | -25/+28 |
2022-06-14 | Added vli tests to .gitignore | Jia Tan | 1 | -0/+1 |
2022-06-14 | Created tests for all functions exported in vli.h | Jia Tan | 2 | -1/+311 |
2022-06-14 | Added parallel test artifacts to .gitignore | jiat75 | 1 | -0/+2 |
2022-06-14 | Tests: Use good-1-empty-bcj-lzma2.xz in test_bcj_exact_size. | Lasse Collin | 1 | -12/+7 |
2022-06-14 | Tests: Add file reading helpers to tuktest.h. | Lasse Collin | 1 | -7/+176 |
2022-06-14 | Tests: tuktest.h: Move a printf from a macro to a helper function. | Lasse Collin | 1 | -8/+18 |
2022-06-14 | Tests: Add test file good-1-empty-bcj-lzma2.xz. | Lasse Collin | 2 | -0/+5 |
2022-06-10 | Tests: Created tests for hardware functions. | Jia Tan | 3 | -0/+48 |
2022-06-02 | Tests: Convert test_check to tuktest. | Lasse Collin | 1 | -34/+33 |
2022-06-02 | Tests: Convert test_block_header to tuktest. | Lasse Collin | 1 | -37/+52 |
2022-06-02 | Tests: Convert test_bcj_exact_size to tuktest. | Lasse Collin | 1 | -34/+41 |
2022-06-02 | Tests: Include tuktest.h in tests.h. | Lasse Collin | 1 | -24/+23 |
2022-06-02 | Tests: Add tuktest.h mini-test-framework. | Lasse Collin | 2 | -0/+753 |
2022-05-23 | Build: Enable Automake's parallel test harness. | Lasse Collin | 1 | -1/+1 |
2022-05-23 | Tests: Split test_compress.sh into separate test unit for each file. | Lasse Collin | 7 | -40/+77 |
2022-05-23 | Test: Make create_compress_files.c a little more flexible. | Lasse Collin | 1 | -10/+15 |
2022-05-23 | Tests: Remove unneeded commented lines from test_compress.sh. | Lasse Collin | 1 | -13/+0 |
2022-05-23 | Tests: Remove progress indicator from test_compress.sh. | Lasse Collin | 1 | -9/+0 |
2022-05-23 | liblzma: Silence a warning. | Lasse Collin | 1 | -1/+1 |
2022-04-14 | xz: Fix build with --disable-threads. | Lasse Collin | 1 | -0/+4 |
2022-04-14 | xz: Change the cap of the default -T0 memlimit for 32-bit xz. | Lasse Collin | 1 | -1/+3 |
2022-04-14 | xz: Add a default soft memory usage limit for --threads=0. | Lasse Collin | 3 | -11/+82 |
2022-04-14 | xz: Make -T0 use multithreaded mode on single-core systems. | Lasse Collin | 3 | -9/+27 |
2022-04-14 | xz: Changes to --memlimit-compress and --no-adjust. | Lasse Collin | 1 | -20/+43 |
2022-04-12 | xz: Add --memlimit-mt-decompress along with a default limit value. | Lasse Collin | 5 | -42/+97 |
2022-04-06 | liblzma: Threaded decoder: Improve setting of pending_error. | Lasse Collin | 1 | -16/+35 |
2022-04-06 | liblzma: Add a new flag LZMA_FAIL_FAST for threaded decoder. | Lasse Collin | 3 | -26/+56 |
2022-04-05 | liblzma: Threaded decoder: Always wait for output if LZMA_FINISH is used. | Lasse Collin | 1 | -2/+24 |
2022-04-02 | liblzma: Threaded decoder: Support zpipe.c-style decoding loop. | Lasse Collin | 1 | -10/+67 |
2022-03-31 | Update THANKS. | Lasse Collin | 1 | -0/+1 |
2022-03-29 | xzgrep: Fix escaping of malicious filenames (ZDI-CAN-16587). | Lasse Collin | 1 | -8/+12 |
2022-03-26 | liblzma: Fix a deadlock in threaded decoder. | Lasse Collin | 1 | -19/+52 |
2022-03-23 | Update THANKS. | Lasse Collin | 1 | -0/+1 |
2022-03-23 | liblzma: Threaded decoder: Don't stop threads on LZMA_TIMED_OUT. | Lasse Collin | 1 | -1/+1 |
2022-03-07 | xz: Add initial support for threaded decompression. | Lasse Collin | 1 | -1/+35 |
2022-03-07 | liblzma: Add threaded .xz decompressor. | Lasse Collin | 5 | -7/+1907 |
2022-03-06 | liblzma: Fix docs: lzma_block_decoder() cannot return LZMA_UNSUPPORTED_CHECK. | Lasse Collin | 1 | -3/+0 |
2022-03-06 | liblzma: Add new output queue (lzma_outq) features. | Lasse Collin | 2 | -8/+79 |
2022-03-06 | liblzma: Index hash: Change return value type of hash_append() to void. | Lasse Collin | 1 | -6/+5 |
2022-02-22 | liblzma: Minor addition to lzma_vli_size() API doc. | Lasse Collin | 1 | -0/+2 |
2022-02-22 | liblzma: Check the return value of lzma_index_append() in threaded encoder. | Lasse Collin | 1 | -2/+5 |
2022-02-22 | Update THANKS. | Lasse Collin | 1 | -0/+1 |
2022-02-22 | liblzma: Use non-executable stack on FreeBSD as on Linux | Ed Maste | 2 | -4/+4 |
2022-02-20 | liblzma: Make Block decoder catch certain types of errors better. | Lasse Collin | 1 | -25/+54 |
2022-02-20 | Tests: Add bad-1-lzma2-11.xz. | Lasse Collin | 2 | -0/+5 |
2022-02-18 | Translations: Fix po4a failure with the French man page translations. | Lasse Collin | 1 | -2/+4 |
2022-02-07 | Translations: Add French translation of man pages. | Lasse Collin | 2 | -1/+3542 |
2022-02-07 | liblzma: Add NULL checks to LZMA and LZMA2 properties encoders. | jiat75 | 2 | -0/+6 |
2022-02-06 | liblzma: Fix uint64_t vs. size_t confusion. | Lasse Collin | 1 | -4/+7 |
2022-02-06 | CMake: Keep compatible with Windows 95 for 32-bit build. | huangqinjin | 1 | -1/+11 |
2021-11-13 | xzgrep: Update man page timestamp. | Lasse Collin | 1 | -1/+1 |
2021-11-13 | Update THANKS. | Lasse Collin | 1 | -0/+1 |
2021-11-13 | xzgrep: use `grep -E/-F` instead of `egrep` and `fgrep` | Ville Skyttä | 2 | -6/+6 |
2021-10-28 | Bump the version number for 5.3.2alpha.larhzu/v5.3.2alpha | Lasse Collin | 2 | -2/+2 |
2021-10-28 | Add NEWS for 5.3.2alpha. | Lasse Collin | 1 | -0/+86 |
2021-10-27 | Update THANKS. | Lasse Collin | 1 | -0/+1 |