2222#include <stdio.h>
2323
2424#include "bcon.h"
25- #include " bson-config.h"
25+ #include < bson/bson -config.h>
2626
2727/* These stack manipulation macros are used to manage append recursion in
2828 * bcon_append_ctx_va(). They take care of some awkward dereference rules (the
3131
3232#define STACK_ELE (_delta , _name ) (ctx->stack[(_delta) + ctx->n]._name)
3333
34- #define STACK_BSON (_delta ) \
35- (((_delta) + ctx->n) == 0 ? bson : &STACK_ELE (_delta, bson))
34+ #define STACK_BSON (_delta ) (((_delta) + ctx->n) == 0 ? bson : &STACK_ELE (_delta, bson))
3635
37- #define STACK_ITER (_delta ) \
38- (((_delta) + ctx->n) == 0 ? &root_iter : &STACK_ELE (_delta, iter))
36+ #define STACK_ITER (_delta ) (((_delta) + ctx->n) == 0 ? &root_iter : &STACK_ELE (_delta, iter))
3937
4038#define STACK_BSON_PARENT STACK_BSON (-1)
4139#define STACK_BSON_CHILD STACK_BSON (0)
@@ -205,10 +203,7 @@ _noop (void)
205203/* appends val to the passed bson object. Meant to be a super simple dispatch
206204 * table */
207205static void
208- _bcon_append_single (bson_t * bson ,
209- bcon_type_t type ,
210- const char * key ,
211- bcon_append_t * val )
206+ _bcon_append_single (bson_t * bson , bcon_type_t type , const char * key , bcon_append_t * val )
212207{
213208 switch ((int ) type ) {
214209 case BCON_TYPE_UTF8 :
@@ -218,8 +213,7 @@ _bcon_append_single (bson_t *bson,
218213 BSON_ASSERT (bson_append_double (bson , key , -1 , val -> DOUBLE ));
219214 break ;
220215 case BCON_TYPE_BIN : {
221- BSON_ASSERT (bson_append_binary (
222- bson , key , -1 , val -> BIN .subtype , val -> BIN .binary , val -> BIN .length ));
216+ BSON_ASSERT (bson_append_binary (bson , key , -1 , val -> BIN .subtype , val -> BIN .binary , val -> BIN .length ));
223217 break ;
224218 }
225219 case BCON_TYPE_UNDEFINED :
@@ -238,13 +232,11 @@ _bcon_append_single (bson_t *bson,
238232 BSON_ASSERT (bson_append_null (bson , key , -1 ));
239233 break ;
240234 case BCON_TYPE_REGEX : {
241- BSON_ASSERT (
242- bson_append_regex (bson , key , -1 , val -> REGEX .regex , val -> REGEX .flags ));
235+ BSON_ASSERT (bson_append_regex (bson , key , -1 , val -> REGEX .regex , val -> REGEX .flags ));
243236 break ;
244237 }
245238 case BCON_TYPE_DBPOINTER : {
246- BSON_ASSERT (bson_append_dbpointer (
247- bson , key , -1 , val -> DBPOINTER .collection , val -> DBPOINTER .oid ));
239+ BSON_ASSERT (bson_append_dbpointer (bson , key , -1 , val -> DBPOINTER .collection , val -> DBPOINTER .oid ));
248240 break ;
249241 }
250242 case BCON_TYPE_CODE :
@@ -254,15 +246,13 @@ _bcon_append_single (bson_t *bson,
254246 BSON_ASSERT (bson_append_symbol (bson , key , -1 , val -> SYMBOL , -1 ));
255247 break ;
256248 case BCON_TYPE_CODEWSCOPE :
257- BSON_ASSERT (bson_append_code_with_scope (
258- bson , key , -1 , val -> CODEWSCOPE .js , val -> CODEWSCOPE .scope ));
249+ BSON_ASSERT (bson_append_code_with_scope (bson , key , -1 , val -> CODEWSCOPE .js , val -> CODEWSCOPE .scope ));
259250 break ;
260251 case BCON_TYPE_INT32 :
261252 BSON_ASSERT (bson_append_int32 (bson , key , -1 , val -> INT32 ));
262253 break ;
263254 case BCON_TYPE_TIMESTAMP : {
264- BSON_ASSERT (bson_append_timestamp (
265- bson , key , -1 , val -> TIMESTAMP .timestamp , val -> TIMESTAMP .increment ));
255+ BSON_ASSERT (bson_append_timestamp (bson , key , -1 , val -> TIMESTAMP .timestamp , val -> TIMESTAMP .increment ));
266256 break ;
267257 }
268258 case BCON_TYPE_INT64 :
@@ -315,9 +305,7 @@ _bcon_append_single (bson_t *bson,
315305 * procedural verification (if a parameter could have multiple types).
316306 * */
317307static bool
318- _bcon_extract_single (const bson_iter_t * iter ,
319- bcon_type_t type ,
320- bcon_extract_t * val )
308+ _bcon_extract_single (const bson_iter_t * iter , bcon_type_t type , bcon_extract_t * val )
321309{
322310 switch ((int ) type ) {
323311 case BCON_TYPE_UTF8 :
@@ -330,8 +318,7 @@ _bcon_extract_single (const bson_iter_t *iter,
330318 break ;
331319 case BCON_TYPE_BIN :
332320 CHECK_TYPE (BSON_TYPE_BINARY );
333- bson_iter_binary (
334- iter , val -> BIN .subtype , val -> BIN .length , val -> BIN .binary );
321+ bson_iter_binary (iter , val -> BIN .subtype , val -> BIN .length , val -> BIN .binary );
335322 break ;
336323 case BCON_TYPE_UNDEFINED :
337324 CHECK_TYPE (BSON_TYPE_UNDEFINED );
@@ -358,8 +345,7 @@ _bcon_extract_single (const bson_iter_t *iter,
358345 break ;
359346 case BCON_TYPE_DBPOINTER :
360347 CHECK_TYPE (BSON_TYPE_DBPOINTER );
361- bson_iter_dbpointer (
362- iter , NULL , val -> DBPOINTER .collection , val -> DBPOINTER .oid );
348+ bson_iter_dbpointer (iter , NULL , val -> DBPOINTER .collection , val -> DBPOINTER .oid );
363349 break ;
364350 case BCON_TYPE_CODE :
365351 CHECK_TYPE (BSON_TYPE_CODE );
@@ -386,8 +372,7 @@ _bcon_extract_single (const bson_iter_t *iter,
386372 break ;
387373 case BCON_TYPE_TIMESTAMP :
388374 CHECK_TYPE (BSON_TYPE_TIMESTAMP );
389- bson_iter_timestamp (
390- iter , val -> TIMESTAMP .timestamp , val -> TIMESTAMP .increment );
375+ bson_iter_timestamp (iter , val -> TIMESTAMP .timestamp , val -> TIMESTAMP .increment );
391376 break ;
392377 case BCON_TYPE_INT64 :
393378 CHECK_TYPE (BSON_TYPE_INT64 );
@@ -772,8 +757,7 @@ bcon_append_ctx_va (bson_t *bson, bcon_append_ctx_t *ctx, va_list *ap)
772757 }
773758
774759 if (type == BCON_TYPE_DOC_END ) {
775- STACK_POP_DOC (
776- bson_append_document_end (STACK_BSON_PARENT , STACK_BSON_CHILD ));
760+ STACK_POP_DOC (bson_append_document_end (STACK_BSON_PARENT , STACK_BSON_CHILD ));
777761 continue ;
778762 }
779763
@@ -797,20 +781,16 @@ bcon_append_ctx_va (bson_t *bson, bcon_append_ctx_t *ctx, va_list *ap)
797781
798782 break ;
799783 case BCON_TYPE_DOC_START :
800- STACK_PUSH_DOC (bson_append_document_begin (
801- STACK_BSON_PARENT , key , -1 , STACK_BSON_CHILD ));
784+ STACK_PUSH_DOC (bson_append_document_begin (STACK_BSON_PARENT , key , -1 , STACK_BSON_CHILD ));
802785 break ;
803786 case BCON_TYPE_DOC_END :
804- STACK_POP_DOC (
805- bson_append_document_end (STACK_BSON_PARENT , STACK_BSON_CHILD ));
787+ STACK_POP_DOC (bson_append_document_end (STACK_BSON_PARENT , STACK_BSON_CHILD ));
806788 break ;
807789 case BCON_TYPE_ARRAY_START :
808- STACK_PUSH_ARRAY (bson_append_array_begin (
809- STACK_BSON_PARENT , key , -1 , STACK_BSON_CHILD ));
790+ STACK_PUSH_ARRAY (bson_append_array_begin (STACK_BSON_PARENT , key , -1 , STACK_BSON_CHILD ));
810791 break ;
811792 case BCON_TYPE_ARRAY_END :
812- STACK_POP_ARRAY (
813- bson_append_array_end (STACK_BSON_PARENT , STACK_BSON_CHILD ));
793+ STACK_POP_ARRAY (bson_append_array_end (STACK_BSON_PARENT , STACK_BSON_CHILD ));
814794 break ;
815795 default :
816796 _bcon_append_single (STACK_BSON_CHILD , type , key , & u );
@@ -897,17 +877,15 @@ bcon_extract_ctx_va (bson_t *bson, bcon_extract_ctx_t *ctx, va_list *ap)
897877 return false;
898878 }
899879
900- STACK_PUSH_DOC (
901- bson_iter_recurse (& current_iter , STACK_ITER_CHILD ));
880+ STACK_PUSH_DOC (bson_iter_recurse (& current_iter , STACK_ITER_CHILD ));
902881 break ;
903882 case BCON_TYPE_ARRAY_START :
904883
905884 if (bson_iter_type (& current_iter ) != BSON_TYPE_ARRAY ) {
906885 return false;
907886 }
908887
909- STACK_PUSH_ARRAY (
910- bson_iter_recurse (& current_iter , STACK_ITER_CHILD ));
888+ STACK_PUSH_ARRAY (bson_iter_recurse (& current_iter , STACK_ITER_CHILD ));
911889 break ;
912890 default :
913891
0 commit comments