[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55493] trunk/blender: code cleanup: use NULL rather then 0 for pointers, and make vars static where possible.
Campbell Barton
ideasman42 at gmail.com
Fri Mar 22 06:34:11 CET 2013
Revision: 55493
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55493
Author: campbellbarton
Date: 2013-03-22 05:34:10 +0000 (Fri, 22 Mar 2013)
Log Message:
-----------
code cleanup: use NULL rather then 0 for pointers, and make vars static where possible.
also found unintentionally defined enum/struct variables that where only meant to be defining the type.
Modified Paths:
--------------
trunk/blender/intern/raskter/raskter.c
trunk/blender/source/blender/blenkernel/intern/bpath.c
trunk/blender/source/blender/blenkernel/intern/image.c
trunk/blender/source/blender/blenkernel/intern/node.c
trunk/blender/source/blender/blenkernel/intern/writeavi.c
trunk/blender/source/blender/blenlib/intern/fileops.c
trunk/blender/source/blender/blenlib/intern/voronoi.c
trunk/blender/source/blender/blenloader/intern/writefile.c
trunk/blender/source/blender/editors/object/object_bake.c
trunk/blender/source/blender/editors/object/object_select.c
trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c
trunk/blender/source/blender/editors/space_node/node_group.c
trunk/blender/source/blender/editors/space_text/text_format_lua.c
trunk/blender/source/blender/editors/space_text/text_format_osl.c
trunk/blender/source/blender/editors/space_text/text_format_py.c
trunk/blender/source/blender/imbuf/intern/cineon/cineon_dpx.c
trunk/blender/source/blender/imbuf/intern/cineon/cineonlib.c
trunk/blender/source/blender/imbuf/intern/cineon/dpxlib.c
trunk/blender/source/blender/imbuf/intern/cineon/logImageCore.c
trunk/blender/source/blender/imbuf/intern/scaling.c
trunk/blender/source/blender/modifiers/intern/MOD_boolean_util.c
trunk/blender/source/blender/python/bmesh/bmesh_py_types_meshdata.c
trunk/blender/source/blender/python/intern/bpy_app_translations.c
trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c
trunk/blender/source/creator/creator.c
Modified: trunk/blender/intern/raskter/raskter.c
===================================================================
--- trunk/blender/intern/raskter/raskter.c 2013-03-22 04:40:45 UTC (rev 55492)
+++ trunk/blender/intern/raskter/raskter.c 2013-03-22 05:34:10 UTC (rev 55493)
@@ -420,7 +420,7 @@
{
int i; /* i: Loop counter. */
struct PolyVert *ply; /* ply: Pointer to a list of integer buffer-space vertex coordinates. */
- struct r_FillContext ctx = {0};
+ struct r_FillContext ctx = {NULL};
const float buf_x_f = (float)(buf_x);
const float buf_y_f = (float)(buf_y);
/*
Modified: trunk/blender/source/blender/blenkernel/intern/bpath.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/bpath.c 2013-03-22 04:40:45 UTC (rev 55492)
+++ trunk/blender/source/blender/blenkernel/intern/bpath.c 2013-03-22 05:34:10 UTC (rev 55493)
@@ -671,14 +671,14 @@
struct PathStore {
struct PathStore *next, *prev;
-} PathStore;
+};
static int bpath_list_append(void *userdata, char *UNUSED(path_dst), const char *path_src)
{
/* store the path and string in a single alloc */
ListBase *ls = userdata;
size_t path_size = strlen(path_src) + 1;
- struct PathStore *path_store = MEM_mallocN(sizeof(PathStore) + path_size, __func__);
+ struct PathStore *path_store = MEM_mallocN(sizeof(struct PathStore) + path_size, __func__);
char *filepath = (char *)(path_store + 1);
memcpy(filepath, path_src, path_size);
Modified: trunk/blender/source/blender/blenkernel/intern/image.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/image.c 2013-03-22 04:40:45 UTC (rev 55492)
+++ trunk/blender/source/blender/blenkernel/intern/image.c 2013-03-22 05:34:10 UTC (rev 55493)
@@ -1819,7 +1819,7 @@
}
/* cleanup the buffer. */
- BLF_buffer(mono, NULL, NULL, 0, 0, 0, FALSE);
+ BLF_buffer(mono, NULL, NULL, 0, 0, 0, NULL);
#undef BUFF_MARGIN_X
#undef BUFF_MARGIN_Y
@@ -3379,7 +3379,7 @@
unsigned char *BKE_image_get_pixels_for_frame(struct Image *image, int frame)
{
- ImageUser iuser = {0};
+ ImageUser iuser = {NULL};
void *lock;
ImBuf *ibuf;
unsigned char *pixels = NULL;
@@ -3406,7 +3406,7 @@
float *BKE_image_get_float_pixels_for_frame(struct Image *image, int frame)
{
- ImageUser iuser = {0};
+ ImageUser iuser = {NULL};
void *lock;
ImBuf *ibuf;
float *pixels = NULL;
Modified: trunk/blender/source/blender/blenkernel/intern/node.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/node.c 2013-03-22 04:40:45 UTC (rev 55492)
+++ trunk/blender/source/blender/blenkernel/intern/node.c 2013-03-22 05:34:10 UTC (rev 55493)
@@ -2445,7 +2445,7 @@
int type;
} bNodeClipboard;
-bNodeClipboard node_clipboard = {{0}};
+static bNodeClipboard node_clipboard = {{NULL}};
void BKE_node_clipboard_init(struct bNodeTree *ntree)
{
Modified: trunk/blender/source/blender/blenkernel/intern/writeavi.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/writeavi.c 2013-03-22 04:40:45 UTC (rev 55492)
+++ trunk/blender/source/blender/blenkernel/intern/writeavi.c 2013-03-22 05:34:10 UTC (rev 55493)
@@ -73,7 +73,7 @@
bMovieHandle *BKE_movie_handle_get(const char imtype)
{
- static bMovieHandle mh = {0};
+ static bMovieHandle mh = {NULL};
/* set the default handle, as builtin */
#ifdef WITH_AVI
Modified: trunk/blender/source/blender/blenlib/intern/fileops.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/fileops.c 2013-03-22 04:40:45 UTC (rev 55492)
+++ trunk/blender/source/blender/blenlib/intern/fileops.c 2013-03-22 05:34:10 UTC (rev 55493)
@@ -423,7 +423,7 @@
/* error occured in callback and recursive walking should stop immediately */
RecursiveOp_Callback_Error = 2
-} recuresiveOp_Callback_Result;
+};
typedef int (*RecursiveOp_Callback)(const char *from, const char *to);
@@ -498,7 +498,7 @@
break;
}
- n = scandir(startfrom, &dirlist, 0, alphasort);
+ n = scandir(startfrom, &dirlist, NULL, alphasort);
if (n < 0) {
/* error opening directory for listing */
perror("scandir");
Modified: trunk/blender/source/blender/blenlib/intern/voronoi.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/voronoi.c 2013-03-22 04:40:45 UTC (rev 55492)
+++ trunk/blender/source/blender/blenlib/intern/voronoi.c 2013-03-22 05:34:10 UTC (rev 55493)
@@ -44,7 +44,7 @@
enum {
voronoiEventType_Site = 0,
voronoiEventType_Circle = 1
-} voronoiEventType;
+};
typedef struct VoronoiEvent {
struct VoronoiEvent *next, *prev;
Modified: trunk/blender/source/blender/blenloader/intern/writefile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/writefile.c 2013-03-22 04:40:45 UTC (rev 55492)
+++ trunk/blender/source/blender/blenloader/intern/writefile.c 2013-03-22 05:34:10 UTC (rev 55493)
@@ -1803,7 +1803,7 @@
if (!save_for_old_blender) {
#ifdef USE_BMESH_SAVE_WITHOUT_MFACE
- Mesh backup_mesh = {{0}};
+ Mesh backup_mesh = {{NULL}};
/* cache only - don't write */
backup_mesh.mface = mesh->mface;
mesh->mface = NULL;
@@ -1846,7 +1846,7 @@
#ifdef USE_BMESH_SAVE_AS_COMPAT
- Mesh backup_mesh = {{0}};
+ Mesh backup_mesh = {{NULL}};
/* backup */
backup_mesh.mpoly = mesh->mpoly;
Modified: trunk/blender/source/blender/editors/object/object_bake.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_bake.c 2013-03-22 04:40:45 UTC (rev 55492)
+++ trunk/blender/source/blender/editors/object/object_bake.c 2013-03-22 05:34:10 UTC (rev 55493)
@@ -323,7 +323,7 @@
CTX_DATA_BEGIN (C, Base *, base, selected_editable_bases)
{
- MultiresBakeRender bkr = {0};
+ MultiresBakeRender bkr = {NULL};
ob = base->object;
@@ -419,7 +419,7 @@
}
for (data = bkj->data.first; data; data = data->next) {
- MultiresBakeRender bkr = {0};
+ MultiresBakeRender bkr = {NULL};
/* copy data stored in job descriptor */
bkr.bake_filter = bkj->bake_filter;
Modified: trunk/blender/source/blender/editors/object/object_select.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_select.c 2013-03-22 04:40:45 UTC (rev 55492)
+++ trunk/blender/source/blender/editors/object/object_select.c 2013-03-22 05:34:10 UTC (rev 55493)
@@ -439,7 +439,7 @@
return OPERATOR_CANCELLED;
}
else if (nr == OBJECT_SELECT_LINKED_OBDATA) {
- if (ob->data == 0)
+ if (ob->data == NULL)
return OPERATOR_CANCELLED;
changed = object_select_all_by_obdata(C, ob->data);
Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c 2013-03-22 04:40:45 UTC (rev 55492)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c 2013-03-22 05:34:10 UTC (rev 55493)
@@ -293,7 +293,7 @@
/* if no mloopcol: do not do */
/* if mtexpoly: only the involved faces, otherwise all */
- if (me->mloopcol == 0 || me->totvert == 0 || me->totpoly == 0) return;
+ if (me->mloopcol == NULL || me->totvert == 0 || me->totpoly == 0) return;
scol = MEM_callocN(sizeof(float) * me->totvert * 5, "scol");
Modified: trunk/blender/source/blender/editors/space_node/node_group.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_group.c 2013-03-22 04:40:45 UTC (rev 55492)
+++ trunk/blender/source/blender/editors/space_node/node_group.c 2013-03-22 05:34:10 UTC (rev 55493)
@@ -552,7 +552,7 @@
} eNodeGroupSeparateType;
/* Operator Property */
-EnumPropertyItem node_group_separate_types[] = {
+static EnumPropertyItem node_group_separate_types[] = {
{NODE_GS_COPY, "COPY", 0, "Copy", "Copy to parent node tree, keep group intact"},
{NODE_GS_MOVE, "MOVE", 0, "Move", "Move to parent node tree, remove from group"},
{0, NULL, 0, NULL, NULL}
Modified: trunk/blender/source/blender/editors/space_text/text_format_lua.c
===================================================================
--- trunk/blender/source/blender/editors/space_text/text_format_lua.c 2013-03-22 04:40:45 UTC (rev 55492)
+++ trunk/blender/source/blender/editors/space_text/text_format_lua.c 2013-03-22 05:34:10 UTC (rev 55493)
@@ -307,7 +307,7 @@
void ED_text_format_register_lua(void)
{
- static TextFormatType tft = {0};
+ static TextFormatType tft = {NULL};
static const char *ext[] = {"lua", NULL};
tft.format_identifier = txtfmt_lua_format_identifier;
Modified: trunk/blender/source/blender/editors/space_text/text_format_osl.c
===================================================================
--- trunk/blender/source/blender/editors/space_text/text_format_osl.c 2013-03-22 04:40:45 UTC (rev 55492)
+++ trunk/blender/source/blender/editors/space_text/text_format_osl.c 2013-03-22 05:34:10 UTC (rev 55493)
@@ -325,7 +325,7 @@
void ED_text_format_register_osl(void)
{
- static TextFormatType tft = {0};
+ static TextFormatType tft = {NULL};
static const char *ext[] = {"osl", NULL};
tft.format_identifier = txtfmt_osl_format_identifier;
Modified: trunk/blender/source/blender/editors/space_text/text_format_py.c
===================================================================
--- trunk/blender/source/blender/editors/space_text/text_format_py.c 2013-03-22 04:40:45 UTC (rev 55492)
+++ trunk/blender/source/blender/editors/space_text/text_format_py.c 2013-03-22 05:34:10 UTC (rev 55493)
@@ -314,7 +314,7 @@
void ED_text_format_register_py(void)
{
- static TextFormatType tft = {0};
+ static TextFormatType tft = {NULL};
static const char *ext[] = {"py", NULL};
tft.format_identifier = txtfmt_py_format_identifier;
Modified: trunk/blender/source/blender/imbuf/intern/cineon/cineon_dpx.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/cineon/cineon_dpx.c 2013-03-22 04:40:45 UTC (rev 55492)
+++ trunk/blender/source/blender/imbuf/intern/cineon/cineon_dpx.c 2013-03-22 05:34:10 UTC (rev 55493)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list