diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-04-26 18:24:11 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-04-26 18:25:16 +0400 |
commit | 7ca74fc1c008355b84c08bcadb56ea6acabce2f3 (patch) | |
tree | 6823cc2e0945928dbabb3e4735380128d61eace2 /source/blender/makesdna/intern | |
parent | 88a0fe5f1bc52ebd918be1f63af57cf0f9d594d1 (diff) |
Code cleanup: use 'const' for arrays (blenloader, gpu, imbuf, makesdna, modifiers, nodes)
Diffstat (limited to 'source/blender/makesdna/intern')
-rw-r--r-- | source/blender/makesdna/intern/dna_genfile.c | 8 | ||||
-rw-r--r-- | source/blender/makesdna/intern/makesdna.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/makesdna/intern/dna_genfile.c b/source/blender/makesdna/intern/dna_genfile.c index 525c7030029..6cf1b8299e8 100644 --- a/source/blender/makesdna/intern/dna_genfile.c +++ b/source/blender/makesdna/intern/dna_genfile.c @@ -307,7 +307,7 @@ static short *findstruct_name(SDNA *sdna, const char *str) */ int DNA_struct_find_nr(SDNA *sdna, const char *str) { - short *sp = NULL; + const short *sp = NULL; if (sdna->lastfind < sdna->nr_structs) { sp = sdna->structs[sdna->lastfind]; @@ -566,7 +566,7 @@ SDNA *DNA_sdna_from_data(const void *data, const int datalen, bool do_endian_swa static void recurs_test_compflags(const SDNA *sdna, char *compflags, int structnr) { int a, b, typenr, elems; - short *sp; + const short *sp; const char *cp; /* check all structs, test if it's inside another struct */ @@ -1307,7 +1307,7 @@ int DNA_elem_offset(SDNA *sdna, const char *stype, const char *vartype, const ch const int SDNAnr = DNA_struct_find_nr(sdna, stype); const short * const spo = sdna->structs[SDNAnr]; - char * const cp = find_elem(sdna, vartype, name, spo, NULL, NULL); + const char * const cp = find_elem(sdna, vartype, name, spo, NULL, NULL); BLI_assert(SDNAnr != -1); return (int)((intptr_t)cp); } @@ -1319,7 +1319,7 @@ bool DNA_struct_elem_find(SDNA *sdna, const char *stype, const char *vartype, co if (SDNAnr != -1) { const short * const spo = sdna->structs[SDNAnr]; - char * const cp = find_elem(sdna, vartype, name, spo, NULL, NULL); + const char * const cp = find_elem(sdna, vartype, name, spo, NULL, NULL); if (cp) return true; return (int)((intptr_t)cp); diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c index 3845e7cde2c..51a0c5a7b0f 100644 --- a/source/blender/makesdna/intern/makesdna.c +++ b/source/blender/makesdna/intern/makesdna.c @@ -723,7 +723,7 @@ static int arraysize(const char *str) static int calculate_structlens(int firststruct) { int a, b, len_native, len_32, len_64, unknown = nr_structs, lastunknown, structtype, type, mul, namelen; - short *sp, *structpoin; + const short *sp, *structpoin; const char *cp; int has_pointer, dna_error = 0; @@ -907,7 +907,7 @@ static void dna_write(FILE *file, const void *pntr, const int size) { static int linelength = 0; int i; - char *data; + const char *data; data = (char *) pntr; @@ -925,7 +925,7 @@ void printStructLengths(void) { int a, unknown = nr_structs, structtype; /*int lastunknown;*/ /*UNUSED*/ - short *structpoin; + const short *structpoin; printf("\n\n*** All detected structs:\n"); while (unknown) { @@ -948,7 +948,7 @@ void printStructLengths(void) static int make_structDNA(const char *baseDirectory, FILE *file) { int len, i; - short *sp; + const short *sp; /* str contains filenames. Since we now include paths, I stretched */ /* it a bit. Hope this is enough :) -nzc- */ char str[SDNA_MAX_FILENAME_LENGTH], *cp; |