Revision: 41835
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41835
Author: campbellbarton
Date: 2011-11-14 16:05:44 +0000 (Mon, 14 Nov 2011)
Log Message:
-----------
minor cleanup
- use NULL rather then 0 for pointers
- use static functions where possible
- add own includes to ensure func's and their declarations don't get out of
sync.
Modified Paths:
--------------
trunk/blender/source/blender/blenfont/intern/blf_lang.c
trunk/blender/source/blender/blenfont/intern/blf_translation.c
trunk/blender/source/blender/blenkernel/BKE_blender.h
trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c
trunk/blender/source/blender/blenkernel/intern/mesh_validate.c
trunk/blender/source/blender/blenlib/intern/bpath.c
trunk/blender/source/blender/blenlib/intern/path_util.c
trunk/blender/source/blender/editors/interface/interface.c
trunk/blender/source/blender/editors/interface/interface_ops.c
trunk/blender/source/blender/editors/object/object_constraint.c
trunk/blender/source/blender/editors/object/object_vgroup.c
trunk/blender/source/blender/editors/physics/dynamicpaint_ops.c
trunk/blender/source/blender/editors/space_clip/clip_toolbar.c
trunk/blender/source/blender/editors/space_info/info_stats.c
trunk/blender/source/blender/makesdna/intern/makesdna.c
trunk/blender/source/blender/makesrna/intern/rna_context.c
trunk/blender/source/blender/makesrna/intern/rna_nodetree.c
trunk/blender/source/blender/makesrna/intern/rna_wm.c
trunk/blender/source/blender/modifiers/intern/MOD_dynamicpaint.c
trunk/blender/source/blender/modifiers/intern/MOD_ocean.c
trunk/blender/source/blender/nodes/NOD_socket.h
trunk/blender/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c
trunk/blender/source/blender/render/intern/source/shadeoutput.c
trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c
Modified: trunk/blender/source/blender/blenfont/intern/blf_lang.c
===================================================================
--- trunk/blender/source/blender/blenfont/intern/blf_lang.c 2011-11-14
15:29:59 UTC (rev 41834)
+++ trunk/blender/source/blender/blenfont/intern/blf_lang.c 2011-11-14
16:05:44 UTC (rev 41835)
@@ -34,6 +34,8 @@
#include "BLF_api.h"
+#include "BLF_translation.h" /* own include */
+
#ifdef WITH_INTERNATIONAL
#include <locale.h>
Modified: trunk/blender/source/blender/blenfont/intern/blf_translation.c
===================================================================
--- trunk/blender/source/blender/blenfont/intern/blf_translation.c
2011-11-14 15:29:59 UTC (rev 41834)
+++ trunk/blender/source/blender/blenfont/intern/blf_translation.c
2011-11-14 16:05:44 UTC (rev 41835)
@@ -47,7 +47,7 @@
#include "DNA_userdef_types.h" /* For user settings. */
#ifdef WITH_INTERNATIONAL
-const char unifont_filename[]="droidsans.ttf.gz";
+static const char unifont_filename[]="droidsans.ttf.gz";
static unsigned char *unifont_ttf= NULL;
static int unifont_size= 0;
Modified: trunk/blender/source/blender/blenkernel/BKE_blender.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_blender.h 2011-11-14
15:29:59 UTC (rev 41834)
+++ trunk/blender/source/blender/blenkernel/BKE_blender.h 2011-11-14
16:05:44 UTC (rev 41835)
@@ -53,6 +53,8 @@
/* alpha/beta/rc/release, docs use this */
#define BLENDER_VERSION_CYCLE beta
+extern char versionstr[]; /* from blender.c */
+
struct ListBase;
struct MemFile;
struct bContext;
Modified: trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c
2011-11-14 15:29:59 UTC (rev 41834)
+++ trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c
2011-11-14 16:05:44 UTC (rev 41835)
@@ -317,7 +317,7 @@
return 0;
}
-void surface_setUniqueOutputName(DynamicPaintSurface *surface, char *basename,
int output)
+static void surface_setUniqueOutputName(DynamicPaintSurface *surface, char
*basename, int output)
{
char name[64];
BLI_strncpy(name, basename, sizeof(name)); /* in case basename is
surface->name use a copy */
Modified: trunk/blender/source/blender/blenkernel/intern/mesh_validate.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mesh_validate.c
2011-11-14 15:29:59 UTC (rev 41834)
+++ trunk/blender/source/blender/blenkernel/intern/mesh_validate.c
2011-11-14 16:05:44 UTC (rev 41835)
@@ -331,7 +331,7 @@
#undef PRINT
-int BKE_mesh_validate_all_customdata(CustomData *vdata, CustomData *edata,
CustomData *fdata, short do_verbose, const short do_fixes)
+static int BKE_mesh_validate_all_customdata(CustomData *vdata, CustomData
*edata, CustomData *fdata, short do_verbose, const short do_fixes)
{
int vfixed= 0, efixed= 0, ffixed= 0;
Modified: trunk/blender/source/blender/blenlib/intern/bpath.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/bpath.c 2011-11-14 15:29:59 UTC
(rev 41834)
+++ trunk/blender/source/blender/blenlib/intern/bpath.c 2011-11-14 16:05:44 UTC
(rev 41835)
@@ -131,7 +131,7 @@
void makeFilesRelative(Main *bmain, const char *basedir, ReportList *reports)
{
- BPathRemap_Data data= {0};
+ BPathRemap_Data data= {NULL};
if(basedir[0] == '\0') {
printf("%s: basedir='', this is a bug\n", __func__);
@@ -174,7 +174,7 @@
/* similar to makeFilesRelative - keep in sync! */
void makeFilesAbsolute(Main *bmain, const char *basedir, ReportList *reports)
{
- BPathRemap_Data data= {0};
+ BPathRemap_Data data= {NULL};
if(basedir[0] == '\0') {
printf("%s: basedir='', this is a bug\n", __func__);
@@ -280,7 +280,7 @@
void findMissingFiles(Main *bmain, const char *searchpath, ReportList *reports)
{
- struct BPathFind_Data data= {0};
+ struct BPathFind_Data data= {NULL};
data.reports= reports;
BLI_split_dir_part(searchpath, data.searchdir, sizeof(data.searchdir));
Modified: trunk/blender/source/blender/blenlib/intern/path_util.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/path_util.c 2011-11-14
15:29:59 UTC (rev 41834)
+++ trunk/blender/source/blender/blenlib/intern/path_util.c 2011-11-14
16:05:44 UTC (rev 41835)
@@ -1841,7 +1841,7 @@
* @param fullname The full path to the temp directory
* @param userdir Directory specified in user preferences
*/
-void BLI_where_is_temp(char *fullname, const size_t maxlen, char *userdir)
+static void BLI_where_is_temp(char *fullname, const size_t maxlen, char
*userdir)
{
fullname[0] = '\0';
Modified: trunk/blender/source/blender/editors/interface/interface.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface.c 2011-11-14
15:29:59 UTC (rev 41834)
+++ trunk/blender/source/blender/editors/interface/interface.c 2011-11-14
16:05:44 UTC (rev 41835)
@@ -3582,7 +3582,7 @@
uiStyleInit();
}
-void UI_reinit_font()
+void UI_reinit_font(void)
{
uiStyleInit();
}
Modified: trunk/blender/source/blender/editors/interface/interface_ops.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_ops.c
2011-11-14 15:29:59 UTC (rev 41834)
+++ trunk/blender/source/blender/editors/interface/interface_ops.c
2011-11-14 16:05:44 UTC (rev 41835)
@@ -494,7 +494,7 @@
} uiEditSourceButStore;
/* should only ever be set while the edit source operator is running */
-struct uiEditSourceStore *ui_editsource_info= NULL;
+static struct uiEditSourceStore *ui_editsource_info= NULL;
int UI_editsource_enable_check(void)
{
Modified: trunk/blender/source/blender/editors/object/object_constraint.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_constraint.c
2011-11-14 15:29:59 UTC (rev 41834)
+++ trunk/blender/source/blender/editors/object/object_constraint.c
2011-11-14 16:05:44 UTC (rev 41835)
@@ -736,7 +736,7 @@
where_is_pose(scene, ob);
}
else if (ob) {
- Object workob = {{0}};
+ Object workob = {{NULL}};
/* use what_does_parent to find inverse - just like for normal
parenting */
what_does_parent(scene, ob, &workob);
Modified: trunk/blender/source/blender/editors/object/object_vgroup.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_vgroup.c 2011-11-14
15:29:59 UTC (rev 41834)
+++ trunk/blender/source/blender/editors/object/object_vgroup.c 2011-11-14
16:05:44 UTC (rev 41835)
@@ -799,7 +799,7 @@
}
}
if(!length) {
- return 0;
+ return NULL;
}
tverts = MEM_mallocN(sizeof(int)*length, "tempSurroundingVerts");
mf = me->mface;
Modified: trunk/blender/source/blender/editors/physics/dynamicpaint_ops.c
===================================================================
--- trunk/blender/source/blender/editors/physics/dynamicpaint_ops.c
2011-11-14 15:29:59 UTC (rev 41834)
+++ trunk/blender/source/blender/editors/physics/dynamicpaint_ops.c
2011-11-14 16:05:44 UTC (rev 41835)
@@ -53,9 +53,11 @@
#include "WM_types.h"
#include "WM_api.h"
+#include "physics_intern.h" /* own include */
+
static int surface_slot_add_exec(bContext *C, wmOperator *UNUSED(op))
{
- DynamicPaintModifierData *pmd = 0;
+ DynamicPaintModifierData *pmd = NULL;
Object *cObject = CTX_data_pointer_get_type(C, "object",
&RNA_Object).data;
DynamicPaintCanvasSettings *canvas;
DynamicPaintSurface *surface;
@@ -97,7 +99,7 @@
static int surface_slot_remove_exec(bContext *C, wmOperator *UNUSED(op))
{
- DynamicPaintModifierData *pmd = 0;
+ DynamicPaintModifierData *pmd = NULL;
Object *cObject = CTX_data_pointer_get_type(C, "object",
&RNA_Object).data;
DynamicPaintCanvasSettings *canvas;
DynamicPaintSurface *surface;
@@ -336,9 +338,9 @@
/*
-* Bake Dynamic Paint image sequence surface
-*/
-int dynamicPaint_initBake(struct bContext *C, struct wmOperator *op)
+ * Bake Dynamic Paint image sequence surface
+ */
+static int dynamicPaint_initBake(struct bContext *C, struct wmOperator *op)
{
DynamicPaintModifierData *pmd = NULL;
DynamicPaintCanvasSettings *canvas;
Modified: trunk/blender/source/blender/editors/space_clip/clip_toolbar.c
===================================================================
--- trunk/blender/source/blender/editors/space_clip/clip_toolbar.c
2011-11-14 15:29:59 UTC (rev 41834)
+++ trunk/blender/source/blender/editors/space_clip/clip_toolbar.c
2011-11-14 16:05:44 UTC (rev 41835)
@@ -50,6 +50,8 @@
#include "UI_interface.h"
#include "UI_resources.h"
+#include "clip_intern.h" /* own include */
+
/* ************************ header area region *********************** */
/************************** properties ******************************/
Modified: trunk/blender/source/blender/editors/space_info/info_stats.c
===================================================================
--- trunk/blender/source/blender/editors/space_info/info_stats.c
2011-11-14 15:29:59 UTC (rev 41834)
+++ trunk/blender/source/blender/editors/space_info/info_stats.c
2011-11-14 16:05:44 UTC (rev 41835)
@@ -40,6 +40,7 @@
#include "BLI_utildefines.h"
#include "BKE_anim.h"
+#include "BKE_blender.h"
#include "BKE_curve.h"
#include "BKE_displist.h"
#include "BKE_DerivedMesh.h"
@@ -362,7 +363,6 @@
static void stats_string(Scene *scene)
{
- extern char versionstr[]; /* from blender.c */
SceneStats *stats= scene->stats;
Object *ob= (scene->basact)? scene->basact->object: NULL;
uintptr_t mem_in_use, mmap_in_use;
Modified: trunk/blender/source/blender/makesdna/intern/makesdna.c
===================================================================
--- trunk/blender/source/blender/makesdna/intern/makesdna.c 2011-11-14
15:29:59 UTC (rev 41834)
+++ trunk/blender/source/blender/makesdna/intern/makesdna.c 2011-11-14
16:05:44 UTC (rev 41835)
@@ -64,7 +64,7 @@
/* Included the path relative from /source/blender/ here, so we can move */
/* headers around with more freedom. */
-const char *includefiles[] = {
+static const char *includefiles[] = {
// if you add files here, please add them at the end
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
