diff options
| author | Jay Krell <jay.krell@cornell.edu> | 2020-03-11 12:19:26 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-11 12:19:26 +0300 |
| commit | 60a192b98d01c2b57854b2f25266f779897d5033 (patch) | |
| tree | fcb9810ef767861d2dbd864ae1577f10ec6e6aad /tools | |
| parent | 731b9cac54de4fb31f66183beadeff599da0f32b (diff) | |
[tools/sgen] Fix warnings about adding integers to string pointers. (#19180)
Kind of a silly warning.
mono/sgen/sgen-protocol-def.h:102:1: warning: adding 'unsigned long' to
a string does not append to the string [-Wstring-plus-int]
BEGIN_PROTOCOL_ENTRY_HEAVY2 (binary_protocol_block_alloc, TYPE_POINTER, addr, TYPE_SIZE, size)
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
tools/sgen/sgen-grep-binprot.c:394:2: note: expanded from macro
'BEGIN_PROTOCOL_ENTRY_HEAVY2'
BEGIN_PROTOCOL_ENTRY2 (method,t1,f1,t2,f2)
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
tools/sgen/sgen-grep-binprot.c:291:26:
note: BEGIN_PROTOCOL_ENTRY3 (binary_protocol_world_stopping,
TYPE_INT, generation, TYPE_LONGLONG, timestamp, TYPE_POINTER, thread)exp
mono/sgen/sgen-protocol-def.h:102:1: note: use array indexing to
silence this warning
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/sgen/sgen-grep-binprot.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/sgen/sgen-grep-binprot.c b/tools/sgen/sgen-grep-binprot.c index a3b4fb29d47..03b1fd4b57e 100644 --- a/tools/sgen/sgen-grep-binprot.c +++ b/tools/sgen/sgen-grep-binprot.c @@ -274,7 +274,7 @@ print_entry (int type, void *data, int num_nums, int *match_indices, gboolean co pes [0].name = #f1; \ pes [0].data = &entry->f1; \ pes [0].color = index_color(0, num_nums, match_indices); \ - printf ("%s ", #method + strlen ("binary_protocol_")); + printf ("%s ", &#method [strlen ("binary_protocol_")]); #define BEGIN_PROTOCOL_ENTRY2(method,t1,f1,t2,f2) \ case PROTOCOL_ID(method): { \ PROTOCOL_STRUCT (method) *entry = (PROTOCOL_STRUCT (method)*)data; \ @@ -288,7 +288,7 @@ print_entry (int type, void *data, int num_nums, int *match_indices, gboolean co pes [1].name = #f2; \ pes [1].data = &entry->f2; \ pes [1].color = index_color(1, num_nums, match_indices); \ - printf ("%s ", #method + strlen ("binary_protocol_")); + printf ("%s ", &#method [strlen ("binary_protocol_")]); #define BEGIN_PROTOCOL_ENTRY3(method,t1,f1,t2,f2,t3,f3) \ case PROTOCOL_ID(method): { \ PROTOCOL_STRUCT (method) *entry = (PROTOCOL_STRUCT (method)*)data; \ @@ -306,7 +306,7 @@ print_entry (int type, void *data, int num_nums, int *match_indices, gboolean co pes [2].name = #f3; \ pes [2].data = &entry->f3; \ pes [2].color = index_color(2, num_nums, match_indices); \ - printf ("%s ", #method + strlen ("binary_protocol_")); + printf ("%s ", &#method [strlen ("binary_protocol_")]); #define BEGIN_PROTOCOL_ENTRY4(method,t1,f1,t2,f2,t3,f3,t4,f4) \ case PROTOCOL_ID(method): { \ PROTOCOL_STRUCT (method) *entry = (PROTOCOL_STRUCT (method)*)data; \ @@ -328,7 +328,7 @@ print_entry (int type, void *data, int num_nums, int *match_indices, gboolean co pes [3].name = #f4; \ pes [3].data = &entry->f4; \ pes [3].color = index_color(3, num_nums, match_indices); \ - printf ("%s ", #method + strlen ("binary_protocol_")); + printf ("%s ", &#method [strlen ("binary_protocol_")]); #define BEGIN_PROTOCOL_ENTRY5(method,t1,f1,t2,f2,t3,f3,t4,f4,t5,f5) \ case PROTOCOL_ID(method): { \ PROTOCOL_STRUCT (method) *entry = (PROTOCOL_STRUCT (method)*)data; \ @@ -354,7 +354,7 @@ print_entry (int type, void *data, int num_nums, int *match_indices, gboolean co pes [4].name = #f5; \ pes [4].data = &entry->f5; \ pes [4].color = index_color(4, num_nums, match_indices); \ - printf ("%s ", #method + strlen ("binary_protocol_")); + printf ("%s ", &#method [strlen ("binary_protocol_")]); #define BEGIN_PROTOCOL_ENTRY6(method,t1,f1,t2,f2,t3,f3,t4,f4,t5,f5,t6,f6) \ case PROTOCOL_ID(method): { \ PROTOCOL_STRUCT (method) *entry = (PROTOCOL_STRUCT (method)*)data; \ @@ -384,7 +384,7 @@ print_entry (int type, void *data, int num_nums, int *match_indices, gboolean co pes [5].name = #f6; \ pes [5].data = &entry->f6; \ pes [5].color = index_color(5, num_nums, match_indices); \ - printf ("%s ", #method + strlen ("binary_protocol_")); + printf ("%s ", &#method [strlen ("binary_protocol_")]); #define BEGIN_PROTOCOL_ENTRY_HEAVY0(method) \ BEGIN_PROTOCOL_ENTRY0 (method) |