From 0990c8c17683618192efdc4b16f126f6e8bbaa0b Mon Sep 17 00:00:00 2001 From: Thomas Schoebel-Theuer Date: Sun, 29 Jun 2014 00:51:27 +0200 Subject: [PATCH] all: keep TRAILING_SEMICOLON happy --- kernel/brick.h | 26 ++++++++++++++++++++------ kernel/lib_pairing_heap.h | 3 ++- kernel/lib_queue.h | 1 + kernel/mars.h | 11 ++++++++++- kernel/sy_old/strategy.h | 3 ++- 5 files changed, 35 insertions(+), 9 deletions(-) diff --git a/kernel/brick.h b/kernel/brick.h index c8bf47c3..018eeea0 100644 --- a/kernel/brick.h +++ b/kernel/brick.h @@ -91,6 +91,7 @@ struct generic_aspect; int aspect_size; \ int (*init_fn)(struct OBJTYPE##_aspect *ini); \ void (*exit_fn)(struct OBJTYPE##_aspect *ini); \ + /* this comment is for keeping TRAILING_SEMICOLON happy */ struct generic_aspect_type { GENERIC_ASPECT_TYPE(generic); @@ -104,6 +105,7 @@ struct generic_aspect_type { int object_type_nr; \ int (*init_fn)(struct OBJTYPE##_object *ini); \ void (*exit_fn)(struct OBJTYPE##_object *ini); \ + /* this comment is for keeping TRAILING_SEMICOLON happy */ struct generic_object_type { GENERIC_OBJECT_TYPE(generic); @@ -116,6 +118,7 @@ struct generic_object_type { atomic_t aspect_count; \ atomic_t total_alloc_count; \ atomic_t total_aspect_count; \ + /* this comment is for keeping TRAILING_SEMICOLON happy */ struct generic_object_layout { GENERIC_OBJECT_LAYOUT(generic); @@ -133,7 +136,7 @@ struct generic_object_layout { int aspect_nr_max; \ int free_offset; \ int max_offset; \ - + /* this comment is for keeping TRAILING_SEMICOLON happy */ struct generic_object { GENERIC_OBJECT(generic); @@ -145,6 +148,7 @@ struct generic_object { const struct generic_aspect_type *aspect_type; \ /* private */ \ bool shortcut; \ + /* this comment is for keeping TRAILING_SEMICOLON happy */ struct generic_aspect { GENERIC_ASPECT(generic); @@ -153,6 +157,7 @@ struct generic_aspect { #define GENERIC_ASPECT_CONTEXT(OBJTYPE) \ /* private (for any layer) */ \ int brick_index; /* globally unique */ \ + /* this comment is for keeping TRAILING_SEMICOLON happy */ struct generic_aspect_context { GENERIC_ASPECT_CONTEXT(generic); @@ -206,6 +211,7 @@ struct generic_aspect_context { int cb_error; \ /* private */ \ struct generic_callback *cb_next; \ + /* this comment is for keeping TRAILING_SEMICOLON happy */ struct generic_callback { GENERIC_CALLBACK(generic); @@ -216,6 +222,7 @@ struct generic_callback { /* private, access by macros */ \ struct generic_callback *object_cb; \ struct generic_callback _object_cb; \ + /* this comment is for keeping TRAILING_SEMICOLON happy */ struct callback_object { CALLBACK_OBJECT(generic); @@ -364,6 +371,7 @@ struct generic_switch { struct generic_aspect_context aspect_context; \ int (*free)(struct BRITYPE##_brick *del); \ struct list_head tmp_head; \ + /* this comment is for keeping TRAILING_SEMICOLON happy */ struct generic_brick { GENERIC_BRICK(generic); @@ -376,6 +384,7 @@ struct generic_brick { /* private (for any layer) */ \ struct BRITYPE##_output *connect; \ struct list_head input_head; \ + /* this comment is for keeping TRAILING_SEMICOLON happy */ struct generic_input { GENERIC_INPUT(generic); @@ -389,7 +398,8 @@ struct generic_input { struct BRITYPE##_output_ops *ops; \ struct list_head output_head; \ int nr_connected; \ - + /* this comment is for keeping TRAILING_SEMICOLON happy */ + struct generic_output { GENERIC_OUTPUT(generic); }; @@ -410,7 +420,8 @@ struct generic_output { #define GENERIC_BRICK_OPS(BRITYPE) \ int (*brick_switch)(struct BRITYPE##_brick *brick); \ - + /* this comment is for keeping TRAILING_SEMICOLON happy */ + struct generic_brick_ops { GENERIC_BRICK_OPS(generic); }; @@ -418,6 +429,7 @@ struct generic_brick_ops { #define GENERIC_OUTPUT_OPS(BRITYPE) \ /*int (*output_start)(struct BRITYPE##_output *output);*/ \ /*int (*output_stop)(struct BRITYPE##_output *output);*/ \ + /* this comment is for keeping TRAILING_SEMICOLON happy */ struct generic_output_ops { GENERIC_OUTPUT_OPS(generic) @@ -440,6 +452,7 @@ struct generic_output_ops { const struct BRITYPE##_input_types **default_type; \ int (*brick_construct)(struct BRITYPE##_brick *brick); \ int (*brick_destruct)(struct BRITYPE##_brick *brick); \ + /* this comment is for keeping TRAILING_SEMICOLON happy */ struct generic_brick_type { GENERIC_BRICK_TYPE(generic); @@ -452,6 +465,7 @@ struct generic_brick_type { int input_size; \ int (*input_construct)(struct BRITYPE##_input *input); \ int (*input_destruct)(struct BRITYPE##_input *input); \ + /* this comment is for keeping TRAILING_SEMICOLON happy */ struct generic_input_type { GENERIC_INPUT_TYPE(generic); @@ -465,6 +479,7 @@ struct generic_input_type { struct BRITYPE##_output_ops *master_ops; \ int (*output_construct)(struct BRITYPE##_output *output); \ int (*output_destruct)(struct BRITYPE##_output *output); \ + /* this comment is for keeping TRAILING_SEMICOLON happy */ struct generic_output_type { GENERIC_OUTPUT_TYPE(generic); @@ -535,6 +550,7 @@ extern inline int BRITYPE##_unregister_brick_type(void) \ extern const struct BRITYPE##_brick_type BRITYPE##_brick_type; \ extern const struct BRITYPE##_input_type BRITYPE##_input_type; \ extern const struct BRITYPE##_output_type BRITYPE##_output_type; \ +/* this comment is for keeping TRAILING_SEMICOLON happy */ /////////////////////////////////////////////////////////////////////// @@ -560,9 +576,7 @@ extern inline struct OBJTYPE##_object *BRITYPE##_alloc_##OBJTYPE(struct BRITYPE# extern inline struct BRITYPE##_##OBJTYPE##_aspect *BRITYPE##_##OBJTYPE##_get_aspect(struct BRITYPE##_brick *brick, struct OBJTYPE##_object *obj) \ { \ return (void *)generic_get_aspect((struct generic_brick *)brick, (struct generic_object *)obj); \ -} \ - \ - +} /////////////////////////////////////////////////////////////////////// diff --git a/kernel/lib_pairing_heap.h b/kernel/lib_pairing_heap.h index e44e9818..ecde37b9 100644 --- a/kernel/lib_pairing_heap.h +++ b/kernel/lib_pairing_heap.h @@ -40,7 +40,8 @@ struct pairing_heap_##KEYTYPE { \ KEYDEF \ struct pairing_heap_##KEYTYPE *next; \ struct pairing_heap_##KEYTYPE *subheaps; \ -}; +}; \ +/* this comment is for keeping TRAILING_SEMICOLON happy */ /* less generic version: define the key inside. */ diff --git a/kernel/lib_queue.h b/kernel/lib_queue.h index a53d1b56..e86c1091 100644 --- a/kernel/lib_queue.h +++ b/kernel/lib_queue.h @@ -44,6 +44,7 @@ long long q_last_insert; /* jiffies */ \ KEYTYPE heap_margin; \ KEYTYPE last_pos; \ + /* this comment is for keeping TRAILING_SEMICOLON happy */ #define QUEUE_FUNCTIONS(PREFIX,ELEM_TYPE,HEAD,KEYFN,KEYCMP,HEAPTYPE) \ \ diff --git a/kernel/mars.h b/kernel/mars.h index 34977ba1..2d9a22fc 100644 --- a/kernel/mars.h +++ b/kernel/mars.h @@ -152,6 +152,7 @@ extern const struct generic_object_type mref_type; int ref_rw; \ int ref_id; /* not mandatory; may be used for identification */ \ bool ref_skip_sync; /* skip sync for this particular mref */ \ + /* this comment is for keeping TRAILING_SEMICOLON happy */ struct mref_object { MREF_OBJECT(mref); @@ -180,6 +181,7 @@ struct mars_info { int kill_round; \ bool killme; \ void (*show_status)(struct mars_brick *brick, bool shutdown); \ + /* this comment is for keeping TRAILING_SEMICOLON happy */ struct mars_brick { MARS_BRICK(mars); @@ -187,6 +189,7 @@ struct mars_brick { #define MARS_INPUT(BRITYPE) \ GENERIC_INPUT(BRITYPE); \ + /* this comment is for keeping TRAILING_SEMICOLON happy */ struct mars_input { MARS_INPUT(mars); @@ -194,6 +197,7 @@ struct mars_input { #define MARS_OUTPUT(BRITYPE) \ GENERIC_OUTPUT(BRITYPE); \ + /* this comment is for keeping TRAILING_SEMICOLON happy */ struct mars_output { MARS_OUTPUT(mars); @@ -203,6 +207,7 @@ struct mars_output { GENERIC_BRICK_OPS(BRITYPE); \ char *(*brick_statistics)(struct BRITYPE##_brick *brick, int verbose); \ void (*reset_statistics)(struct BRITYPE##_brick *brick); \ + /* this comment is for keeping TRAILING_SEMICOLON happy */ #define MARS_OUTPUT_OPS(BRITYPE) \ GENERIC_OUTPUT_OPS(BRITYPE); \ @@ -211,6 +216,7 @@ struct mars_output { int (*mref_get)(struct BRITYPE##_output *output, struct mref_object *mref); \ void (*mref_io)(struct BRITYPE##_output *output, struct mref_object *mref); \ void (*mref_put)(struct BRITYPE##_output *output, struct mref_object *mref); \ + /* this comment is for keeping TRAILING_SEMICOLON happy */ // all non-extendable types @@ -241,6 +247,7 @@ struct BRITYPE##_callback { \ }; \ \ DECLARE_BRICK_FUNCTIONS(BRITYPE); \ +/* this comment is for keeping TRAILING_SEMICOLON happy */ #define MARS_TYPES(BRITYPE) \ @@ -249,7 +256,8 @@ _MARS_TYPES(BRITYPE) \ \ DECLARE_ASPECT_FUNCTIONS(BRITYPE,mref); \ extern int init_mars_##BRITYPE(void); \ -extern void exit_mars_##BRITYPE(void); +extern void exit_mars_##BRITYPE(void); \ +/* this comment is for keeping TRAILING_SEMICOLON happy */ // instantiate pseudo base-classes @@ -278,6 +286,7 @@ static const struct generic_aspect_type BRITYPE##_mref_aspect_type = { \ static const struct generic_aspect_type *BRITYPE##_aspect_types[OBJ_TYPE_MAX] = { \ [OBJ_TYPE_MREF] = &BRITYPE##_mref_aspect_type, \ }; \ +/* this comment is for keeping TRAILING_SEMICOLON happy */ extern const struct meta mars_info_meta[]; extern const struct meta mars_mref_meta[]; diff --git a/kernel/sy_old/strategy.h b/kernel/sy_old/strategy.h index 3b6d2ad0..c83bb6ce 100644 --- a/kernel/sy_old/strategy.h +++ b/kernel/sy_old/strategy.h @@ -87,7 +87,8 @@ extern int mars_fast_fullsync; char *new_link; \ struct mars_global *d_global; \ void (*d_private_destruct)(void *private); \ - void *d_private; + void *d_private; \ + /* this comment is for keeping TRAILING_SEMICOLON happy */ struct mars_dent { MARS_DENT(mars_dent);