Skip to content

Commit 275c3ca

Browse files
hozlucas28hozlucas28
committed
Merge branch 'Master' into doc/missing-todos
2 parents ba6bda4 + b6876e5 commit 275c3ca

File tree

3 files changed

+58
-59
lines changed

3 files changed

+58
-59
lines changed

‎.github/workflows/format-code.yml‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,17 @@ jobs:
1313
name: Format code
1414
runs-on: ubuntu-latest
1515
steps:
16+
- name: Generate a token
17+
id: generate_token
18+
uses: actions/[email protected]
19+
with:
20+
app-id: ${{ secrets.CONTINUOUS_INTEGRATION_BOT_ID }}
21+
private-key: ${{ secrets.CONTINUOUS_INTEGRATION_BOT_KEY }}
22+
1623
- name: Checkout repository
1724
uses: actions/checkout@v4
25+
with:
26+
token: ${{ steps.generate_token.outputs.token }}
1827

1928
- name: Install clang-format (formatter tool)
2029
run: sudo apt-get install clang-format
@@ -28,9 +37,4 @@ jobs:
2837
git config --global user.email 'github-actions[bot]@users.noreply.github.com'
2938
git add .
3039
git diff-index --quiet HEAD || git commit -m "ci: format code"
31-
32-
- name: Push changes
33-
uses: ad-m/[email protected]
34-
with:
35-
branch: ${{ github.ref }}
36-
github_token: ${{ secrets.GITHUB_TOKEN }}
40+
git push

‎src/cURL/include/brotli/decode.h‎

Lines changed: 20 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -101,33 +101,27 @@ typedef enum {
101101
-20) SEPARATOR \
102102
\
103103
/* Memory allocation problems */ \
104-
BROTLI_ERROR_CODE( \
105-
_ERROR_ALLOC_, CONTEXT_MODES, \
106-
-21) SEPARATOR /* Literal, insert and distance trees together */ \
107-
BROTLI_ERROR_CODE(_ERROR_ALLOC_, TREE_GROUPS, -22) \
108-
SEPARATOR /* -23..-24 codes are reserved for distinct tree \
109-
groups */ \
110-
BROTLI_ERROR_CODE( \
111-
_ERROR_ALLOC_, CONTEXT_MAP, \
112-
-25) SEPARATOR BROTLI_ERROR_CODE(_ERROR_ALLOC_, \
113-
RING_BUFFER_1, \
114-
-26) \
115-
SEPARATOR BROTLI_ERROR_CODE( \
116-
_ERROR_ALLOC_, RING_BUFFER_2, -27) \
117-
SEPARATOR /* -28..-29 codes are reserved \
118-
for dynamic ring-buffer \
119-
allocation */ \
120-
BROTLI_ERROR_CODE( \
121-
_ERROR_ALLOC_, \
122-
BLOCK_TYPE_TREES, \
123-
-30) SEPARATOR \
104+
BROTLI_ERROR_CODE(_ERROR_ALLOC_, CONTEXT_MODES, -21) \
105+
SEPARATOR /* Literal, insert and distance trees together */ \
106+
BROTLI_ERROR_CODE(_ERROR_ALLOC_, TREE_GROUPS, -22) \
107+
SEPARATOR /* -23..-24 codes are reserved for distinct tree \
108+
groups */ \
109+
BROTLI_ERROR_CODE(_ERROR_ALLOC_, CONTEXT_MAP, -25) \
110+
SEPARATOR BROTLI_ERROR_CODE(_ERROR_ALLOC_, \
111+
RING_BUFFER_1, -26) \
112+
SEPARATOR BROTLI_ERROR_CODE( \
113+
_ERROR_ALLOC_, RING_BUFFER_2, -27) \
114+
SEPARATOR /* -28..-29 codes are reserved \
115+
for dynamic ring-buffer \
116+
allocation */ \
117+
BROTLI_ERROR_CODE(_ERROR_ALLOC_, \
118+
BLOCK_TYPE_TREES, \
119+
-30) SEPARATOR \
124120
\
125-
/* "Impossible" states \
126-
*/ \
127-
BROTLI_ERROR_CODE( \
128-
_ERROR_, \
129-
UNREACHABLE, \
130-
-31)
121+
/* "Impossible" states \
122+
*/ \
123+
BROTLI_ERROR_CODE( \
124+
_ERROR_, UNREACHABLE, -31)
131125

132126
/**
133127
* Error code for detailed logging / production debugging.

‎src/cURL/include/zstd.h‎

Lines changed: 28 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -355,33 +355,34 @@ typedef enum {
355355
* It's possible to pin down compression parameters to some specific values.
356356
* In which case, these values are no longer dynamically selected by the compressor */
357357
ZSTD_c_windowLog =
358-
101, /* Maximum allowed back-reference distance, expressed as power of 2.
359-
* This will set a memory budget for streaming decompression,
360-
* with larger values requiring more memory
361-
* and typically compressing more.
362-
* Must be clamped between ZSTD_WINDOWLOG_MIN and ZSTD_WINDOWLOG_MAX.
363-
* Special: value 0 means "use default windowLog".
364-
* Note: Using a windowLog greater than ZSTD_WINDOWLOG_LIMIT_DEFAULT
365-
* requires explicitly allowing such size at streaming decompression stage. */
366-
ZSTD_c_hashLog = 102, /* Size of the initial probe table, as a power of 2.
367-
* Resulting memory usage is (1 << (hashLog+2)).
368-
* Must be clamped between ZSTD_HASHLOG_MIN and ZSTD_HASHLOG_MAX.
369-
* Larger tables improve compression ratio of strategies <= dFast,
370-
* and improve speed of strategies > dFast.
371-
* Special: value 0 means "use default hashLog". */
372-
ZSTD_c_chainLog = 103, /* Size of the multi-probe search table, as a power of 2.
373-
* Resulting memory usage is (1 << (chainLog+2)).
374-
* Must be clamped between ZSTD_CHAINLOG_MIN and ZSTD_CHAINLOG_MAX.
375-
* Larger tables result in better and slower compression.
376-
* This parameter is useless for "fast" strategy.
377-
* It's still useful when using "dfast" strategy,
378-
* in which case it defines a secondary probe table.
379-
* Special: value 0 means "use default chainLog". */
380-
ZSTD_c_searchLog = 104, /* Number of search attempts, as a power of 2.
381-
* More attempts result in better and slower compression.
382-
* This parameter is useless for "fast" and "dFast" strategies.
383-
* Special: value 0 means "use default searchLog". */
384-
ZSTD_c_minMatch = 105, /* Minimum size of searched matches.
358+
101, /* Maximum allowed back-reference distance, expressed as power of 2.
359+
* This will set a memory budget for streaming decompression,
360+
* with larger values requiring more memory
361+
* and typically compressing more.
362+
* Must be clamped between ZSTD_WINDOWLOG_MIN and ZSTD_WINDOWLOG_MAX.
363+
* Special: value 0 means "use default windowLog".
364+
* Note: Using a windowLog greater than ZSTD_WINDOWLOG_LIMIT_DEFAULT
365+
* requires explicitly allowing such size at streaming decompression stage. */
366+
ZSTD_c_hashLog = 102, /* Size of the initial probe table, as a power of 2.
367+
* Resulting memory usage is (1 << (hashLog+2)).
368+
* Must be clamped between ZSTD_HASHLOG_MIN and ZSTD_HASHLOG_MAX.
369+
* Larger tables improve compression ratio of strategies <= dFast,
370+
* and improve speed of strategies > dFast.
371+
* Special: value 0 means "use default hashLog". */
372+
ZSTD_c_chainLog = 103, /* Size of the multi-probe search table, as a power of 2.
373+
* Resulting memory usage is (1 << (chainLog+2)).
374+
* Must be clamped between ZSTD_CHAINLOG_MIN and ZSTD_CHAINLOG_MAX.
375+
* Larger tables result in better and slower compression.
376+
* This parameter is useless for "fast" strategy.
377+
* It's still useful when using "dfast" strategy,
378+
* in which case it defines a secondary probe table.
379+
* Special: value 0 means "use default chainLog". */
380+
ZSTD_c_searchLog = 104, /* Number of search attempts, as a power of 2.
381+
* More attempts result in better and slower compression.
382+
* This parameter is useless for "fast" and "dFast" strategies.
383+
* Special: value 0 means "use default searchLog". */
384+
ZSTD_c_minMatch =
385+
105, /* Minimum size of searched matches.
385386
* Note that Zstandard can still find matches of smaller size,
386387
* it just tweaks its search algorithm to look for this size and larger.
387388
* Larger values increase compression and decompression speed, but

0 commit comments

Comments
 (0)