Revision: 39421
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39421
Author: blendix
Date: 2011-08-15 16:18:04 +0000 (Mon, 15 Aug 2011)
Log Message:
-----------
Code cleanup: add UNUSED_FUNCTION macro to avoid warning messages about unused
functions.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/nla.c
trunk/blender/source/blender/blenlib/BLI_utildefines.h
trunk/blender/source/blender/editors/mesh/editmesh_mods.c
trunk/blender/source/blender/editors/mesh/editmesh_tools.c
trunk/blender/source/blender/editors/object/object_edit.c
trunk/blender/source/blender/editors/space_file/filelist.c
trunk/blender/source/blender/editors/space_nla/nla_edit.c
trunk/blender/source/blender/editors/space_node/node_edit.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_select.c
trunk/blender/source/blender/editors/space_text/text_python.c
trunk/blender/source/blender/render/intern/source/rayshade.c
trunk/blender/source/blender/windowmanager/intern/wm_files.c
trunk/blender/source/blender/windowmanager/intern/wm_operators.c
Modified: trunk/blender/source/blender/blenkernel/intern/nla.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/nla.c 2011-08-15
16:12:39 UTC (rev 39420)
+++ trunk/blender/source/blender/blenkernel/intern/nla.c 2011-08-15
16:18:04 UTC (rev 39421)
@@ -1582,7 +1582,7 @@
/* Baking Tools ------------------------------------------- */
-static void BKE_nla_bake (Scene *scene, ID *UNUSED(id), AnimData *adt, int
UNUSED(flag))
+static void UNUSED_FUNCTION(BKE_nla_bake) (Scene *scene, ID *UNUSED(id),
AnimData *adt, int UNUSED(flag))
{
/* verify that data is valid
Modified: trunk/blender/source/blender/blenlib/BLI_utildefines.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_utildefines.h 2011-08-15
16:12:39 UTC (rev 39420)
+++ trunk/blender/source/blender/blenlib/BLI_utildefines.h 2011-08-15
16:18:04 UTC (rev 39421)
@@ -184,6 +184,12 @@
#endif
#ifdef __GNUC__
+# define UNUSED_FUNCTION(x) __attribute__((__unused__)) UNUSED_ ## x
+#else
+# define UNUSED_FUNCTION(x) UNUSED_ ## x
+#endif
+
+#ifdef __GNUC__
# define WARN_UNUSED __attribute__((warn_unused_result))
#else
# define WARN_UNUSED
Modified: trunk/blender/source/blender/editors/mesh/editmesh_mods.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_mods.c 2011-08-15
16:12:39 UTC (rev 39420)
+++ trunk/blender/source/blender/editors/mesh/editmesh_mods.c 2011-08-15
16:18:04 UTC (rev 39421)
@@ -1697,7 +1697,7 @@
/* ctrl+c in mesh editmode */
-static void mesh_copy_menu(EditMesh *em, wmOperator *op)
+static void UNUSED_FUNCTION(mesh_copy_menu)(EditMesh *em, wmOperator *op)
{
EditSelection *ese;
int ret;
Modified: trunk/blender/source/blender/editors/mesh/editmesh_tools.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_tools.c 2011-08-15
16:12:39 UTC (rev 39420)
+++ trunk/blender/source/blender/editors/mesh/editmesh_tools.c 2011-08-15
16:18:04 UTC (rev 39421)
@@ -3895,7 +3895,7 @@
/* XXX old bevel not ported yet */
-static void bevel_menu(EditMesh *em)
+static void UNUSED_FUNCTION(bevel_menu)(EditMesh *em)
{
BME_Mesh *bm;
BME_TransData_Head *td;
Modified: trunk/blender/source/blender/editors/object/object_edit.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_edit.c 2011-08-15
16:12:39 UTC (rev 39420)
+++ trunk/blender/source/blender/editors/object/object_edit.c 2011-08-15
16:18:04 UTC (rev 39421)
@@ -721,7 +721,7 @@
}
#endif
-static void special_editmenu(Scene *scene, View3D *v3d)
+static void UNUSED_FUNCTION(special_editmenu)(Scene *scene, View3D *v3d)
{
// XXX static short numcuts= 2;
Object *ob= OBACT;
@@ -1343,7 +1343,7 @@
DAG_ids_flush_update(bmain, 0);
}
-static void copy_attr_menu(Main *bmain, Scene *scene, View3D *v3d)
+static void UNUSED_FUNCTION(copy_attr_menu)(Main *bmain, Scene *scene, View3D
*v3d)
{
Object *ob;
short event;
@@ -1616,7 +1616,7 @@
/* ********************** */
-static void image_aspect(Scene *scene, View3D *v3d)
+static void UNUSED_FUNCTION(image_aspect)(Scene *scene, View3D *v3d)
{
/* all selected objects with an image map: scale in image aspect */
Base *base;
@@ -1691,7 +1691,7 @@
}
-static void auto_timeoffs(Scene *scene, View3D *v3d)
+static void UNUSED_FUNCTION(auto_timeoffs)(Scene *scene, View3D *v3d)
{
Base *base, **basesort, **bs;
float start, delta;
@@ -1732,7 +1732,7 @@
}
-static void ofs_timeoffs(Scene *scene, View3D *v3d)
+static void UNUSED_FUNCTION(ofs_timeoffs)(Scene *scene, View3D *v3d)
{
float offset=0.0f;
@@ -1751,7 +1751,7 @@
}
-static void rand_timeoffs(Scene *scene, View3D *v3d)
+static void UNUSED_FUNCTION(rand_timeoffs)(Scene *scene, View3D *v3d)
{
Base *base;
float rand_ofs=0.0f;
Modified: trunk/blender/source/blender/editors/space_file/filelist.c
===================================================================
--- trunk/blender/source/blender/editors/space_file/filelist.c 2011-08-15
16:12:39 UTC (rev 39420)
+++ trunk/blender/source/blender/editors/space_file/filelist.c 2011-08-15
16:18:04 UTC (rev 39421)
@@ -602,28 +602,6 @@
return filelist->changed;
}
-static struct ImBuf * filelist_loadimage(struct FileList* filelist, int index)
-{
- ImBuf *imb = NULL;
- int fidx = 0;
-
- if ( (index < 0) || (index >= filelist->numfiltered) ) {
- return NULL;
- }
- fidx = filelist->fidx[index];
- imb = filelist->filelist[fidx].image;
- if (!imb)
- {
- if ( (filelist->filelist[fidx].flags & IMAGEFILE) ||
(filelist->filelist[fidx].flags & MOVIEFILE) ) {
- imb = IMB_thumb_read(filelist->filelist[fidx].path,
THB_NORMAL);
- }
- if (imb) {
- filelist->filelist[fidx].image = imb;
- }
- }
- return imb;
-}
-
struct ImBuf * filelist_getimage(struct FileList* filelist, int index)
{
ImBuf* ibuf = NULL;
Modified: trunk/blender/source/blender/editors/space_nla/nla_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_nla/nla_edit.c 2011-08-15
16:12:39 UTC (rev 39420)
+++ trunk/blender/source/blender/editors/space_nla/nla_edit.c 2011-08-15
16:18:04 UTC (rev 39421)
@@ -951,7 +951,7 @@
return OPERATOR_FINISHED;
}
-static void NLA_OT_bake (wmOperatorType *ot)
+void NLA_OT_bake (wmOperatorType *ot)
{
/* identifiers */
ot->name= "Bake Strips";
Modified: trunk/blender/source/blender/editors/space_node/node_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_edit.c 2011-08-15
16:12:39 UTC (rev 39420)
+++ trunk/blender/source/blender/editors/space_node/node_edit.c 2011-08-15
16:18:04 UTC (rev 39421)
@@ -1641,7 +1641,7 @@
/* return 0, nothing done */
-static int node_mouse_groupheader(SpaceNode *snode)
+static int UNUSED_FUNCTION(node_mouse_groupheader)(SpaceNode *snode)
{
bNode *gnode;
float mx=0, my=0;
Modified: trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c
2011-08-15 16:12:39 UTC (rev 39420)
+++ trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c
2011-08-15 16:18:04 UTC (rev 39421)
@@ -702,7 +702,7 @@
static Sequence *special_seq_update= 0;
-static void set_special_seq_update(int val)
+static void UNUSED_FUNCTION(set_special_seq_update)(int val)
{
// int x;
Modified: trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
2011-08-15 16:12:39 UTC (rev 39420)
+++ trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
2011-08-15 16:18:04 UTC (rev 39421)
@@ -75,10 +75,6 @@
/* own include */
#include "sequencer_intern.h"
-static void error(const char *UNUSED(dummy)) {}
-static void waitcursor(int UNUSED(val)) {}
-static void activate_fileselect(int UNUSED(d1), const char *UNUSED(d2), const
char *UNUSED(d3), void *UNUSED(d4)) {}
-static int pupmenu(const char *UNUSED(dummy)) {return 0;}
static int okee(const char *UNUSED(dummy)) {return 0;}
@@ -139,7 +135,7 @@
rectf->ymax= seq->machine+SEQ_STRIP_OFSTOP;
}
-static void change_plugin_seq(Scene *scene, char *str) /* called from
fileselect */
+static void UNUSED_FUNCTION(change_plugin_seq)(Scene *scene, char *str) /*
called from fileselect */
{
Editing *ed= seq_give_editing(scene, FALSE);
struct SeqEffectHandle sh;
@@ -762,7 +758,7 @@
return done;
}
-static void touch_seq_files(Scene *scene)
+static void UNUSED_FUNCTION(touch_seq_files)(Scene *scene)
{
Sequence *seq;
Editing *ed= seq_give_editing(scene, FALSE);
@@ -774,7 +770,7 @@
if(okee("Touch and print selected movies")==0) return;
- waitcursor(1);
+ WM_cursor_wait(1);
SEQP_BEGIN(ed, seq) {
if(seq->flag & SELECT) {
@@ -789,7 +785,7 @@
}
SEQ_END
- waitcursor(0);
+ WM_cursor_wait(0);
}
/*
@@ -817,7 +813,7 @@
}
*/
-static void seq_remap_paths(Scene *scene)
+static void UNUSED_FUNCTION(seq_remap_paths)(Scene *scene)
{
Sequence *seq, *last_seq = seq_active_get(scene);
Editing *ed= seq_give_editing(scene, FALSE);
@@ -858,7 +854,7 @@
}
-static void no_gaps(Scene *scene)
+static void UNUSED_FUNCTION(no_gaps)(Scene *scene)
{
Editing *ed= seq_give_editing(scene, FALSE);
int cfra, first= 0, done;
Modified:
trunk/blender/source/blender/editors/space_sequencer/sequencer_select.c
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/sequencer_select.c
2011-08-15 16:12:39 UTC (rev 39420)
+++ trunk/blender/source/blender/editors/space_sequencer/sequencer_select.c
2011-08-15 16:18:04 UTC (rev 39421)
@@ -159,7 +159,7 @@
#endif
-static void select_single_seq(Scene *scene, Sequence *seq, int deselect_all)
/* BRING BACK */
+static void UNUSED_FUNCTION(select_single_seq)(Scene *scene, Sequence *seq,
int deselect_all) /* BRING BACK */
{
Editing *ed= seq_give_editing(scene, FALSE);
Modified: trunk/blender/source/blender/editors/space_text/text_python.c
===================================================================
--- trunk/blender/source/blender/editors/space_text/text_python.c
2011-08-15 16:12:39 UTC (rev 39420)
+++ trunk/blender/source/blender/editors/space_text/text_python.c
2011-08-15 16:18:04 UTC (rev 39421)
@@ -43,6 +43,7 @@
#include "BKE_text.h"
#include "BLI_blenlib.h"
+#include "BLI_utildefines.h"
#include "WM_types.h"
@@ -192,7 +193,7 @@
// XXX
static int doc_scroll= 0;
-static short do_texttools(SpaceText *st, char ascii, unsigned short evnt,
short val)
+static short UNUSED_FUNCTION(do_texttools)(SpaceText *st, char ascii, unsigned
short evnt, short val)
{
ARegion *ar= NULL; // XXX
int qual= 0; // XXX
@@ -375,7 +376,7 @@
; // XXX redraw_alltext();
#endif
-static short do_textmarkers(SpaceText *st, char ascii, unsigned short evnt,
short val)
+static short UNUSED_FUNCTION(do_textmarkers)(SpaceText *st, char ascii,
unsigned short evnt, short val)
{
Text *text;
TextMarker *marker, *mrk, *nxt;
Modified: trunk/blender/source/blender/render/intern/source/rayshade.c
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
