Use `static const` rather than `const static`.
Project: http://git-wip-us.apache.org/repos/asf/lucy/repo Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/fadd6021 Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/fadd6021 Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/fadd6021 Branch: refs/heads/compiler-warnings-20130314 Commit: fadd60210752e28dde94906f40fd00d4e60fa4bc Parents: cf2d1d0 Author: Marvin Humphrey <[email protected]> Authored: Fri Feb 22 19:15:05 2013 -0800 Committer: Marvin Humphrey <[email protected]> Committed: Thu Mar 14 13:51:10 2013 -0700 ---------------------------------------------------------------------- clownfish/compiler/src/CFCBindClass.c | 2 +- clownfish/compiler/src/CFCBindCore.c | 2 +- clownfish/compiler/src/CFCC.c | 2 +- clownfish/compiler/src/CFCCBlock.c | 2 +- clownfish/compiler/src/CFCClass.c | 2 +- clownfish/compiler/src/CFCDocuComment.c | 2 +- clownfish/compiler/src/CFCDumpable.c | 2 +- clownfish/compiler/src/CFCFile.c | 2 +- clownfish/compiler/src/CFCFileSpec.c | 2 +- clownfish/compiler/src/CFCFunction.c | 2 +- clownfish/compiler/src/CFCHierarchy.c | 2 +- clownfish/compiler/src/CFCMemPool.c | 2 +- clownfish/compiler/src/CFCMethod.c | 2 +- clownfish/compiler/src/CFCParamList.c | 2 +- clownfish/compiler/src/CFCParcel.c | 2 +- clownfish/compiler/src/CFCParser.c | 2 +- clownfish/compiler/src/CFCPerl.c | 2 +- clownfish/compiler/src/CFCPerlClass.c | 2 +- clownfish/compiler/src/CFCPerlConstructor.c | 2 +- clownfish/compiler/src/CFCPerlMethod.c | 2 +- clownfish/compiler/src/CFCPerlPod.c | 2 +- clownfish/compiler/src/CFCRuby.c | 2 +- clownfish/compiler/src/CFCSymbol.c | 2 +- clownfish/compiler/src/CFCType.c | 2 +- clownfish/compiler/src/CFCVariable.c | 2 +- clownfish/compiler/src/CFCVersion.c | 2 +- 26 files changed, 26 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucy/blob/fadd6021/clownfish/compiler/src/CFCBindClass.c ---------------------------------------------------------------------- diff --git a/clownfish/compiler/src/CFCBindClass.c b/clownfish/compiler/src/CFCBindClass.c index cfa6a65..79d6792 100644 --- a/clownfish/compiler/src/CFCBindClass.c +++ b/clownfish/compiler/src/CFCBindClass.c @@ -73,7 +73,7 @@ S_method_defs(CFCBindClass *self); static char* S_short_names(CFCBindClass *self); -const static CFCMeta CFCBINDCLASS_META = { +static const CFCMeta CFCBINDCLASS_META = { "Clownfish::CFC::Binding::Core::Class", sizeof(CFCBindClass), (CFCBase_destroy_t)CFCBindClass_destroy http://git-wip-us.apache.org/repos/asf/lucy/blob/fadd6021/clownfish/compiler/src/CFCBindCore.c ---------------------------------------------------------------------- diff --git a/clownfish/compiler/src/CFCBindCore.c b/clownfish/compiler/src/CFCBindCore.c index 7cf461e..ee3263e 100644 --- a/clownfish/compiler/src/CFCBindCore.c +++ b/clownfish/compiler/src/CFCBindCore.c @@ -49,7 +49,7 @@ S_write_parcel_h(CFCBindCore *self); static void S_write_parcel_c(CFCBindCore *self); -const static CFCMeta CFCBINDCORE_META = { +static const CFCMeta CFCBINDCORE_META = { "Clownfish::CFC::Binding::Core", sizeof(CFCBindCore), (CFCBase_destroy_t)CFCBindCore_destroy http://git-wip-us.apache.org/repos/asf/lucy/blob/fadd6021/clownfish/compiler/src/CFCC.c ---------------------------------------------------------------------- diff --git a/clownfish/compiler/src/CFCC.c b/clownfish/compiler/src/CFCC.c index 6b62f69..fbd1719 100644 --- a/clownfish/compiler/src/CFCC.c +++ b/clownfish/compiler/src/CFCC.c @@ -34,7 +34,7 @@ struct CFCC { char *footer; }; -const static CFCMeta CFCC_META = { +static const CFCMeta CFCC_META = { "Clownfish::CFC::Binding::C", sizeof(CFCC), (CFCBase_destroy_t)CFCC_destroy http://git-wip-us.apache.org/repos/asf/lucy/blob/fadd6021/clownfish/compiler/src/CFCCBlock.c ---------------------------------------------------------------------- diff --git a/clownfish/compiler/src/CFCCBlock.c b/clownfish/compiler/src/CFCCBlock.c index 82e01e0..0231877 100644 --- a/clownfish/compiler/src/CFCCBlock.c +++ b/clownfish/compiler/src/CFCCBlock.c @@ -24,7 +24,7 @@ struct CFCCBlock { char *contents; }; -const static CFCMeta CFCCBLOCK_META = { +static const CFCMeta CFCCBLOCK_META = { "Clownfish::CFC::Model::CBlock", sizeof(CFCCBlock), (CFCBase_destroy_t)CFCCBlock_destroy http://git-wip-us.apache.org/repos/asf/lucy/blob/fadd6021/clownfish/compiler/src/CFCClass.c ---------------------------------------------------------------------- diff --git a/clownfish/compiler/src/CFCClass.c b/clownfish/compiler/src/CFCClass.c index 41f9e79..99416b8 100644 --- a/clownfish/compiler/src/CFCClass.c +++ b/clownfish/compiler/src/CFCClass.c @@ -104,7 +104,7 @@ S_create_dumpables(CFCClass *self); static void S_bequeath_methods(CFCClass *self); -const static CFCMeta CFCCLASS_META = { +static const CFCMeta CFCCLASS_META = { "Clownfish::CFC::Model::Class", sizeof(CFCClass), (CFCBase_destroy_t)CFCClass_destroy http://git-wip-us.apache.org/repos/asf/lucy/blob/fadd6021/clownfish/compiler/src/CFCDocuComment.c ---------------------------------------------------------------------- diff --git a/clownfish/compiler/src/CFCDocuComment.c b/clownfish/compiler/src/CFCDocuComment.c index 0c04966..4a28cf2 100644 --- a/clownfish/compiler/src/CFCDocuComment.c +++ b/clownfish/compiler/src/CFCDocuComment.c @@ -78,7 +78,7 @@ S_strip(char *comment) { FREEMEM(scratch); } -const static CFCMeta CFCDOCUCOMMENT_META = { +static const CFCMeta CFCDOCUCOMMENT_META = { "Clownfish::CFC::Model::DocuComment", sizeof(CFCDocuComment), (CFCBase_destroy_t)CFCDocuComment_destroy http://git-wip-us.apache.org/repos/asf/lucy/blob/fadd6021/clownfish/compiler/src/CFCDumpable.c ---------------------------------------------------------------------- diff --git a/clownfish/compiler/src/CFCDumpable.c b/clownfish/compiler/src/CFCDumpable.c index 50d7bd4..976e9d8 100644 --- a/clownfish/compiler/src/CFCDumpable.c +++ b/clownfish/compiler/src/CFCDumpable.c @@ -61,7 +61,7 @@ struct CFCDumpable { CFCBase base; }; -const static CFCMeta CFCDUMPABLE_META = { +static const CFCMeta CFCDUMPABLE_META = { "Clownfish::CFC::Dumpable", sizeof(CFCDumpable), (CFCBase_destroy_t)CFCDumpable_destroy http://git-wip-us.apache.org/repos/asf/lucy/blob/fadd6021/clownfish/compiler/src/CFCFile.c ---------------------------------------------------------------------- diff --git a/clownfish/compiler/src/CFCFile.c b/clownfish/compiler/src/CFCFile.c index 6aa3abc..84065b1 100644 --- a/clownfish/compiler/src/CFCFile.c +++ b/clownfish/compiler/src/CFCFile.c @@ -43,7 +43,7 @@ struct CFCFile { char *guard_close; }; -const static CFCMeta CFCFILE_META = { +static const CFCMeta CFCFILE_META = { "Clownfish::CFC::Model::File", sizeof(CFCFile), (CFCBase_destroy_t)CFCFile_destroy http://git-wip-us.apache.org/repos/asf/lucy/blob/fadd6021/clownfish/compiler/src/CFCFileSpec.c ---------------------------------------------------------------------- diff --git a/clownfish/compiler/src/CFCFileSpec.c b/clownfish/compiler/src/CFCFileSpec.c index 37b0fbf..41e3ba4 100644 --- a/clownfish/compiler/src/CFCFileSpec.c +++ b/clownfish/compiler/src/CFCFileSpec.c @@ -36,7 +36,7 @@ struct CFCFileSpec { int is_included; }; -const static CFCMeta CFCFILESPEC_META = { +static const CFCMeta CFCFILESPEC_META = { "Clownfish::CFC::Model::FileSpec", sizeof(CFCFileSpec), (CFCBase_destroy_t)CFCFileSpec_destroy http://git-wip-us.apache.org/repos/asf/lucy/blob/fadd6021/clownfish/compiler/src/CFCFunction.c ---------------------------------------------------------------------- diff --git a/clownfish/compiler/src/CFCFunction.c b/clownfish/compiler/src/CFCFunction.c index c81660b..7205622 100644 --- a/clownfish/compiler/src/CFCFunction.c +++ b/clownfish/compiler/src/CFCFunction.c @@ -30,7 +30,7 @@ #include "CFCDocuComment.h" #include "CFCUtil.h" -const static CFCMeta CFCFUNCTION_META = { +static const CFCMeta CFCFUNCTION_META = { "Clownfish::CFC::Model::Function", sizeof(CFCFunction), (CFCBase_destroy_t)CFCFunction_destroy http://git-wip-us.apache.org/repos/asf/lucy/blob/fadd6021/clownfish/compiler/src/CFCHierarchy.c ---------------------------------------------------------------------- diff --git a/clownfish/compiler/src/CFCHierarchy.c b/clownfish/compiler/src/CFCHierarchy.c index cfe5a32..b8ba423 100644 --- a/clownfish/compiler/src/CFCHierarchy.c +++ b/clownfish/compiler/src/CFCHierarchy.c @@ -84,7 +84,7 @@ S_fetch_file(CFCHierarchy *self, const char *path_part); static int S_do_propagate_modified(CFCHierarchy *self, CFCClass *klass, int modified); -const static CFCMeta CFCHIERARCHY_META = { +static const CFCMeta CFCHIERARCHY_META = { "Clownfish::CFC::Model::Hierarchy", sizeof(CFCHierarchy), (CFCBase_destroy_t)CFCHierarchy_destroy http://git-wip-us.apache.org/repos/asf/lucy/blob/fadd6021/clownfish/compiler/src/CFCMemPool.c ---------------------------------------------------------------------- diff --git a/clownfish/compiler/src/CFCMemPool.c b/clownfish/compiler/src/CFCMemPool.c index b47ecba..bf16306 100644 --- a/clownfish/compiler/src/CFCMemPool.c +++ b/clownfish/compiler/src/CFCMemPool.c @@ -30,7 +30,7 @@ struct CFCMemPool { char **arenas; }; -const static CFCMeta CFCMEMPOOL_META = { +static const CFCMeta CFCMEMPOOL_META = { "Clownfish::MemPool", sizeof(CFCMemPool), (CFCBase_destroy_t)CFCMemPool_destroy http://git-wip-us.apache.org/repos/asf/lucy/blob/fadd6021/clownfish/compiler/src/CFCMethod.c ---------------------------------------------------------------------- diff --git a/clownfish/compiler/src/CFCMethod.c b/clownfish/compiler/src/CFCMethod.c index 6524a96..a9f0063 100644 --- a/clownfish/compiler/src/CFCMethod.c +++ b/clownfish/compiler/src/CFCMethod.c @@ -43,7 +43,7 @@ struct CFCMethod { int is_novel; }; -const static CFCMeta CFCMETHOD_META = { +static const CFCMeta CFCMETHOD_META = { "Clownfish::CFC::Model::Method", sizeof(CFCMethod), (CFCBase_destroy_t)CFCMethod_destroy http://git-wip-us.apache.org/repos/asf/lucy/blob/fadd6021/clownfish/compiler/src/CFCParamList.c ---------------------------------------------------------------------- diff --git a/clownfish/compiler/src/CFCParamList.c b/clownfish/compiler/src/CFCParamList.c index 279aecd..5826a46 100644 --- a/clownfish/compiler/src/CFCParamList.c +++ b/clownfish/compiler/src/CFCParamList.c @@ -37,7 +37,7 @@ struct CFCParamList { static void S_generate_c_strings(CFCParamList *self); -const static CFCMeta CFCPARAMLIST_META = { +static const CFCMeta CFCPARAMLIST_META = { "Clownfish::CFC::Model::ParamList", sizeof(CFCParamList), (CFCBase_destroy_t)CFCParamList_destroy http://git-wip-us.apache.org/repos/asf/lucy/blob/fadd6021/clownfish/compiler/src/CFCParcel.c ---------------------------------------------------------------------- diff --git a/clownfish/compiler/src/CFCParcel.c b/clownfish/compiler/src/CFCParcel.c index 918be42..9949039 100644 --- a/clownfish/compiler/src/CFCParcel.c +++ b/clownfish/compiler/src/CFCParcel.c @@ -126,7 +126,7 @@ S_validate_name_or_cnick(const char *orig) { return true; } -const static CFCMeta CFCPARCEL_META = { +static const CFCMeta CFCPARCEL_META = { "Clownfish::CFC::Model::Parcel", sizeof(CFCParcel), (CFCBase_destroy_t)CFCParcel_destroy http://git-wip-us.apache.org/repos/asf/lucy/blob/fadd6021/clownfish/compiler/src/CFCParser.c ---------------------------------------------------------------------- diff --git a/clownfish/compiler/src/CFCParser.c b/clownfish/compiler/src/CFCParser.c index 16faae6..0a16d65 100644 --- a/clownfish/compiler/src/CFCParser.c +++ b/clownfish/compiler/src/CFCParser.c @@ -45,7 +45,7 @@ struct CFCParser { CFCParcel *parcel; }; -const static CFCMeta CFCPARSER_META = { +static const CFCMeta CFCPARSER_META = { "Clownfish::CFC::Parser", sizeof(CFCParser), (CFCBase_destroy_t)CFCParser_destroy http://git-wip-us.apache.org/repos/asf/lucy/blob/fadd6021/clownfish/compiler/src/CFCPerl.c ---------------------------------------------------------------------- diff --git a/clownfish/compiler/src/CFCPerl.c b/clownfish/compiler/src/CFCPerl.c index c80aa34..c28037b 100644 --- a/clownfish/compiler/src/CFCPerl.c +++ b/clownfish/compiler/src/CFCPerl.c @@ -57,7 +57,7 @@ S_replace_double_colons(char *text, char replacement); static void S_write_callbacks_c(CFCPerl *self); -const static CFCMeta CFCPERL_META = { +static const CFCMeta CFCPERL_META = { "Clownfish::CFC::Binding::Perl", sizeof(CFCPerl), (CFCBase_destroy_t)CFCPerl_destroy http://git-wip-us.apache.org/repos/asf/lucy/blob/fadd6021/clownfish/compiler/src/CFCPerlClass.c ---------------------------------------------------------------------- diff --git a/clownfish/compiler/src/CFCPerlClass.c b/clownfish/compiler/src/CFCPerlClass.c index f1084de..b571f9c 100644 --- a/clownfish/compiler/src/CFCPerlClass.c +++ b/clownfish/compiler/src/CFCPerlClass.c @@ -60,7 +60,7 @@ static CFCPerlClass **registry = NULL; static size_t registry_size = 0; static size_t registry_cap = 0; -const static CFCMeta CFCPERLCLASS_META = { +static const CFCMeta CFCPERLCLASS_META = { "Clownfish::CFC::Binding::Perl::Class", sizeof(CFCPerlClass), (CFCBase_destroy_t)CFCPerlClass_destroy http://git-wip-us.apache.org/repos/asf/lucy/blob/fadd6021/clownfish/compiler/src/CFCPerlConstructor.c ---------------------------------------------------------------------- diff --git a/clownfish/compiler/src/CFCPerlConstructor.c b/clownfish/compiler/src/CFCPerlConstructor.c index 2ca468f..67891bd 100644 --- a/clownfish/compiler/src/CFCPerlConstructor.c +++ b/clownfish/compiler/src/CFCPerlConstructor.c @@ -38,7 +38,7 @@ struct CFCPerlConstructor { CFCFunction *init_func; }; -const static CFCMeta CFCPERLCONSTRUCTOR_META = { +static const CFCMeta CFCPERLCONSTRUCTOR_META = { "Clownfish::CFC::Binding::Perl::Constructor", sizeof(CFCPerlConstructor), (CFCBase_destroy_t)CFCPerlConstructor_destroy http://git-wip-us.apache.org/repos/asf/lucy/blob/fadd6021/clownfish/compiler/src/CFCPerlMethod.c ---------------------------------------------------------------------- diff --git a/clownfish/compiler/src/CFCPerlMethod.c b/clownfish/compiler/src/CFCPerlMethod.c index 75082f5..270ba7d 100644 --- a/clownfish/compiler/src/CFCPerlMethod.c +++ b/clownfish/compiler/src/CFCPerlMethod.c @@ -100,7 +100,7 @@ static char* S_obj_callback_def(CFCMethod *method, const char *callback_start, const char *refcount_mods); -const static CFCMeta CFCPERLMETHOD_META = { +static const CFCMeta CFCPERLMETHOD_META = { "Clownfish::CFC::Binding::Perl::Method", sizeof(CFCPerlMethod), (CFCBase_destroy_t)CFCPerlMethod_destroy http://git-wip-us.apache.org/repos/asf/lucy/blob/fadd6021/clownfish/compiler/src/CFCPerlPod.c ---------------------------------------------------------------------- diff --git a/clownfish/compiler/src/CFCPerlPod.c b/clownfish/compiler/src/CFCPerlPod.c index 2be6cc2..2ea1e68 100644 --- a/clownfish/compiler/src/CFCPerlPod.c +++ b/clownfish/compiler/src/CFCPerlPod.c @@ -49,7 +49,7 @@ struct CFCPerlPod { size_t num_constructors; }; -const static CFCMeta CFCPERLPOD_META = { +static const CFCMeta CFCPERLPOD_META = { "Clownfish::CFC::Binding::Perl::Pod", sizeof(CFCPerlPod), (CFCBase_destroy_t)CFCPerlPod_destroy http://git-wip-us.apache.org/repos/asf/lucy/blob/fadd6021/clownfish/compiler/src/CFCRuby.c ---------------------------------------------------------------------- diff --git a/clownfish/compiler/src/CFCRuby.c b/clownfish/compiler/src/CFCRuby.c index 1f29e1a..37824b2 100644 --- a/clownfish/compiler/src/CFCRuby.c +++ b/clownfish/compiler/src/CFCRuby.c @@ -46,7 +46,7 @@ struct CFCRuby { static void S_replace_double_colons(char *text, char replacement); -const static CFCMeta CFCRUBY_META = { +static const CFCMeta CFCRUBY_META = { "Clownfish::CFC::Binding::Ruby", sizeof(CFCRuby), (CFCBase_destroy_t)CFCRuby_destroy http://git-wip-us.apache.org/repos/asf/lucy/blob/fadd6021/clownfish/compiler/src/CFCSymbol.c ---------------------------------------------------------------------- diff --git a/clownfish/compiler/src/CFCSymbol.c b/clownfish/compiler/src/CFCSymbol.c index 13fd1ad..60a364f 100644 --- a/clownfish/compiler/src/CFCSymbol.c +++ b/clownfish/compiler/src/CFCSymbol.c @@ -27,7 +27,7 @@ #include "CFCParcel.h" #include "CFCUtil.h" -const static CFCMeta CFCSYMBOL_META = { +static const CFCMeta CFCSYMBOL_META = { "Clownfish::CFC::Model::Symbol", sizeof(CFCSymbol), (CFCBase_destroy_t)CFCSymbol_destroy http://git-wip-us.apache.org/repos/asf/lucy/blob/fadd6021/clownfish/compiler/src/CFCType.c ---------------------------------------------------------------------- diff --git a/clownfish/compiler/src/CFCType.c b/clownfish/compiler/src/CFCType.c index 17f3b29..549dff1 100644 --- a/clownfish/compiler/src/CFCType.c +++ b/clownfish/compiler/src/CFCType.c @@ -43,7 +43,7 @@ struct CFCType { struct CFCType *child; }; -const static CFCMeta CFCTYPE_META = { +static const CFCMeta CFCTYPE_META = { "Clownfish::CFC::Model::Type", sizeof(CFCType), (CFCBase_destroy_t)CFCType_destroy http://git-wip-us.apache.org/repos/asf/lucy/blob/fadd6021/clownfish/compiler/src/CFCVariable.c ---------------------------------------------------------------------- diff --git a/clownfish/compiler/src/CFCVariable.c b/clownfish/compiler/src/CFCVariable.c index 631480a..adf743b 100644 --- a/clownfish/compiler/src/CFCVariable.c +++ b/clownfish/compiler/src/CFCVariable.c @@ -38,7 +38,7 @@ struct CFCVariable { int inert; }; -const static CFCMeta CFCVARIABLE_META = { +static const CFCMeta CFCVARIABLE_META = { "Clownfish::CFC::Model::Variable", sizeof(CFCVariable), (CFCBase_destroy_t)CFCVariable_destroy http://git-wip-us.apache.org/repos/asf/lucy/blob/fadd6021/clownfish/compiler/src/CFCVersion.c ---------------------------------------------------------------------- diff --git a/clownfish/compiler/src/CFCVersion.c b/clownfish/compiler/src/CFCVersion.c index 6c2b88a..671ff36 100644 --- a/clownfish/compiler/src/CFCVersion.c +++ b/clownfish/compiler/src/CFCVersion.c @@ -34,7 +34,7 @@ struct CFCVersion { char *vstring; }; -const static CFCMeta CFCVERSION_META = { +static const CFCMeta CFCVERSION_META = { "Clownfish::CFC::Model::Version", sizeof(CFCVersion), (CFCBase_destroy_t)CFCVersion_destroy
