[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44662] trunk/blender/source/blender/ makesrna/intern: Code cleanup in rna files (huge, higly automated with py script).
Bastien Montagne
montagne29 at wanadoo.fr
Tue Mar 6 00:30:45 CET 2012
Revision: 44662
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44662
Author: mont29
Date: 2012-03-05 23:30:41 +0000 (Mon, 05 Mar 2012)
Log Message:
-----------
Code cleanup in rna files (huge, higly automated with py script).
Addresses:
* C++ comments.
* Spaces after if/for/while/switch statements.
* Spaces around assignment operators.
Modified Paths:
--------------
trunk/blender/source/blender/makesrna/intern/makesrna.c
trunk/blender/source/blender/makesrna/intern/rna_ID.c
trunk/blender/source/blender/makesrna/intern/rna_access.c
trunk/blender/source/blender/makesrna/intern/rna_action.c
trunk/blender/source/blender/makesrna/intern/rna_actuator.c
trunk/blender/source/blender/makesrna/intern/rna_actuator_api.c
trunk/blender/source/blender/makesrna/intern/rna_animation.c
trunk/blender/source/blender/makesrna/intern/rna_animation_api.c
trunk/blender/source/blender/makesrna/intern/rna_animviz.c
trunk/blender/source/blender/makesrna/intern/rna_armature.c
trunk/blender/source/blender/makesrna/intern/rna_armature_api.c
trunk/blender/source/blender/makesrna/intern/rna_boid.c
trunk/blender/source/blender/makesrna/intern/rna_brush.c
trunk/blender/source/blender/makesrna/intern/rna_camera.c
trunk/blender/source/blender/makesrna/intern/rna_camera_api.c
trunk/blender/source/blender/makesrna/intern/rna_cloth.c
trunk/blender/source/blender/makesrna/intern/rna_color.c
trunk/blender/source/blender/makesrna/intern/rna_constraint.c
trunk/blender/source/blender/makesrna/intern/rna_context.c
trunk/blender/source/blender/makesrna/intern/rna_controller.c
trunk/blender/source/blender/makesrna/intern/rna_controller_api.c
trunk/blender/source/blender/makesrna/intern/rna_curve.c
trunk/blender/source/blender/makesrna/intern/rna_define.c
trunk/blender/source/blender/makesrna/intern/rna_dynamicpaint.c
trunk/blender/source/blender/makesrna/intern/rna_fcurve.c
trunk/blender/source/blender/makesrna/intern/rna_fcurve_api.c
trunk/blender/source/blender/makesrna/intern/rna_fluidsim.c
trunk/blender/source/blender/makesrna/intern/rna_gpencil.c
trunk/blender/source/blender/makesrna/intern/rna_group.c
trunk/blender/source/blender/makesrna/intern/rna_image.c
trunk/blender/source/blender/makesrna/intern/rna_image_api.c
trunk/blender/source/blender/makesrna/intern/rna_internal.h
trunk/blender/source/blender/makesrna/intern/rna_key.c
trunk/blender/source/blender/makesrna/intern/rna_lamp.c
trunk/blender/source/blender/makesrna/intern/rna_lattice.c
trunk/blender/source/blender/makesrna/intern/rna_main.c
trunk/blender/source/blender/makesrna/intern/rna_main_api.c
trunk/blender/source/blender/makesrna/intern/rna_material.c
trunk/blender/source/blender/makesrna/intern/rna_material_api.c
trunk/blender/source/blender/makesrna/intern/rna_mesh_api.c
trunk/blender/source/blender/makesrna/intern/rna_mesh_utils.h
trunk/blender/source/blender/makesrna/intern/rna_meta.c
trunk/blender/source/blender/makesrna/intern/rna_modifier.c
trunk/blender/source/blender/makesrna/intern/rna_movieclip.c
trunk/blender/source/blender/makesrna/intern/rna_nla.c
trunk/blender/source/blender/makesrna/intern/rna_nodetree.c
trunk/blender/source/blender/makesrna/intern/rna_object.c
trunk/blender/source/blender/makesrna/intern/rna_object_api.c
trunk/blender/source/blender/makesrna/intern/rna_object_force.c
trunk/blender/source/blender/makesrna/intern/rna_packedfile.c
trunk/blender/source/blender/makesrna/intern/rna_particle.c
trunk/blender/source/blender/makesrna/intern/rna_pose.c
trunk/blender/source/blender/makesrna/intern/rna_pose_api.c
trunk/blender/source/blender/makesrna/intern/rna_property.c
trunk/blender/source/blender/makesrna/intern/rna_render.c
trunk/blender/source/blender/makesrna/intern/rna_rna.c
trunk/blender/source/blender/makesrna/intern/rna_scene.c
trunk/blender/source/blender/makesrna/intern/rna_scene_api.c
trunk/blender/source/blender/makesrna/intern/rna_screen.c
trunk/blender/source/blender/makesrna/intern/rna_sculpt_paint.c
trunk/blender/source/blender/makesrna/intern/rna_sensor.c
trunk/blender/source/blender/makesrna/intern/rna_sensor_api.c
trunk/blender/source/blender/makesrna/intern/rna_sequencer.c
trunk/blender/source/blender/makesrna/intern/rna_sequencer_api.c
trunk/blender/source/blender/makesrna/intern/rna_smoke.c
trunk/blender/source/blender/makesrna/intern/rna_sound.c
trunk/blender/source/blender/makesrna/intern/rna_space.c
trunk/blender/source/blender/makesrna/intern/rna_speaker.c
trunk/blender/source/blender/makesrna/intern/rna_test.c
trunk/blender/source/blender/makesrna/intern/rna_text.c
trunk/blender/source/blender/makesrna/intern/rna_text_api.c
trunk/blender/source/blender/makesrna/intern/rna_texture.c
trunk/blender/source/blender/makesrna/intern/rna_texture_api.c
trunk/blender/source/blender/makesrna/intern/rna_timeline.c
trunk/blender/source/blender/makesrna/intern/rna_tracking.c
trunk/blender/source/blender/makesrna/intern/rna_ui.c
trunk/blender/source/blender/makesrna/intern/rna_ui_api.c
trunk/blender/source/blender/makesrna/intern/rna_userdef.c
trunk/blender/source/blender/makesrna/intern/rna_vfont.c
trunk/blender/source/blender/makesrna/intern/rna_wm.c
trunk/blender/source/blender/makesrna/intern/rna_wm_api.c
trunk/blender/source/blender/makesrna/intern/rna_world.c
Modified: trunk/blender/source/blender/makesrna/intern/makesrna.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/makesrna.c 2012-03-05 22:24:49 UTC (rev 44661)
+++ trunk/blender/source/blender/makesrna/intern/makesrna.c 2012-03-05 23:30:41 UTC (rev 44662)
@@ -62,34 +62,34 @@
static int file_older(const char *file1, const char *file2)
{
struct stat st1, st2;
- // printf("compare: %s %s\n", file1, file2);
+ /* printf("compare: %s %s\n", file1, file2); */
- if(stat(file1, &st1)) return 0;
- if(stat(file2, &st2)) return 0;
+ if (stat(file1, &st1)) return 0;
+ if (stat(file2, &st2)) return 0;
return (st1.st_mtime < st2.st_mtime);
}
-static const char *makesrna_path= NULL;
+static const char *makesrna_path = NULL;
static int replace_if_different(char *tmpfile, const char *dep_files[])
{
- // return 0; // use for testing had edited rna
+ /* return 0; *//* use for testing had edited rna */
#define REN_IF_DIFF \
{ \
- FILE *file_test= fopen(orgfile, "rb"); \
- if(file_test) { \
+ FILE *file_test = fopen(orgfile, "rb"); \
+ if (file_test) { \
fclose(file_test); \
- if(fp_org) fclose(fp_org); \
- if(fp_new) fclose(fp_new); \
- if(remove(orgfile) != 0) { \
+ if (fp_org) fclose(fp_org); \
+ if (fp_new) fclose(fp_new); \
+ if (remove(orgfile) != 0) { \
fprintf(stderr, "%s:%d, Remove Error (%s): \"%s\"\n", \
__FILE__, __LINE__, strerror(errno), orgfile); \
return -1; \
} \
} \
} \
- if(rename(tmpfile, orgfile) != 0) { \
+ if (rename(tmpfile, orgfile) != 0) { \
fprintf(stderr, "%s:%d, Rename Error (%s): \"%s\" -> \"%s\"\n", \
__FILE__, __LINE__, strerror(errno), tmpfile, orgfile); \
return -1; \
@@ -100,7 +100,7 @@
/* end REN_IF_DIFF */
- FILE *fp_new= NULL, *fp_org= NULL;
+ FILE *fp_new = NULL, *fp_org = NULL;
int len_new, len_org;
char *arr_new, *arr_org;
int cmp;
@@ -110,9 +110,9 @@
strcpy(orgfile, tmpfile);
orgfile[strlen(orgfile) - strlen(TMP_EXT)] = '\0'; /* strip '.tmp' */
- fp_org= fopen(orgfile, "rb");
+ fp_org = fopen(orgfile, "rb");
- if(fp_org==NULL) {
+ if (fp_org == NULL) {
REN_IF_DIFF;
}
@@ -120,30 +120,30 @@
/* XXX, trick to work around dependency problem
* assumes dep_files is in the same dir as makesrna.c, which is true for now. */
- if(1) {
+ if (1) {
/* first check if makesrna.c is newer then generated files
* for development on makesrna.c you may want to disable this */
- if(file_older(orgfile, __FILE__)) {
+ if (file_older(orgfile, __FILE__)) {
REN_IF_DIFF;
}
- if(file_older(orgfile, makesrna_path)) {
+ if (file_older(orgfile, makesrna_path)) {
REN_IF_DIFF;
}
/* now check if any files we depend on are newer then any generated files */
- if(dep_files) {
+ if (dep_files) {
int pass;
- for(pass=0; dep_files[pass]; pass++) {
- char from_path[4096]= __FILE__;
+ for (pass = 0; dep_files[pass]; pass++) {
+ char from_path[4096] = __FILE__;
char *p1, *p2;
/* dir only */
- p1= strrchr(from_path, '/');
- p2= strrchr(from_path, '\\');
+ p1 = strrchr(from_path, '/');
+ p2 = strrchr(from_path, '\\');
strcpy((p1 > p2 ? p1 : p2)+1, dep_files[pass]);
/* account for build deps, if makesrna.c (this file) is newer */
- if(file_older(orgfile, from_path)) {
+ if (file_older(orgfile, from_path)) {
REN_IF_DIFF;
}
}
@@ -152,9 +152,9 @@
/* XXX end dep trick */
- fp_new= fopen(tmpfile, "rb");
+ fp_new = fopen(tmpfile, "rb");
- if(fp_new==NULL) {
+ if (fp_new == NULL) {
/* shouldn't happen, just to be safe */
fprintf(stderr, "%s:%d, open error: \"%s\"\n", __FILE__, __LINE__, tmpfile);
fclose(fp_org);
@@ -165,30 +165,30 @@
fseek(fp_org, 0L, SEEK_END); len_org = ftell(fp_org); fseek(fp_org, 0L, SEEK_SET);
- if(len_new != len_org) {
+ if (len_new != len_org) {
fclose(fp_new);
fclose(fp_org);
REN_IF_DIFF;
}
/* now compare the files... */
- arr_new= MEM_mallocN(sizeof(char)*len_new, "rna_cmp_file_new");
- arr_org= MEM_mallocN(sizeof(char)*len_org, "rna_cmp_file_org");
+ arr_new = MEM_mallocN(sizeof(char)*len_new, "rna_cmp_file_new");
+ arr_org = MEM_mallocN(sizeof(char)*len_org, "rna_cmp_file_org");
- if(fread(arr_new, sizeof(char), len_new, fp_new) != len_new)
+ if (fread(arr_new, sizeof(char), len_new, fp_new) != len_new)
fprintf(stderr, "%s:%d, error reading file %s for comparison.\n", __FILE__, __LINE__, tmpfile);
- if(fread(arr_org, sizeof(char), len_org, fp_org) != len_org)
+ if (fread(arr_org, sizeof(char), len_org, fp_org) != len_org)
fprintf(stderr, "%s:%d, error reading file %s for comparison.\n", __FILE__, __LINE__, orgfile);
fclose(fp_new);
fclose(fp_org);
- cmp= memcmp(arr_new, arr_org, len_new);
+ cmp = memcmp(arr_new, arr_org, len_new);
MEM_freeN(arr_new);
MEM_freeN(arr_org);
- if(cmp) {
+ if (cmp) {
REN_IF_DIFF;
}
else {
@@ -203,9 +203,9 @@
static const char *rna_safe_id(const char *id)
{
- if(strcmp(id, "default") == 0)
+ if (strcmp(id, "default") == 0)
return "default_value";
- else if(strcmp(id, "operator") == 0)
+ else if (strcmp(id, "operator") == 0)
return "operator_value";
return id;
@@ -215,38 +215,38 @@
static int cmp_struct(const void *a, const void *b)
{
- const StructRNA *structa= *(const StructRNA**)a;
- const StructRNA *structb= *(const StructRNA**)b;
+ const StructRNA *structa = *(const StructRNA**)a;
+ const StructRNA *structb = *(const StructRNA**)b;
return strcmp(structa->identifier, structb->identifier);
}
static int cmp_property(const void *a, const void *b)
{
- const PropertyRNA *propa= *(const PropertyRNA**)a;
- const PropertyRNA *propb= *(const PropertyRNA**)b;
+ const PropertyRNA *propa = *(const PropertyRNA**)a;
+ const PropertyRNA *propb = *(const PropertyRNA**)b;
- if(strcmp(propa->identifier, "rna_type") == 0) return -1;
- else if(strcmp(propb->identifier, "rna_type") == 0) return 1;
+ if (strcmp(propa->identifier, "rna_type") == 0) return -1;
+ else if (strcmp(propb->identifier, "rna_type") == 0) return 1;
- if(strcmp(propa->identifier, "name") == 0) return -1;
- else if(strcmp(propb->identifier, "name") == 0) return 1;
+ if (strcmp(propa->identifier, "name") == 0) return -1;
+ else if (strcmp(propb->identifier, "name") == 0) return 1;
return strcmp(propa->name, propb->name);
}
static int cmp_def_struct(const void *a, const void *b)
{
- const StructDefRNA *dsa= *(const StructDefRNA**)a;
- const StructDefRNA *dsb= *(const StructDefRNA**)b;
+ const StructDefRNA *dsa = *(const StructDefRNA**)a;
+ const StructDefRNA *dsb = *(const StructDefRNA**)b;
return cmp_struct(&dsa->srna, &dsb->srna);
}
static int cmp_def_property(const void *a, const void *b)
{
- const PropertyDefRNA *dpa= *(const PropertyDefRNA**)a;
- const PropertyDefRNA *dpb= *(const PropertyDefRNA**)b;
+ const PropertyDefRNA *dpa = *(const PropertyDefRNA**)a;
+ const PropertyDefRNA *dpb = *(const PropertyDefRNA**)b;
return cmp_property(&dpa->prop, &dpb->prop);
}
@@ -257,22 +257,22 @@
void **array;
int a, size;
- if(listbase->first == listbase->last)
+ if (listbase->first == listbase->last)
return;
- for(size=0, link=listbase->first; link; link=link->next)
+ for (size = 0, link = listbase->first; link; link = link->next)
size++;
- array= MEM_mallocN(sizeof(void*)*size, "rna_sortlist");
- for(a=0, link=listbase->first; link; link=link->next, a++)
- array[a]= link;
+ array = MEM_mallocN(sizeof(void*)*size, "rna_sortlist");
+ for (a = 0, link = listbase->first; link; link = link->next, a++)
+ array[a] = link;
qsort(array, size, sizeof(void*), cmp);
- listbase->first= listbase->last= NULL;
- for(a=0; a<size; a++) {
- link= array[a];
- link->next= link->prev= NULL;
+ listbase->first = listbase->last = NULL;
+ for (a = 0; a<size; a++) {
+ link = array[a];
+ link->next = link->prev = NULL;
rna_addtail(listbase, link);
}
@@ -286,18 +286,18 @@
static const char *escape[] = {"\''", "\"\"", "\??", "\\\\","\aa", "\bb", "\ff", "\nn", "\rr", "\tt", "\vv", NULL};
int i, j;
- if(!str) {
+ if (!str) {
fprintf(f, "NULL");
return;
}
fprintf(f, "\"");
- for(i=0; str[i]; i++) {
- for(j=0; escape[j]; j++)
- if(str[i] == escape[j][0])
+ for (i = 0; str[i]; i++) {
+ for (j = 0; escape[j]; j++)
+ if (str[i] == escape[j][0])
break;
- if(escape[j]) fprintf(f, "\\%c", escape[j][1]);
+ if (escape[j]) fprintf(f, "\\%c", escape[j][1]);
else fprintf(f, "%c", str[i]);
}
fprintf(f, "\"");
@@ -305,7 +305,7 @@
static void rna_print_data_get(FILE *f, PropertyDefRNA *dp)
{
- if(dp->dnastructfromname && dp->dnastructfromprop)
+ if (dp->dnastructfromname && dp->dnastructfromprop)
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);
@@ -323,11 +323,11 @@
char *result;
snprintf(buffer, sizeof(buffer), "%s_%s_%s", structname, propname, type);
- result= MEM_callocN(sizeof(char)*strlen(buffer)+1, "rna_alloc_function_name");
+ result = MEM_callocN(sizeof(char)*strlen(buffer)+1, "rna_alloc_function_name");
strcpy(result, buffer);
- alloc= MEM_callocN(sizeof(AllocDefRNA), "AllocDefRNA");
- alloc->mem= result;
+ alloc = MEM_callocN(sizeof(AllocDefRNA), "AllocDefRNA");
+ alloc->mem = result;
rna_addtail(&DefRNA.allocs, alloc);
return result;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list