GeezerVison is showing github.com — deps: update nbytes to 0.1.1 · nodejs/node@e0d503a
File treeExpand file treeCollapse file tree Open diff view settings Expand file treeCollapse file tree Open diff view settings Collapse file Copy file name to clipboardExpand all lines: deps/nbytes/include/nbytes.h +5-5Lines changed: 5 additions & 5 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -93,9 +93,9 @@ void ForceAscii(const char *src, char *dst, size_t len); | 93 | 93 |
| 94 | 94 | // Swaps bytes in place. nbytes is the number of bytes to swap and must be a | 95 | 95 | // multiple of the word size (checked by function). | 96 | | -bool SwapBytes16(void *data, size_t nbytes); | 97 | | -bool SwapBytes32(void *data, size_t nbytes); | 98 | | -bool SwapBytes64(void *data, size_t nbytes); | | 96 | +bool SwapBytes16(char *data, size_t nbytes); | | 97 | +bool SwapBytes32(char *data, size_t nbytes); | | 98 | +bool SwapBytes64(char *data, size_t nbytes); | 99 | 99 |
| 100 | 100 | // ============================================================================ | 101 | 101 | // Base64 (legacy) | @@ -827,12 +827,12 @@ size_t SearchString(const char *haystack, size_t haystack_length, | 827 | 827 |
| 828 | 828 | // ============================================================================ | 829 | 829 | // Version metadata | 830 | | -#define NBYTES_VERSION "0.1.0" | | 830 | +#define NBYTES_VERSION "0.1.1" | 831 | 831 |
| 832 | 832 | enum { | 833 | 833 | NBYTES_VERSION_MAJOR = 0, | 834 | 834 | NBYTES_VERSION_MINOR = 1, | 835 | | - NBYTES_VERSION_REVISION = 0, | | 835 | + NBYTES_VERSION_REVISION = 1, | 836 | 836 | }; | 837 | 837 |
| 838 | 838 | } // namespace nbytes | |
Collapse file Copy file name to clipboardExpand all lines: deps/nbytes/src/nbytes.cpp +14-17Lines changed: 14 additions & 17 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -43,7 +43,7 @@ namespace { | 43 | 43 | #endif | 44 | 44 | } // namespace | 45 | 45 |
| 46 | | -bool SwapBytes16(void *data, size_t nbytes) { | | 46 | +bool SwapBytes16(char *data, size_t nbytes) { | 47 | 47 | if (nbytes % sizeof(uint16_t) != 0) return false; | 48 | 48 |
| 49 | 49 | #if defined(_MSC_VER) | @@ -59,17 +59,16 @@ bool SwapBytes16(void *data, size_t nbytes) { | 59 | 59 | #endif | 60 | 60 |
| 61 | 61 | uint16_t temp; | 62 | | - uint8_t *ptr = reinterpret_cast<uint8_t *>(data); | 63 | | - for (size_t i = 0; i < nbytes; i += sizeof(uint16_t)) { | 64 | | - memcpy(&temp, &ptr[i], sizeof(uint16_t)); | | 62 | + for (size_t i = 0; i < nbytes; i += sizeof(temp)) { | | 63 | + memcpy(&temp, &data[i], sizeof(temp)); | 65 | 64 | temp = BSWAP_2(temp); | 66 | | - memcpy(&ptr[i], &temp, sizeof(uint16_t)); | | 65 | + memcpy(&data[i], &temp, sizeof(temp)); | 67 | 66 | } | 68 | 67 |
| 69 | 68 | return true; | 70 | 69 | } | 71 | 70 |
| 72 | | -bool SwapBytes32(void *data, size_t nbytes) { | | 71 | +bool SwapBytes32(char *data, size_t nbytes) { | 73 | 72 | if (nbytes % sizeof(uint32_t) != 0) return false; | 74 | 73 |
| 75 | 74 | #if defined(_MSC_VER) | @@ -84,18 +83,17 @@ bool SwapBytes32(void *data, size_t nbytes) { | 84 | 83 | } | 85 | 84 | #endif | 86 | 85 |
| 87 | | - uint32_t temp = 0; | 88 | | - uint8_t *ptr = reinterpret_cast<uint8_t *>(data); | 89 | | - for (size_t i = 0; i < nbytes; i += sizeof(uint32_t)) { | 90 | | - memcpy(&temp, &ptr[i], sizeof(uint32_t)); | | 86 | + uint32_t temp; | | 87 | + for (size_t i = 0; i < nbytes; i += sizeof(temp)) { | | 88 | + memcpy(&temp, &data[i], sizeof(temp)); | 91 | 89 | temp = BSWAP_4(temp); | 92 | | - memcpy(&ptr[i], &temp, sizeof(uint32_t)); | | 90 | + memcpy(&data[i], &temp, sizeof(temp)); | 93 | 91 | } | 94 | 92 |
| 95 | 93 | return true; | 96 | 94 | } | 97 | 95 |
| 98 | | -bool SwapBytes64(void *data, size_t nbytes) { | | 96 | +bool SwapBytes64(char *data, size_t nbytes) { | 99 | 97 | if (nbytes % sizeof(uint64_t) != 0) return false; | 100 | 98 |
| 101 | 99 | #if defined(_MSC_VER) | @@ -110,12 +108,11 @@ bool SwapBytes64(void *data, size_t nbytes) { | 110 | 108 | } | 111 | 109 | #endif | 112 | 110 |
| 113 | | - uint64_t temp = 0; | 114 | | - uint8_t *ptr = reinterpret_cast<uint8_t *>(data); | 115 | | - for (size_t i = 0; i < nbytes; i += sizeof(uint64_t)) { | 116 | | - memcpy(&temp, &ptr[i], sizeof(uint64_t)); | | 111 | + uint64_t temp; | | 112 | + for (size_t i = 0; i < nbytes; i += sizeof(temp)) { | | 113 | + memcpy(&temp, &data[i], sizeof(temp)); | 117 | 114 | temp = BSWAP_8(temp); | 118 | | - memcpy(&ptr[i], &temp, sizeof(uint64_t)); | | 115 | + memcpy(&data[i], &temp, sizeof(temp)); | 119 | 116 | } | 120 | 117 |
| 121 | 118 | return true; | |
Collapse file Copy file name to clipboardExpand all lines: deps/nbytes/tests/basic.cpp +23-1Lines changed: 23 additions & 1 deletion | Original file line number | Diff line number | Diff line change |
|---|
| 4 | 4 |
| 5 | 5 | #include <gtest/gtest.h> | 6 | 6 |
| 7 | | -TEST(basic, it_works) { SUCCEED(); } | | 7 | +TEST(basic, swap_bytes16) { | | 8 | + std::vector<char> input = {1, 2, 3, 4, 5, 6, 7, 8}; | | 9 | + nbytes::SwapBytes16(input.data(), input.size()); | | 10 | + std::vector<char> expected = {2, 1, 4, 3, 6, 5, 8, 7}; | | 11 | + EXPECT_EQ(input, expected); | | 12 | + SUCCEED(); | | 13 | +} | | 14 | + | | 15 | +TEST(basic, swap_bytes32) { | | 16 | + std::vector<char> input = {1, 2, 3, 4, 5, 6, 7, 8}; | | 17 | + nbytes::SwapBytes32(input.data(), input.size()); | | 18 | + std::vector<char> expected = {4, 3, 2, 1, 8, 7, 6, 5}; | | 19 | + EXPECT_EQ(input, expected); | | 20 | + SUCCEED(); | | 21 | +} | | 22 | + | | 23 | +TEST(basic, swap_bytes64) { | | 24 | + std::vector<char> input = {1, 2, 3, 4, 5, 6, 7, 8}; | | 25 | + nbytes::SwapBytes64(input.data(), input.size()); | | 26 | + std::vector<char> expected = {8, 7, 6, 5, 4, 3, 2, 1}; | | 27 | + EXPECT_EQ(input, expected); | | 28 | + SUCCEED(); | | 29 | +} |
|