[Bf-blender-cvs] [21d065af5d7] master: Cleanup: rename nr_* to *_len for DNA code
Campbell Barton
noreply at git.blender.org
Tue May 21 10:02:52 CEST 2019
Commit: 21d065af5d700a8353474b116fe9a54cb34b915b
Author: Campbell Barton
Date: Tue May 21 17:53:22 2019 +1000
Branches: master
https://developer.blender.org/rB21d065af5d700a8353474b116fe9a54cb34b915b
Cleanup: rename nr_* to *_len for DNA code
===================================================================
M source/blender/makesdna/DNA_sdna_types.h
M source/blender/makesdna/intern/dna_genfile.c
M source/blender/makesdna/intern/makesdna.c
===================================================================
diff --git a/source/blender/makesdna/DNA_sdna_types.h b/source/blender/makesdna/DNA_sdna_types.h
index 01e74da4e3b..efd3dbec637 100644
--- a/source/blender/makesdna/DNA_sdna_types.h
+++ b/source/blender/makesdna/DNA_sdna_types.h
@@ -35,7 +35,7 @@ typedef struct SDNA {
bool data_alloc;
/** Total number of struct members. */
- int nr_names, nr_names_alloc;
+ int names_len, names_len_alloc;
/** Struct member names. */
const char **names;
/** Result of #DNA_elem_array_size (aligned with #names). */
@@ -44,15 +44,14 @@ typedef struct SDNA {
/** Size of a pointer in bytes. */
int pointer_size;
- /** Number of basic types + struct types. */
- int nr_types;
/** Type names. */
const char **types;
+ /** Number of basic types + struct types. */
+ int types_len;
+
/** Type lengths. */
short *types_size;
- /** Number of struct types. */
- int nr_structs;
/**
* sp = structs[a] is the address of a struct definition
* sp[0] is struct type number, sp[1] amount of members
@@ -61,6 +60,8 @@ typedef struct SDNA {
* type and name numbers respectively.
*/
short **structs;
+ /** Number of struct types. */
+ int structs_len;
/** #GHash for faster lookups, requires WITH_DNA_GHASH to be used for now. */
struct GHash *structs_map;
diff --git a/source/blender/makesdna/intern/dna_genfile.c b/source/blender/makesdna/intern/dna_genfile.c
index fa5a55ef1b9..2e89629b05e 100644
--- a/source/blender/makesdna/intern/dna_genfile.c
+++ b/source/blender/makesdna/intern/dna_genfile.c
@@ -224,7 +224,7 @@ static void printstruct(SDNA *sdna, short strnr)
*/
int DNA_struct_find_nr_ex(const SDNA *sdna, const char *str, unsigned int *index_last)
{
- if (*index_last < sdna->nr_structs) {
+ if (*index_last < sdna->structs_len) {
const short *sp = sdna->structs[*index_last];
if (STREQ(sdna->types[sp[0]], str)) {
return *index_last;
@@ -242,7 +242,7 @@ int DNA_struct_find_nr_ex(const SDNA *sdna, const char *str, unsigned int *index
}
#else
{
- for (int index = 0; index < sdna->nr_structs; index++) {
+ for (int index = 0; index < sdna->structs_len; index++) {
const short *sp = sdna->structs[index];
if (STREQ(sdna->types[sp[0]], str)) {
*index_last = index;
@@ -304,14 +304,14 @@ static bool init_structDNA(SDNA *sdna, bool do_endian_swap, const char **r_error
if (*data == MAKE_ID('N', 'A', 'M', 'E')) {
data++;
- sdna->nr_names = *data;
+ sdna->names_len = *data;
if (do_endian_swap) {
- BLI_endian_switch_int32(&sdna->nr_names);
+ BLI_endian_switch_int32(&sdna->names_len);
}
- sdna->nr_names_alloc = sdna->nr_names;
+ sdna->names_len_alloc = sdna->names_len;
data++;
- sdna->names = MEM_callocN(sizeof(void *) * sdna->nr_names, "sdnanames");
+ sdna->names = MEM_callocN(sizeof(void *) * sdna->names_len, "sdnanames");
}
else {
*r_error_message = "NAME error in SDNA file";
@@ -319,7 +319,7 @@ static bool init_structDNA(SDNA *sdna, bool do_endian_swap, const char **r_error
}
cp = (char *)data;
- for (int nr = 0; nr < sdna->nr_names; nr++) {
+ for (int nr = 0; nr < sdna->names_len; nr++) {
sdna->names[nr] = cp;
/* "float gravity [3]" was parsed wrong giving both "gravity" and
@@ -344,13 +344,13 @@ static bool init_structDNA(SDNA *sdna, bool do_endian_swap, const char **r_error
if (*data == MAKE_ID('T', 'Y', 'P', 'E')) {
data++;
- sdna->nr_types = *data;
+ sdna->types_len = *data;
if (do_endian_swap) {
- BLI_endian_switch_int32(&sdna->nr_types);
+ BLI_endian_switch_int32(&sdna->types_len);
}
data++;
- sdna->types = MEM_callocN(sizeof(void *) * sdna->nr_types, "sdnatypes");
+ sdna->types = MEM_callocN(sizeof(void *) * sdna->types_len, "sdnatypes");
}
else {
*r_error_message = "TYPE error in SDNA file";
@@ -358,7 +358,7 @@ static bool init_structDNA(SDNA *sdna, bool do_endian_swap, const char **r_error
}
cp = (char *)data;
- for (int nr = 0; nr < sdna->nr_types; nr++) {
+ for (int nr = 0; nr < sdna->types_len; nr++) {
/* WARNING! See: DNA_struct_rename_legacy_hack_static_from_alias docs. */
sdna->types[nr] = DNA_struct_rename_legacy_hack_static_from_alias(cp);
while (*cp) {
@@ -377,17 +377,17 @@ static bool init_structDNA(SDNA *sdna, bool do_endian_swap, const char **r_error
sdna->types_size = sp;
if (do_endian_swap) {
- BLI_endian_switch_int16_array(sp, sdna->nr_types);
+ BLI_endian_switch_int16_array(sp, sdna->types_len);
}
- sp += sdna->nr_types;
+ sp += sdna->types_len;
}
else {
*r_error_message = "TLEN error in SDNA file";
return false;
}
/* prevent BUS error */
- if (sdna->nr_types & 1) {
+ if (sdna->types_len & 1) {
sp++;
}
@@ -396,13 +396,13 @@ static bool init_structDNA(SDNA *sdna, bool do_endian_swap, const char **r_error
if (*data == MAKE_ID('S', 'T', 'R', 'C')) {
data++;
- sdna->nr_structs = *data;
+ sdna->structs_len = *data;
if (do_endian_swap) {
- BLI_endian_switch_int32(&sdna->nr_structs);
+ BLI_endian_switch_int32(&sdna->structs_len);
}
data++;
- sdna->structs = MEM_callocN(sizeof(void *) * sdna->nr_structs, "sdnastrcs");
+ sdna->structs = MEM_callocN(sizeof(void *) * sdna->structs_len, "sdnastrcs");
}
else {
*r_error_message = "STRC error in SDNA file";
@@ -410,7 +410,7 @@ static bool init_structDNA(SDNA *sdna, bool do_endian_swap, const char **r_error
}
sp = (short *)data;
- for (int nr = 0; nr < sdna->nr_structs; nr++) {
+ for (int nr = 0; nr < sdna->structs_len; nr++) {
sdna->structs[nr] = sp;
if (do_endian_swap) {
@@ -436,7 +436,7 @@ static bool init_structDNA(SDNA *sdna, bool do_endian_swap, const char **r_error
{
/* second part of gravity problem, setting "gravity" type to void */
if (gravity_fix > -1) {
- for (int nr = 0; nr < sdna->nr_structs; nr++) {
+ for (int nr = 0; nr < sdna->structs_len; nr++) {
sp = sdna->structs[nr];
if (strcmp(sdna->types[sp[0]], "ClothSimSettings") == 0) {
sp[10] = SDNA_TYPE_VOID;
@@ -448,9 +448,9 @@ static bool init_structDNA(SDNA *sdna, bool do_endian_swap, const char **r_error
#ifdef WITH_DNA_GHASH
{
/* create a ghash lookup to speed up */
- sdna->structs_map = BLI_ghash_str_new_ex("init_structDNA gh", sdna->nr_structs);
+ sdna->structs_map = BLI_ghash_str_new_ex("init_structDNA gh", sdna->structs_len);
- for (intptr_t nr = 0; nr < sdna->nr_structs; nr++) {
+ for (intptr_t nr = 0; nr < sdna->structs_len; nr++) {
sp = sdna->structs[nr];
BLI_ghash_insert(sdna->structs_map, (void *)sdna->types[sp[0]], POINTER_FROM_INT(nr));
}
@@ -482,8 +482,8 @@ static bool init_structDNA(SDNA *sdna, bool do_endian_swap, const char **r_error
/* Cache name size. */
{
- short *names_array_len = MEM_mallocN(sizeof(*names_array_len) * sdna->nr_names, __func__);
- for (int i = 0; i < sdna->nr_names; i++) {
+ short *names_array_len = MEM_mallocN(sizeof(*names_array_len) * sdna->names_len, __func__);
+ for (int i = 0; i < sdna->names_len; i++) {
names_array_len[i] = DNA_elem_array_size(sdna->names[i]);
}
sdna->names_array_len = names_array_len;
@@ -573,7 +573,7 @@ static void recurs_test_compflags(const SDNA *sdna, char *compflags, int structn
sp = sdna->structs[structnr];
typenr = sp[0];
- for (a = 0; a < sdna->nr_structs; a++) {
+ for (a = 0; a < sdna->structs_len; a++) {
if ((a != structnr) && (compflags[a] == SDNA_CMP_EQUAL)) {
sp = sdna->structs[a];
elems = sp[1];
@@ -602,19 +602,19 @@ const char *DNA_struct_get_compareflags(const SDNA *oldsdna, const SDNA *newsdna
const char *str1, *str2;
char *compflags;
- if (oldsdna->nr_structs == 0) {
+ if (oldsdna->structs_len == 0) {
printf("error: file without SDNA\n");
return NULL;
}
- compflags = MEM_callocN(oldsdna->nr_structs, "compflags");
+ compflags = MEM_callocN(oldsdna->structs_len, "compflags");
/* we check all structs in 'oldsdna' and compare them with
* the structs in 'newsdna'
*/
unsigned int newsdna_index_last = 0;
- for (a = 0; a < oldsdna->nr_structs; a++) {
+ for (a = 0; a < oldsdna->structs_len; a++) {
sp_old = oldsdna->structs[a];
/* search for type in cur */
@@ -678,14 +678,14 @@ const char *DNA_struct_get_compareflags(const SDNA *oldsdna, const SDNA *newsdna
/* Because structs can be inside structs, we recursively
* set flags when a struct is altered
*/
- for (a = 0; a < oldsdna->nr_structs; a++) {
+ for (a = 0; a < oldsdna->structs_len; a++) {
if (compflags[a] == SDNA_CMP_NOT_EQUAL) {
recurs_test_compflags(oldsdna, compflags, a);
}
}
#if 0
- for (a = 0; a < oldsdna->nr_structs; a++) {
+ for (a = 0; a < oldsdna->structs_len; a++) {
if (compflags[a] == SDNA_CMP_NOT_EQUAL) {
spold = oldsdna->structs[a];
printf("changed: %s\n", oldsdna->types[spold[0]]);
@@ -1470,14 +1470,14 @@ static bool DNA_sdna_patch_struct_member_nr(SDNA *sdna,
strlen(elem_old_full),
elem_old_full_offset_start);
- if (sdna->nr_names == sdna->nr_names_alloc) {
- sdna->nr_names_alloc += 64;
- sdna->names = MEM_recallocN(sdna->names, sizeof(*sdna->names) * sdna->nr_names_alloc);
+ if (sdna->names_len == sdna->names_len_alloc) {
+ sdna->names_len_alloc += 64;
+ sdna->names = MEM_recallocN(sdna->names, sizeof(*sdna->names) * sdna->names_len_alloc);
sdna->names_array_len = MEM_recallocN(
- (void *)sdna->names_array_len, sizeof(*sdna->names_array_len) * sdna->nr_names_alloc);
+ (void *)sdna->names_array_len, sizeof(*sdna->names_array_len) * sdna->names_len_alloc);
}
const short name_nr_prev = sp[1];
- sp[1] = sdna->nr_names++;
+ sp[1] = sdna->names_len++;
sdna->name
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list