diff options
| author | Zoltan Varga <vargaz@gmail.com> | 2004-09-07 00:22:02 +0400 |
|---|---|---|
| committer | Zoltan Varga <vargaz@gmail.com> | 2004-09-07 00:22:02 +0400 |
| commit | dcecb3ce3d742567b1969fa6bf04ee8e8b30906f (patch) | |
| tree | 60bd671b44871efa3c12801e0db6b36352a38a7a | |
| parent | ab2a586fa14d649970a18669495af7862248cd04 (diff) | |
2004-09-06 Zoltan Varga <vargaz@freemail.hu>
* main.c: Fix build && warnings.
svn path=/trunk/mono/; revision=33449
| -rw-r--r-- | mono/dis/ChangeLog | 4 | ||||
| -rw-r--r-- | mono/dis/main.c | 23 |
2 files changed, 15 insertions, 12 deletions
diff --git a/mono/dis/ChangeLog b/mono/dis/ChangeLog index 0ada9c4d8a1..9b0c68d83b7 100644 --- a/mono/dis/ChangeLog +++ b/mono/dis/ChangeLog @@ -1,3 +1,7 @@ +2004-09-06 Zoltan Varga <vargaz@freemail.hu> + + * main.c: Fix build && warnings. + 2004-09-05 Jambunathan K <kjambunathan@novell.com> * main.c (dump_cattrs_list): Newly carved out of dump_cattrs. diff --git a/mono/dis/main.c b/mono/dis/main.c index 090921b2085..1244b8ce588 100644 --- a/mono/dis/main.c +++ b/mono/dis/main.c @@ -48,15 +48,6 @@ dump_header_data (MonoImage *img) } static void -dump_cattrs (MonoImage *m, guint32 token, const char *indent) -{ - GList *list; - - list = dis_get_custom_attrs (m, token); - dump_cattrs_list (list, indent); -} - -static void dump_cattrs_list (GList *list, const char *indent) { GList *tmp; @@ -68,6 +59,14 @@ dump_cattrs_list (GList *list, const char *indent) g_list_free (list); } +static void +dump_cattrs (MonoImage *m, guint32 token, const char *indent) +{ + GList *list; + + list = dis_get_custom_attrs (m, token); + dump_cattrs_list (list, indent); +} static void dis_directive_assembly (MonoImage *m) @@ -607,7 +606,7 @@ dump_cattrs_for_method_params (MonoImage *m, guint32 midx, MonoMethodSignature * } else { fprintf (output, "\t.param [%d] = ", param_cols[MONO_PARAM_SEQUENCE]); - if(crow = mono_metadata_get_constant_index(m, MONO_TOKEN_PARAM_DEF | i, 0)) { + if ((crow = mono_metadata_get_constant_index(m, MONO_TOKEN_PARAM_DEF | i, 0))) { guint32 const_cols [MONO_CONSTANT_SIZE]; mono_metadata_decode_row( &m->tables[MONO_TABLE_CONSTANT], crow-1, const_cols, MONO_CONSTANT_SIZE); lit = get_constant(m, const_cols [MONO_CONSTANT_TYPE], const_cols [MONO_CONSTANT_VALUE]); @@ -1233,8 +1232,8 @@ struct { { "--typespec", MONO_TABLE_TYPESPEC, dump_table_typespec }, { "--implmap", MONO_TABLE_IMPLMAP, dump_table_implmap }, { "--standalonesig", MONO_TABLE_STANDALONESIG, dump_table_standalonesig }, - { "--blob", NULL, dump_stream_blob }, - { NULL, -1 } + { "--blob", 0, dump_stream_blob }, + { NULL, -1, } }; /** |