Revision: 40255
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40255
Author: campbellbarton
Date: 2011-09-16 08:20:21 +0000 (Fri, 16 Sep 2011)
Log Message:
-----------
use replace 0 with NULL for pointers, set some functions static
also fixed own errors in recent static check commit.
Modified Paths:
--------------
trunk/blender/build_files/cmake/cmake_static_check_cppcheck.py
trunk/blender/build_files/cmake/cmake_static_check_sparse.py
trunk/blender/source/blender/blenkernel/intern/action.c
trunk/blender/source/blender/blenkernel/intern/node.c
trunk/blender/source/blender/blenlib/intern/string_utf8.c
trunk/blender/source/blender/editors/animation/anim_filter.c
trunk/blender/source/blender/editors/animation/keyframes_edit.c
trunk/blender/source/blender/editors/curve/curve_ops.c
trunk/blender/source/blender/editors/sound/sound_intern.h
trunk/blender/source/blender/editors/sound/sound_ops.c
trunk/blender/source/blender/editors/space_node/drawnode.c
trunk/blender/source/blender/editors/space_outliner/outliner_edit.c
trunk/blender/source/blender/editors/space_outliner/outliner_tools.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
trunk/blender/source/blender/gpu/intern/gpu_buffers.c
trunk/blender/source/blender/imbuf/intern/indexer.c
trunk/blender/source/blender/imbuf/intern/jp2.c
trunk/blender/source/blender/modifiers/intern/MOD_weightvg_util.c
trunk/blender/source/blender/nodes/composite/node_composite_tree.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
trunk/blender/source/blender/python/intern/bpy_app_handlers.c
trunk/blender/source/blender/python/intern/gpu.c
trunk/blender/source/blender/render/intern/source/envmap.c
trunk/blender/source/blender/render/intern/source/pipeline.c
Modified: trunk/blender/build_files/cmake/cmake_static_check_cppcheck.py
===================================================================
--- trunk/blender/build_files/cmake/cmake_static_check_cppcheck.py
2011-09-16 06:58:20 UTC (rev 40254)
+++ trunk/blender/build_files/cmake/cmake_static_check_cppcheck.py
2011-09-16 08:20:21 UTC (rev 40255)
@@ -23,6 +23,11 @@
# <pep8 compliant>
+import project_source_info
+import subprocess
+import sys
+import os
+
CHECKER_IGNORE_PREFIX = [
"extern",
"intern/moto",
@@ -31,15 +36,11 @@
CHECKER_BIN = "cppcheck"
CHECKER_ARGS = [
- "-I/dsk/data/src/blender/blender/extern/glew/include",
+ "-I" + os.join(project_source_info.SORCE_DIR,
"blender/extern/glew/include"),
# "--check-config", # when includes are missing
# "--enable=all", # if you want sixty hundred pedantic suggestions
]
-import project_source_info
-import subprocess
-import sys
-
def main():
source_info =
project_source_info.build_info(ignore_prefix_list=CHECKER_IGNORE_PREFIX)
Modified: trunk/blender/build_files/cmake/cmake_static_check_sparse.py
===================================================================
--- trunk/blender/build_files/cmake/cmake_static_check_sparse.py
2011-09-16 06:58:20 UTC (rev 40254)
+++ trunk/blender/build_files/cmake/cmake_static_check_sparse.py
2011-09-16 08:20:21 UTC (rev 40255)
@@ -23,7 +23,7 @@
# <pep8 compliant>
-CHECKER_IGNORE_SUFFIX = [
+CHECKER_IGNORE_PREFIX = [
"extern",
"intern/moto",
]
Modified: trunk/blender/source/blender/blenkernel/intern/action.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/action.c 2011-09-16
06:58:20 UTC (rev 40254)
+++ trunk/blender/source/blender/blenkernel/intern/action.c 2011-09-16
08:20:21 UTC (rev 40255)
@@ -117,7 +117,7 @@
tMakeLocalActionContext *mlac = (tMakeLocalActionContext *)mlac_ptr;
if (adt->action == mlac->act) {
- if (id->lib==0) {
+ if (id->lib == NULL) {
adt->action = mlac->actn;
id_us_plus(&mlac->actn->id);
Modified: trunk/blender/source/blender/blenkernel/intern/node.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/node.c 2011-09-16
06:58:20 UTC (rev 40254)
+++ trunk/blender/source/blender/blenkernel/intern/node.c 2011-09-16
08:20:21 UTC (rev 40255)
@@ -1051,9 +1051,9 @@
if(ntree->id.lib==NULL) return;
if(ntree->id.us==1) {
- ntree->id.lib= 0;
+ ntree->id.lib= NULL;
ntree->id.flag= LIB_LOCAL;
- new_id(0, (ID *)ntree, 0);
+ new_id(NULL, (ID *)ntree, NULL);
return;
}
@@ -1069,7 +1069,7 @@
if(cd.local && cd.lib==0) {
ntree->id.lib= NULL;
ntree->id.flag= LIB_LOCAL;
- new_id(0, (ID *)ntree, 0);
+ new_id(NULL, (ID *)ntree, NULL);
}
else if(cd.local && cd.lib) {
/* this is the mixed case, we copy the tree and assign it to
local users */
@@ -1438,7 +1438,7 @@
}
}
-void ntree_validate_links(bNodeTree *ntree)
+static void ntree_validate_links(bNodeTree *ntree)
{
bNodeTreeType *ntreetype = ntreeGetType(ntree->type);
bNodeLink *link;
Modified: trunk/blender/source/blender/blenlib/intern/string_utf8.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/string_utf8.c 2011-09-16
06:58:20 UTC (rev 40254)
+++ trunk/blender/source/blender/blenlib/intern/string_utf8.c 2011-09-16
08:20:21 UTC (rev 40255)
@@ -32,6 +32,8 @@
#include <string.h>
+#include "BLI_string.h"
+
/* from libswish3, originally called u8_isvalid(),
* modified to return the index of the bad character (byte index not utf).
* http://svn.swish-e.org/libswish3/trunk/src/libswish3/utf8.c r3044 -
campbell */
Modified: trunk/blender/source/blender/editors/animation/anim_filter.c
===================================================================
--- trunk/blender/source/blender/editors/animation/anim_filter.c
2011-09-16 06:58:20 UTC (rev 40254)
+++ trunk/blender/source/blender/editors/animation/anim_filter.c
2011-09-16 08:20:21 UTC (rev 40255)
@@ -893,7 +893,7 @@
*/
static short skip_fcurve_with_name (bDopeSheet *ads, FCurve *fcu, ID *owner_id)
{
- bAnimListElem ale_dummy = {0};
+ bAnimListElem ale_dummy = {NULL};
bAnimChannelType *acf;
/* create a dummy wrapper for the F-Curve */
Modified: trunk/blender/source/blender/editors/animation/keyframes_edit.c
===================================================================
--- trunk/blender/source/blender/editors/animation/keyframes_edit.c
2011-09-16 06:58:20 UTC (rev 40254)
+++ trunk/blender/source/blender/editors/animation/keyframes_edit.c
2011-09-16 08:20:21 UTC (rev 40255)
@@ -204,8 +204,8 @@
int filter;
int ret=0;
- bAnimListElem dummychan = {0};
- Base dummybase = {0};
+ bAnimListElem dummychan = {NULL};
+ Base dummybase = {NULL};
if (ob == NULL)
return 0;
@@ -249,7 +249,7 @@
int filter;
int ret=0;
- bAnimListElem dummychan = {0};
+ bAnimListElem dummychan = {NULL};
if (sce == NULL)
return 0;
Modified: trunk/blender/source/blender/editors/curve/curve_ops.c
===================================================================
--- trunk/blender/source/blender/editors/curve/curve_ops.c 2011-09-16
06:58:20 UTC (rev 40254)
+++ trunk/blender/source/blender/editors/curve/curve_ops.c 2011-09-16
08:20:21 UTC (rev 40255)
@@ -46,6 +46,7 @@
#include "WM_api.h"
#include "WM_types.h"
+#include "ED_curve.h"
#include "ED_object.h"
#include "ED_screen.h"
#include "ED_transform.h"
Modified: trunk/blender/source/blender/editors/sound/sound_intern.h
===================================================================
--- trunk/blender/source/blender/editors/sound/sound_intern.h 2011-09-16
06:58:20 UTC (rev 40254)
+++ trunk/blender/source/blender/editors/sound/sound_intern.h 2011-09-16
08:20:21 UTC (rev 40255)
@@ -36,7 +36,5 @@
struct wmOperatorType;
-void SOUND_OT_open(wmOperatorType *ot);
-
#endif /* ED_SOUND_INTERN_H */
Modified: trunk/blender/source/blender/editors/sound/sound_ops.c
===================================================================
--- trunk/blender/source/blender/editors/sound/sound_ops.c 2011-09-16
06:58:20 UTC (rev 40254)
+++ trunk/blender/source/blender/editors/sound/sound_ops.c 2011-09-16
08:20:21 UTC (rev 40255)
@@ -175,7 +175,7 @@
return WM_operator_filesel(C, op, event);
}
-void SOUND_OT_open(wmOperatorType *ot)
+static void SOUND_OT_open(wmOperatorType *ot)
{
/* identifiers */
ot->name= "Open Sound";
@@ -196,7 +196,7 @@
RNA_def_boolean(ot->srna, "mono", FALSE, "Mono", "Mixdown the sound to
mono.");
}
-void SOUND_OT_open_mono(wmOperatorType *ot)
+static void SOUND_OT_open_mono(wmOperatorType *ot)
{
/* identifiers */
ot->name= "Open Sound Mono";
@@ -659,7 +659,7 @@
return OPERATOR_FINISHED;
}
-void SOUND_OT_update_animation_flags(wmOperatorType *ot)
+static void SOUND_OT_update_animation_flags(wmOperatorType *ot)
{
/*
This operator is needed to set a correct state of the sound animation
@@ -703,7 +703,7 @@
return OPERATOR_FINISHED;
}
-void SOUND_OT_bake_animation(wmOperatorType *ot)
+static void SOUND_OT_bake_animation(wmOperatorType *ot)
{
/* identifiers */
ot->name= "Update animation cache";
Modified: trunk/blender/source/blender/editors/space_node/drawnode.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/drawnode.c 2011-09-16
06:58:20 UTC (rev 40254)
+++ trunk/blender/source/blender/editors/space_node/drawnode.c 2011-09-16
08:20:21 UTC (rev 40255)
@@ -97,7 +97,7 @@
}
}
-void node_socket_button_default(const bContext *C, uiBlock *block,
+static void node_socket_button_default(const bContext *C, uiBlock *block,
bNodeTree
*ntree, bNode *node, bNodeSocket *sock,
const char
*name, int x, int y, int width)
{
@@ -135,7 +135,7 @@
return block;
}
-void node_socket_button_components(const bContext *C, uiBlock *block,
+static void node_socket_button_components(const bContext *C, uiBlock *block,
bNodeTree
*ntree, bNode *node, bNodeSocket *sock,
const char
*name, int x, int y, int width)
{
@@ -157,7 +157,7 @@
uiDefBlockButN(block, socket_component_menu, args, name, x, y+1, width,
NODE_DY-2, "");
}
-void node_socket_button_color(const bContext *C, uiBlock *block,
+static void node_socket_button_color(const bContext *C, uiBlock *block,
bNodeTree *ntree,
bNode *node, bNodeSocket *sock,
const char *name, int
x, int y, int width)
{
@@ -179,7 +179,7 @@
/* ****************** BASE DRAW FUNCTIONS FOR NEW OPERATOR NODES
***************** */
-void node_draw_socket_new(bNodeSocket *sock, float size)
+static void node_draw_socket_new(bNodeSocket *sock, float size)
{
float x=sock->locx, y=sock->locy;
Modified: trunk/blender/source/blender/editors/space_outliner/outliner_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_outliner/outliner_edit.c
2011-09-16 06:58:20 UTC (rev 40254)
+++ trunk/blender/source/blender/editors/space_outliner/outliner_edit.c
2011-09-16 08:20:21 UTC (rev 40255)
@@ -218,7 +218,7 @@
/* Rename --------------------------------------------------- */
-void do_item_rename(ARegion *ar, TreeElement *te, TreeStoreElem *tselem,
ReportList *reports)
+static void do_item_rename(ARegion *ar, TreeElement *te, TreeStoreElem
*tselem, ReportList *reports)
{
/* can't rename rna datablocks entries */
if(ELEM3(tselem->type, TSE_RNA_STRUCT, TSE_RNA_PROPERTY,
TSE_RNA_ARRAY_ELEM))
Modified: trunk/blender/source/blender/editors/space_outliner/outliner_tools.c
===================================================================
--- trunk/blender/source/blender/editors/space_outliner/outliner_tools.c
2011-09-16 06:58:20 UTC (rev 40254)
+++ trunk/blender/source/blender/editors/space_outliner/outliner_tools.c
2011-09-16 08:20:21 UTC (rev 40255)
@@ -342,7 +342,7 @@
if (id) {
IdAdtTemplate *iat = (IdAdtTemplate *)tsep->id;
- PointerRNA ptr = {{0}};
+ PointerRNA ptr = {{NULL}};
PropertyRNA *prop;
RNA_pointer_create(&iat->id, &RNA_AnimData, iat->adt, &ptr);
Modified: trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
2011-09-16 06:58:20 UTC (rev 40254)
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
