Skip to content
This repository was archived by the owner on Oct 13, 2020. It is now read-only.

Commit 613b61b

Browse files
chergertchergert
committed
Merge pull request #68 from fotonauts/better
a bit better
2 parents d485a3c + 34814d2 commit 613b61b

File tree

10 files changed

+56
-56
lines changed

10 files changed

+56
-56
lines changed

‎src/bson/bcon.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,8 +150,8 @@ typedef union bcon_extract {
150150
struct
151151
{
152152
bson_subtype_t *subtype;
153-
const uint8_t **binary;
154-
uint32_t *length;
153+
const uint8_t **binary;
154+
uint32_t *length;
155155
} BIN;
156156

157157
const bson_oid_t **OID;

‎src/bson/bson-context.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ _bson_context_get_oid_seq64 (bson_context_t *context, /* IN */
285285
BSON_ASSERT (oid);
286286

287287
seq = BSON_UINT64_TO_BE (context->seq64++);
288-
memcpy (&oid->bytes[4], &seq, 8);
288+
memcpy (&oid->bytes[4], &seq, sizeof (seq));
289289
}
290290

291291

@@ -312,7 +312,7 @@ _bson_context_get_oid_seq64_threadsafe (bson_context_t *context, /* IN */
312312
int64_t seq = bson_atomic_int64_add (&context->seq64, 1);
313313

314314
seq = BSON_UINT64_TO_BE (seq);
315-
memcpy (&oid->bytes[4], &seq, 8);
315+
memcpy (&oid->bytes[4], &seq, sizeof (seq));
316316
}
317317

318318

‎src/bson/bson-iter.c‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,7 @@ bson_iter_next (bson_iter_t *iter) /* INOUT */
463463
}
464464

465465
iter->d2 = o + 4;
466-
memcpy (&l, iter->raw + iter->d1, 4);
466+
memcpy (&l, iter->raw + iter->d1, sizeof (l));
467467
l = BSON_UINT32_FROM_LE (l);
468468

469469
if (l > (len - (o + 4))) {
@@ -503,7 +503,7 @@ bson_iter_next (bson_iter_t *iter) /* INOUT */
503503
iter->d2 = o + 4;
504504
iter->d3 = o + 5;
505505

506-
memcpy (&l, iter->raw + iter->d1, 4);
506+
memcpy (&l, iter->raw + iter->d1, sizeof (l));
507507
l = BSON_UINT32_FROM_LE (l);
508508

509509
if (l >= (len - o)) {
@@ -533,7 +533,7 @@ bson_iter_next (bson_iter_t *iter) /* INOUT */
533533
goto mark_invalid;
534534
}
535535

536-
memcpy (&l, iter->raw + iter->d1, 4);
536+
memcpy (&l, iter->raw + iter->d1, sizeof (l));
537537
l = BSON_UINT32_FROM_LE (l);
538538

539539
if ((l > len) || (l > (len - o))) {
@@ -593,7 +593,7 @@ bson_iter_next (bson_iter_t *iter) /* INOUT */
593593
}
594594

595595
iter->d2 = o + 4;
596-
memcpy (&l, iter->raw + iter->d1, 4);
596+
memcpy (&l, iter->raw + iter->d1, sizeof (l));
597597
l = BSON_UINT32_FROM_LE (l);
598598

599599
if ((l > len) || (l > (len - o))) {
@@ -618,7 +618,7 @@ bson_iter_next (bson_iter_t *iter) /* INOUT */
618618
iter->d2 = o + 4;
619619
iter->d3 = o + 8;
620620

621-
memcpy (&l, iter->raw + iter->d1, 4);
621+
memcpy (&l, iter->raw + iter->d1, sizeof (l));
622622
l = BSON_UINT32_FROM_LE (l);
623623

624624
if ((l < 14) || (l >= (len - o))) {
@@ -633,7 +633,7 @@ bson_iter_next (bson_iter_t *iter) /* INOUT */
633633
goto mark_invalid;
634634
}
635635

636-
memcpy (&l, iter->raw + iter->d2, 4);
636+
memcpy (&l, iter->raw + iter->d2, sizeof (l));
637637
l = BSON_UINT32_FROM_LE (l);
638638

639639
if (l >= (len - o - 4 - 4)) {
@@ -647,7 +647,7 @@ bson_iter_next (bson_iter_t *iter) /* INOUT */
647647
}
648648

649649
iter->d4 = o + 4 + 4 + l;
650-
memcpy (&doclen, iter->raw + iter->d4, 4);
650+
memcpy (&doclen, iter->raw + iter->d4, sizeof (doclen));
651651
doclen = BSON_UINT32_FROM_LE (doclen);
652652

653653
if ((o + 4 + 4 + l + doclen) != iter->next_off) {
@@ -740,7 +740,7 @@ bson_iter_binary (const bson_iter_t *iter, /* IN */
740740
*subtype = (bson_subtype_t) *(iter->raw + iter->d2);
741741

742742
if (binary) {
743-
memcpy (binary_len, (iter->raw + iter->d1), 4);
743+
memcpy (binary_len, (iter->raw + iter->d1), sizeof (*binary_len));
744744
*binary_len = BSON_UINT32_FROM_LE (*binary_len);
745745
*binary = iter->raw + iter->d3;
746746

@@ -1207,11 +1207,11 @@ bson_iter_codewscope (const bson_iter_t *iter, /* IN */
12071207

12081208
if (ITER_TYPE (iter) == BSON_TYPE_CODEWSCOPE) {
12091209
if (length) {
1210-
memcpy (&len, iter->raw + iter->d2, 4);
1210+
memcpy (&len, iter->raw + iter->d2, sizeof (len));
12111211
*length = BSON_UINT32_FROM_LE (len) - 1;
12121212
}
12131213

1214-
memcpy (&len, iter->raw + iter->d4, 4);
1214+
memcpy (&len, iter->raw + iter->d4, sizeof (len));
12151215
*scope_len = BSON_UINT32_FROM_LE (len);
12161216
*scope = iter->raw + iter->d4;
12171217
return (const char *)(iter->raw + iter->d3);
@@ -1287,7 +1287,7 @@ bson_iter_dbpointer (const bson_iter_t *iter, /* IN */
12871287

12881288
if (ITER_TYPE (iter) == BSON_TYPE_DBPOINTER) {
12891289
if (collection_len) {
1290-
memcpy (collection_len, (iter->raw + iter->d1), 4);
1290+
memcpy (collection_len, (iter->raw + iter->d1), sizeof (*collection_len));
12911291
*collection_len = BSON_UINT32_FROM_LE (*collection_len);
12921292

12931293
if ((*collection_len) > 0) {
@@ -1444,7 +1444,7 @@ bson_iter_timestamp (const bson_iter_t *iter, /* IN */
14441444
bson_return_if_fail (iter);
14451445

14461446
if (ITER_TYPE (iter) == BSON_TYPE_TIMESTAMP) {
1447-
memcpy (&encoded, iter->raw + iter->d1, 8);
1447+
memcpy (&encoded, iter->raw + iter->d1, sizeof (encoded));
14481448
encoded = BSON_UINT64_FROM_LE (encoded);
14491449
ret_timestamp = (encoded >> 32) & 0xFFFFFFFF;
14501450
ret_increment = encoded & 0xFFFFFFFF;
@@ -1552,7 +1552,7 @@ bson_iter_document (const bson_iter_t *iter, /* IN */
15521552
*document_len = 0;
15531553

15541554
if (ITER_TYPE (iter) == BSON_TYPE_DOCUMENT) {
1555-
memcpy (document_len, (iter->raw + iter->d1), 4);
1555+
memcpy (document_len, (iter->raw + iter->d1), sizeof (*document_len));
15561556
*document_len = BSON_UINT32_FROM_LE (*document_len);
15571557
*document = (iter->raw + iter->d1);
15581558
}
@@ -1614,7 +1614,7 @@ bson_iter_array (const bson_iter_t *iter, /* IN */
16141614
*array_len = 0;
16151615

16161616
if (ITER_TYPE (iter) == BSON_TYPE_ARRAY) {
1617-
memcpy (array_len, (iter->raw + iter->d1), 4);
1617+
memcpy (array_len, (iter->raw + iter->d1), sizeof (*array_len));
16181618
*array_len = BSON_UINT32_FROM_LE (*array_len);
16191619
*array = (iter->raw + iter->d1);
16201620
}
@@ -1985,7 +1985,7 @@ bson_iter_overwrite_int32 (bson_iter_t *iter, /* IN */
19851985
#if BSON_BYTE_ORDER != BSON_LITTLE_ENDIAN
19861986
value = BSON_UINT32_TO_LE (value);
19871987
#endif
1988-
memcpy ((void *)(iter->raw + iter->d1), &value, 4);
1988+
memcpy ((void *)(iter->raw + iter->d1), &value, sizeof (value));
19891989
}
19901990
}
19911991

@@ -2017,7 +2017,7 @@ bson_iter_overwrite_int64 (bson_iter_t *iter, /* IN */
20172017
#if BSON_BYTE_ORDER != BSON_LITTLE_ENDIAN
20182018
value = BSON_UINT64_TO_LE (value);
20192019
#endif
2020-
memcpy ((void *)(iter->raw + iter->d1), &value, 8);
2020+
memcpy ((void *)(iter->raw + iter->d1), &value, sizeof (value));
20212021
}
20222022
}
20232023

@@ -2047,7 +2047,7 @@ bson_iter_overwrite_double (bson_iter_t *iter, /* IN */
20472047

20482048
if (ITER_TYPE (iter) == BSON_TYPE_DOUBLE) {
20492049
value = BSON_DOUBLE_TO_LE (value);
2050-
memcpy ((void *)(iter->raw + iter->d1), &value, 8);
2050+
memcpy ((void *)(iter->raw + iter->d1), &value, sizeof (value));
20512051
}
20522052
}
20532053

‎src/bson/bson-iter.h‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -114,28 +114,28 @@ bson_iter_utf8_len_unsafe (const bson_iter_t *iter)
114114
{
115115
int32_t val;
116116

117-
memcpy (&val, iter->raw + iter->d1, 4);
117+
memcpy (&val, iter->raw + iter->d1, sizeof (val));
118118
val = BSON_UINT32_FROM_LE (val);
119119
return MAX (0, val - 1);
120120
}
121121

122122

123123
void
124124
bson_iter_array (const bson_iter_t *iter,
125-
uint32_t *array_len,
126-
const uint8_t **array);
125+
uint32_t *array_len,
126+
const uint8_t **array);
127127

128128

129129
void
130130
bson_iter_binary (const bson_iter_t *iter,
131131
bson_subtype_t *subtype,
132-
uint32_t *binary_len,
133-
const uint8_t **binary);
132+
uint32_t *binary_len,
133+
const uint8_t **binary);
134134

135135

136136
const char *
137137
bson_iter_code (const bson_iter_t *iter,
138-
uint32_t *length);
138+
uint32_t *length);
139139

140140

141141
/**
@@ -149,7 +149,7 @@ bson_iter_code (const bson_iter_t *iter,
149149
*/
150150
static BSON_INLINE const char *
151151
bson_iter_code_unsafe (const bson_iter_t *iter,
152-
uint32_t *length)
152+
uint32_t *length)
153153
{
154154
*length = bson_iter_utf8_len_unsafe (iter);
155155
return (const char *)(iter->raw + iter->d2);
@@ -158,22 +158,22 @@ bson_iter_code_unsafe (const bson_iter_t *iter,
158158

159159
const char *
160160
bson_iter_codewscope (const bson_iter_t *iter,
161-
uint32_t *length,
162-
uint32_t *scope_len,
163-
const uint8_t **scope);
161+
uint32_t *length,
162+
uint32_t *scope_len,
163+
const uint8_t **scope);
164164

165165

166166
void
167167
bson_iter_dbpointer (const bson_iter_t *iter,
168-
uint32_t *collection_len,
168+
uint32_t *collection_len,
169169
const char **collection,
170170
const bson_oid_t **oid);
171171

172172

173173
void
174174
bson_iter_document (const bson_iter_t *iter,
175-
uint32_t *document_len,
176-
const uint8_t **document);
175+
uint32_t *document_len,
176+
const uint8_t **document);
177177

178178

179179
double
@@ -193,7 +193,7 @@ bson_iter_double_unsafe (const bson_iter_t *iter)
193193
{
194194
double val;
195195

196-
memcpy (&val, iter->raw + iter->d1, 8);
196+
memcpy (&val, iter->raw + iter->d1, sizeof (val));
197197
return BSON_DOUBLE_FROM_LE (val);
198198
}
199199

@@ -232,7 +232,7 @@ bson_iter_int32_unsafe (const bson_iter_t *iter)
232232
{
233233
int32_t val;
234234

235-
memcpy (&val, iter->raw + iter->d1, 4);
235+
memcpy (&val, iter->raw + iter->d1, sizeof (val));
236236
return BSON_UINT32_FROM_LE (val);
237237
}
238238

@@ -258,7 +258,7 @@ bson_iter_int64_unsafe (const bson_iter_t *iter)
258258
{
259259
int64_t val;
260260

261-
memcpy (&val, iter->raw + iter->d1, 8);
261+
memcpy (&val, iter->raw + iter->d1, sizeof (val));
262262
return BSON_UINT64_FROM_LE (val);
263263
}
264264

@@ -323,7 +323,7 @@ bson_iter_key_unsafe (const bson_iter_t *iter)
323323

324324
const char *
325325
bson_iter_utf8 (const bson_iter_t *iter,
326-
uint32_t *length);
326+
uint32_t *length);
327327

328328

329329
/**
@@ -335,7 +335,7 @@ bson_iter_utf8 (const bson_iter_t *iter,
335335
*/
336336
static BSON_INLINE const char *
337337
bson_iter_utf8_unsafe (const bson_iter_t *iter,
338-
uint32_t *length)
338+
size_t *length)
339339
{
340340
*length = bson_iter_utf8_len_unsafe (iter);
341341
return (const char *)(iter->raw + iter->d2);
@@ -344,7 +344,7 @@ bson_iter_utf8_unsafe (const bson_iter_t *iter,
344344

345345
char *
346346
bson_iter_dup_utf8 (const bson_iter_t *iter,
347-
uint32_t *length);
347+
uint32_t *length);
348348

349349

350350
int64_t
@@ -435,7 +435,7 @@ bson_iter_regex (const bson_iter_t *iter,
435435

436436
const char *
437437
bson_iter_symbol (const bson_iter_t *iter,
438-
uint32_t *length);
438+
uint32_t *length);
439439

440440

441441
bson_type_t

‎src/bson/bson-md5.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ bson_md5_process (bson_md5_t *md5,
186186
}
187187
else {
188188
/* not aligned */
189-
memcpy(xbuf, data, 64);
189+
memcpy(xbuf, data, sizeof (xbuf));
190190
X = xbuf;
191191
}
192192
}
@@ -398,7 +398,7 @@ bson_md5_finish (bson_md5_t *pms,
398398
/* Pad to 56 bytes mod 64. */
399399
bson_md5_append(pms, pad, ((55 - (pms->count[0] >> 3)) & 63) + 1);
400400
/* Append the length. */
401-
bson_md5_append(pms, data, 8);
401+
bson_md5_append(pms, data, sizeof (data));
402402
for (i = 0; i < 16; ++i)
403403
digest[i] = (uint8_t)(pms->abcd[i >> 2] >> ((i & 3) << 3));
404404
}

‎src/bson/bson-oid.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ bson_oid_init_sequence (bson_oid_t *oid, /* OUT */
125125

126126
now = BSON_UINT32_TO_BE (now);
127127

128-
memcpy (&oid->bytes[0], &now, 4);
128+
memcpy (&oid->bytes[0], &now, sizeof (now));
129129
context->oid_get_seq64 (context, oid);
130130
}
131131

@@ -166,7 +166,7 @@ bson_oid_init (bson_oid_t *oid, /* OUT */
166166
}
167167

168168
now = BSON_UINT32_TO_BE (now);
169-
memcpy (&oid->bytes[0], &now, 4);
169+
memcpy (&oid->bytes[0], &now, sizeof (now));
170170

171171
context->oid_get_host (context, oid);
172172
context->oid_get_pid (context, oid);

‎src/bson/bson-oid.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ bson_oid_get_time_t_unsafe (const bson_oid_t *oid)
237237
{
238238
uint32_t t;
239239

240-
memcpy (&t, oid, 4);
240+
memcpy (&t, oid, sizeof (t));
241241
return BSON_UINT32_FROM_BE (t);
242242
}
243243

0 commit comments

Comments
 (0)