Revision: 58705
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58705
Author: campbellbarton
Date: 2013-07-29 04:18:01 +0000 (Mon, 29 Jul 2013)
Log Message:
-----------
make code style of makesrna.c conform to the rest of blender, was also some odd
indentation for property and struct definitions.
Modified Paths:
--------------
trunk/blender/source/blender/makesrna/intern/makesrna.c
Modified: trunk/blender/source/blender/makesrna/intern/makesrna.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/makesrna.c 2013-07-29
03:10:09 UTC (rev 58704)
+++ trunk/blender/source/blender/makesrna/intern/makesrna.c 2013-07-29
04:18:01 UTC (rev 58705)
@@ -319,15 +319,15 @@
static void rna_print_data_get(FILE *f, PropertyDefRNA *dp)
{
if (dp->dnastructfromname && dp->dnastructfromprop)
- fprintf(f, " %s *data= (%s*)(((%s*)ptr->data)->%s);\n",
dp->dnastructname, dp->dnastructname,
+ fprintf(f, " %s *data = (%s *)(((%s *)ptr->data)->%s);\n",
dp->dnastructname, dp->dnastructname,
dp->dnastructfromname, dp->dnastructfromprop);
else
- fprintf(f, " %s *data= (%s*)(ptr->data);\n",
dp->dnastructname, dp->dnastructname);
+ fprintf(f, " %s *data = (%s *)(ptr->data);\n",
dp->dnastructname, dp->dnastructname);
}
static void rna_print_id_get(FILE *f, PropertyDefRNA *UNUSED(dp))
{
- fprintf(f, " ID *id= ptr->id.data;\n");
+ fprintf(f, " ID *id = ptr->id.data;\n");
}
static void rna_construct_function_name(char *buffer, int size, const char
*structname, const char *propname, const char *type)
@@ -647,13 +647,13 @@
char *lenfunc =
rna_alloc_function_name(srna->identifier, rna_safe_id(prop->identifier),
"get_length");
fprintf(f, " int i,
arraylen[RNA_MAX_ARRAY_DIMENSION];\n");
- fprintf(f, " int len=
%s(ptr, arraylen);\n\n", lenfunc);
- fprintf(f, " for (i=0; i <
len; i++) {\n");
+ fprintf(f, " int len =
%s(ptr, arraylen);\n\n", lenfunc);
+ fprintf(f, " for (i = 0; i <
len; i++) {\n");
MEM_freeN(lenfunc);
}
else {
fprintf(f, " int i;\n\n");
- fprintf(f, " for (i=0; i <
%u; i++) {\n", prop->totarraylength);
+ fprintf(f, " for (i = 0; i <
%u; i++) {\n", prop->totarraylength);
}
if (dp->dnaarraylength == 1) {
@@ -674,11 +674,11 @@
fprintf(f, ") !=
0);\n");
}
else if
(rna_color_quantize(prop, dp)) {
- fprintf(f, "
values[i] = (%s)(data->%s[i]*(1.0f / 255.0f));\n",
+ fprintf(f, "
values[i] = (%s)(data->%s[i] * (1.0f / 255.0f));\n",
rna_type_type(prop), dp->dnaname);
}
else if (dp->dnatype) {
- fprintf(f, "
values[i] = (%s)%s(((%s*)data->%s)[i]);\n",
+ fprintf(f, "
values[i] = (%s)%s(((%s *)data->%s)[i]);\n",
rna_type_type(prop), (dp->booleannegative) ? "!" : "", dp->dnatype,
dp->dnaname);
}
else {
@@ -897,15 +897,15 @@
char *lenfunc =
rna_alloc_function_name(srna->identifier, rna_safe_id(prop->identifier),
"set_length");
fprintf(f, " int i,
arraylen[RNA_MAX_ARRAY_DIMENSION];\n");
- fprintf(f, " int len=
%s(ptr, arraylen);\n\n", lenfunc);
+ fprintf(f, " int len =
%s(ptr, arraylen);\n\n", lenfunc);
rna_clamp_value_range(f, prop);
- fprintf(f, " for (i=0; i <
len; i++) {\n");
+ fprintf(f, " for (i = 0; i <
len; i++) {\n");
MEM_freeN(lenfunc);
}
else {
fprintf(f, " int i;\n\n");
rna_clamp_value_range(f, prop);
- fprintf(f, " for (i=0; i <
%u; i++) {\n", prop->totarraylength);
+ fprintf(f, " for (i = 0; i <
%u; i++) {\n", prop->totarraylength);
}
if (dp->dnaarraylength == 1) {
@@ -934,7 +934,7 @@
}
else {
if (dp->dnatype)
- fprintf(f, "
((%s*)data->%s)[i] = %s", dp->dnatype, dp->dnaname,
+ fprintf(f, "
((%s *)data->%s)[i] = %s", dp->dnatype, dp->dnaname,
(dp->booleannegative) ? "!" : "");
else
fprintf(f, "
(data->%s)[i] = %s", dp->dnaname, (dp->booleannegative) ? "!" : "");
@@ -1072,8 +1072,8 @@
rna_print_data_get(f, dp);
fprintf(f, "\n memset(iter, 0, sizeof(*iter));\n");
- fprintf(f, " iter->parent= *ptr;\n");
- fprintf(f, " iter->prop= (PropertyRNA *)&rna_%s_%s;\n",
srna->identifier, prop->identifier);
+ fprintf(f, " iter->parent = *ptr;\n");
+ fprintf(f, " iter->prop = (PropertyRNA *)&rna_%s_%s;\n",
srna->identifier, prop->identifier);
if (dp->dnalengthname || dp->dnalengthfixed) {
if (manualfunc) {
@@ -1100,7 +1100,7 @@
getfunc = rna_alloc_function_name(srna->identifier,
rna_safe_id(prop->identifier), "get");
fprintf(f, "\n if (iter->valid)\n");
- fprintf(f, " iter->ptr= %s(iter);\n", getfunc);
+ fprintf(f, " iter->ptr = %s(iter);\n", getfunc);
fprintf(f, "}\n\n");
@@ -1139,14 +1139,14 @@
return func;
}
- fprintf(f, " int found= 0;\n");
+ fprintf(f, " int found = 0;\n");
fprintf(f, " CollectionPropertyIterator iter;\n\n");
fprintf(f, " %s_%s_begin(&iter, ptr);\n\n", srna->identifier,
rna_safe_id(prop->identifier));
fprintf(f, " if (iter.valid) {\n");
if (strcmp(nextfunc, "rna_iterator_array_next") == 0) {
- fprintf(f, " ArrayIterator *internal=
iter.internal;\n");
+ fprintf(f, " ArrayIterator *internal =
iter.internal;\n");
fprintf(f, " if (index < 0 || index >=
internal->length) {\n");
fprintf(f, "#ifdef __GNUC__\n");
fprintf(f, " printf(\"Array iterator out of
range: %%s (index %%d)\\n\", __func__, index);\n");
@@ -1158,25 +1158,25 @@
fprintf(f, " while (index-- > 0 &&
iter.valid) {\n");
fprintf(f, "
rna_iterator_array_next(&iter);\n");
fprintf(f, " }\n");
- fprintf(f, " found= (index == -1 &&
iter.valid);\n");
+ fprintf(f, " found = (index == -1 &&
iter.valid);\n");
fprintf(f, " }\n");
fprintf(f, " else {\n");
- fprintf(f, " internal->ptr +=
internal->itemsize*index;\n");
- fprintf(f, " found= 1;\n");
+ fprintf(f, " internal->ptr +=
internal->itemsize * index;\n");
+ fprintf(f, " found = 1;\n");
fprintf(f, " }\n");
}
else if (strcmp(nextfunc, "rna_iterator_listbase_next") == 0) {
- fprintf(f, " ListBaseIterator *internal=
iter.internal;\n");
+ fprintf(f, " ListBaseIterator *internal =
iter.internal;\n");
fprintf(f, " if (internal->skip) {\n");
fprintf(f, " while (index-- > 0 &&
iter.valid) {\n");
fprintf(f, "
rna_iterator_listbase_next(&iter);\n");
fprintf(f, " }\n");
- fprintf(f, " found= (index == -1 &&
iter.valid);\n");
+ fprintf(f, " found = (index == -1 &&
iter.valid);\n");
fprintf(f, " }\n");
fprintf(f, " else {\n");
fprintf(f, " while (index-- > 0 &&
internal->link)\n");
- fprintf(f, " internal->link=
internal->link->next;\n");
- fprintf(f, " found= (index == -1 &&
internal->link);\n");
+ fprintf(f, " internal->link =
internal->link->next;\n");
+ fprintf(f, " found = (index == -1 &&
internal->link);\n");
fprintf(f, " }\n");
}
@@ -1318,7 +1318,7 @@
getfunc = rna_alloc_function_name(srna->identifier,
rna_safe_id(prop->identifier), "get");
fprintf(f, "\n if (iter->valid)\n");
- fprintf(f, " iter->ptr= %s(iter);\n", getfunc);
+ fprintf(f, " iter->ptr = %s(iter);\n", getfunc);
fprintf(f, "}\n\n");
@@ -2202,7 +2202,7 @@
else if ((type == PROP_POINTER) && (flag & PROP_RNAPTR) &&
!(flag & PROP_THICK_WRAP))
ptrstr = "*";
/* PROP_THICK_WRAP strings are pre-allocated on the
ParameterList stack,
- * but type name for string props is already char*, so leave
empty */
+ * but type name for string props is already (char *), so leave
empty */
else if (type == PROP_STRING && (flag & PROP_THICK_WRAP))
ptrstr = "";
else
@@ -2225,19 +2225,19 @@
/* assign self */
if (func->flag & FUNC_USE_SELF_ID) {
- fprintf(f, "\t_selfid= (struct ID*)_ptr->id.data;\n");
+ fprintf(f, "\t_selfid = (struct ID *)_ptr->id.data;\n");
}
if ((func->flag & FUNC_NO_SELF) == 0) {
- if (dsrna->dnaname) fprintf(f, "\t_self= (struct %s
*)_ptr->data;\n", dsrna->dnaname);
- else fprintf(f, "\t_self= (struct %s *)_ptr->data;\n",
srna->identifier);
+ if (dsrna->dnaname) fprintf(f, "\t_self = (struct %s
*)_ptr->data;\n", dsrna->dnaname);
+ else fprintf(f, "\t_self = (struct %s *)_ptr->data;\n",
srna->identifier);
}
else if (func->flag & FUNC_USE_SELF_TYPE) {
- fprintf(f, "\t_type= _ptr->type;\n");
+ fprintf(f, "\t_type = _ptr->type;\n");
}
if (has_data) {
- fprintf(f, "\t_data= (char *)_parms->data;\n");
+ fprintf(f, "\t_data = (char *)_parms->data;\n");
}
dparm = dfunc->cont.properties.first;
@@ -2248,7 +2248,7 @@
cptr = ((type == PROP_POINTER) && !(flag & PROP_RNAPTR));
if (dparm->prop == func->c_ret)
- fprintf(f, "\t_retdata= _data;\n");
+ fprintf(f, "\t_retdata = _data;\n");
else {
const char *data_str;
if (cptr || (flag & PROP_DYNAMIC)) {
@@ -2275,7 +2275,7 @@
/* this must be kept in sync with
RNA_parameter_length_get_data,
* we could just call the function directly, but this
is faster */
if (flag & PROP_DYNAMIC) {
- fprintf(f, "\t%s_len= %s((int *)_data);\n",
dparm->prop->identifier, pout ? "" : "*");
+ fprintf(f, "\t%s_len = %s((int *)_data);\n",
dparm->prop->identifier, pout ? "" : "*");
data_str = "(&(((char *)_data)[sizeof(void
*)]))";
}
else {
@@ -2286,7 +2286,7 @@
if (!pout)
fprintf(f, "%s", valstr);
- fprintf(f, "((%s%s%s)%s);\n",
rna_type_struct(dparm->prop), rna_parameter_type_name(dparm->prop),
+ fprintf(f, "((%s%s %s)%s);\n",
rna_type_struct(dparm->prop), rna_parameter_type_name(dparm->prop),
ptrstr, data_str);
}
@@ -2356,7 +2356,7 @@
dparm = rna_find_parameter_def(func->c_ret);
ptrstr = (((dparm->prop->type == PROP_POINTER) &&
!(dparm->prop->flag & PROP_RNAPTR)) ||
(dparm->prop->arraydimension)) ? "*" : "";
- fprintf(f, "\t*((%s%s%s*)_retdata) = %s;\n",
rna_type_struct(dparm->prop),
+ fprintf(f, "\t*((%s%s %s*)_retdata) = %s;\n",
rna_type_struct(dparm->prop),
rna_parameter_type_name(dparm->prop), ptrstr,
func->c_ret->identifier);
}
}
@@ -2915,9 +2915,9 @@
fprintf(f, ", %d, ", prop->flag);
rna_print_c_string(f, prop->name); fprintf(f, ",\n\t");
rna_print_c_string(f, prop->description); fprintf(f, ",\n\t");
- fprintf(f, "%d,\n", prop->icon);
- rna_print_c_string(f, prop->translation_context); fprintf(f, ",\n\t");
- fprintf(f, "\t%s, %s|%s, %s, %u, {%u, %u, %u}, %u,\n",
+ fprintf(f, "%d, ", prop->icon);
+ rna_print_c_string(f, prop->translation_context); fprintf(f, ",\n");
+ fprintf(f, "\t%s, %s | %s, %s, %u, {%u, %u, %u}, %u,\n",
RNA_property_typename(prop->type),
rna_property_subtypename(prop->subtype),
rna_property_subtype_unit(prop->subtype),
@@ -3155,14 +3155,14 @@
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
