@@ -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 ;
0 commit comments