Skip to content

Commit

Permalink
Merge pull request #305 from vaerksted/master
Browse files Browse the repository at this point in the history
fix typos
  • Loading branch information
PJK authored Jan 6, 2024
2 parents 6717ae3 + 4b422b1 commit 5c72221
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ Next
Breaks build & header compatibility due to:

- Improved build configuration and feature check macros
- Endianess configuration fixes (by Erwin Kroon and David Grigsby)
- Endianness configuration fixes (by Erwin Kroon and David Grigsby)
- pkg-config compatibility (by Vincent Bernat)
- enable use of versioned SONAME (by Vincent Bernat)
- better fuzzer (wasn't random until now, ooops)
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ if(CBOR_CUSTOM_ALLOC)
message(WARNING
"CBOR_CUSTOM_ALLOC has been deprecated. Custom allocators are now enabled by default."
"The flag is a no-op and will be removed in the next version. "
"Please remove CBOR_CUSTOM_ALLOC from your build configuation.")
"Please remove CBOR_CUSTOM_ALLOC from your build configuration.")
endif(CBOR_CUSTOM_ALLOC)

option(CBOR_PRETTY_PRINTER "Include a pretty-printing routine" ON)
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

libcbor is maintained by [@PJK](https://github.com/PJK) in his spare time on a best-effort basis.

Community contributions are welcome as long as they align with the [project priorities](https://github.com/PJK/libcbor#main-features) and [goals](https://libcbor.readthedocs.io/en/latest/development.html#goals) and follow the guidelines described belows.
Community contributions are welcome as long as they align with the [project priorities](https://github.com/PJK/libcbor#main-features) and [goals](https://libcbor.readthedocs.io/en/latest/development.html#goals) and follow the guidelines described below.

## Principles

Expand Down
2 changes: 1 addition & 1 deletion doc/source/internal.rst
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ and also borrowing from

General notes on the API design
--------------------------------
The API design has two main driving priciples:
The API design has two main driving principles:

1. Let the client manage the memory as much as possible
2. Behave exactly as specified by the standard
Expand Down
2 changes: 1 addition & 1 deletion examples/cjson2cbor.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

/**
* This code demonstrates how cJSON (https://github.com/DaveGamble/cJSON)
* callbacks can be used in conjuction with the streaming parser to translate
* callbacks can be used in conjunction with the streaming parser to translate
* JSON to CBOR. Please note that cbor_builder_* APIs are internal and thus
* subject to change.
*
Expand Down
2 changes: 1 addition & 1 deletion src/cbor/internal/memory_utils.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ bool _cbor_safe_to_multiply(size_t a, size_t b);
_CBOR_NODISCARD
bool _cbor_safe_to_add(size_t a, size_t b);

/** Adds `a` and `b`, propagating zeros and returing 0 on overflow. */
/** Adds `a` and `b`, propagating zeros and returning 0 on overflow. */
_CBOR_NODISCARD
size_t _cbor_safe_signaling_add(size_t a, size_t b);

Expand Down

0 comments on commit 5c72221

Please sign in to comment.