A little more cleanup, removed a bunch of unused vars in the code.

Trying to get rid of some of the extra warnings we can ignore ;)

Kent

15 files changed, 11 insertions, 33 deletions

diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c
index 7ac20470878..d4c535004b6 100644
--- a/source/blender/blenkernel/intern/constraint.c
+++ b/source/blender/blenkernel/intern/constraint.c
@@ -526,7 +526,6 @@ void evaluate_constraint (bConstraint *constraint, Object *ob, short ownertype,
 {
 	float	M_oldmat[4][4];
 	float	M_identity[4][4];
-	float	enforce = 1.0;
 	
 	if (!constraint || !ob)
 		return;
diff --git a/source/blender/deflate/intern/BLO_deflate.c b/source/blender/deflate/intern/BLO_deflate.c
index 372a4d40163..385b53e8e7a 100644
--- a/source/blender/deflate/intern/BLO_deflate.c
+++ b/source/blender/deflate/intern/BLO_deflate.c
@@ -33,6 +33,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "zlib.h"
 
diff --git a/source/blender/readblenfile/intern/BLO_readblenfile.c b/source/blender/readblenfile/intern/BLO_readblenfile.c
index f77ffaac735..902066fbbeb 100644
--- a/source/blender/readblenfile/intern/BLO_readblenfile.c
+++ b/source/blender/readblenfile/intern/BLO_readblenfile.c
@@ -431,7 +431,6 @@ BLO_readblenfilememory(
 	int fromBufferSize, 
 	BlendReadError *error_r)
 {
-	static char *functionality_check= "\0FUNCTIONALITY_CHECK += BLO_readblenfilememory\n";
 	int magiclen = strlen(headerMagic);
 	BlendFileData *bfd = NULL;
 
@@ -495,7 +494,6 @@ BLO_readblenfilehandle(
 	int fd, 
 	BlendReadError *error_r)
 {
-	static char *functionality_check= "\0FUNCTIONALITY_CHECK += BLO_readblenfilehandle\n";
 	int magiclen = strlen(headerMagic);
 	BlendFileData *bfd = NULL;
 	char tempbuffer[256];
@@ -543,7 +541,6 @@ BLO_readblenfilename(
 	char *fileName, 
 	BlendReadError *error_r)
 {
-	static char *functionality_check= "\0FUNCTIONALITY_CHECK += BLO_readblenfilename\n";
 	BlendFileData *bfd = NULL;
 	int fd;
 
@@ -603,7 +600,6 @@ blo_read_runtime(
 	char *path, 
 	BlendReadError *error_r) 
 {
-	static char *functionality_check= "\0FUNCTIONALITY_CHECK += BLO_read_runtime\n";
 	BlendFileData *bfd= NULL;
 	int fd, datastart;
 	char buf[8];
diff --git a/source/blender/src/drawaction.c b/source/blender/src/drawaction.c
index fbb24c48d5f..0cb9b75bf73 100644
--- a/source/blender/src/drawaction.c
+++ b/source/blender/src/drawaction.c
@@ -114,11 +114,8 @@ void meshactionbuts(SpaceAction *saction, Key *key)
 {
 	int           i;
 	char          str[64];
-	char          keyname[32];
-	float	        x, y, ybase;
+	float	        x, y;
 	uiBlock       *block;
-	uiBut         *but;
-    short ofsx, ofsy = 0; 
 #define RVKBGCOL .6, .65, .7
 #define XIC 20
 #define YIC 20
diff --git a/source/blender/src/edit.c b/source/blender/src/edit.c
index e88a807d215..7ca567a34c4 100644
--- a/source/blender/src/edit.c
+++ b/source/blender/src/edit.c
@@ -761,7 +761,7 @@ void snap_sel_to_curs()
 	TransVert *tv;
 	Base *base;
 	Object *ob;
-	float gridf, *curs, imat[3][3], bmat[3][3], vec[3];
+	float *curs, imat[3][3], bmat[3][3], vec[3];
 	int a;
 
 	curs= give_cursor();
@@ -933,7 +933,7 @@ void snap_curs_to_firstsel()
 	TransVert *tv;
 	Base *base;
 	float *curs, bmat[3][3], vec[3], min[3], max[3], centroid[3];
-	int count, a;
+	int count;
 
 	curs= give_cursor();
 
@@ -1005,7 +1005,7 @@ void snap_to_center()
 	TransVert *tv;
 	Base *base;
 	Object *ob;
-	float gridf, snaploc[3], imat[3][3], bmat[3][3], vec[3], min[3], max[3], centroid[3];
+	float snaploc[3], imat[3][3], bmat[3][3], vec[3], min[3], max[3], centroid[3];
 	int count, a;
 
 
diff --git a/source/blender/src/editaction.c b/source/blender/src/editaction.c
index dbde1c22d84..7d41fc643ad 100644
--- a/source/blender/src/editaction.c
+++ b/source/blender/src/editaction.c
@@ -122,8 +122,6 @@ static void transform_meshchannel_keys(char mode, Key *key);
 static void select_poseelement_by_name (char *name, int select);
 static void hilight_channel (bAction *act, bActionChannel *chan, short hilight);
 static void set_action_key_time (bAction *act, bPoseChannel *chan, int adrcode, short makecurve, float time);
-static void clever_numbuts_meshaction(Key *key, short* mval);
-
 /* Implementation */
 
 short showsliders = 0;
@@ -2142,7 +2140,6 @@ void winqreadactionspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 {
 	unsigned short event= evt->event;
 	short val= evt->val;
-	char ascii= evt->ascii;
 	SpaceAction *saction;
 	bAction	*act;
 	int doredraw= 0;
@@ -2487,7 +2484,7 @@ int get_nearest_key_num(Key *key, short *mval, float *x) {
 static void clever_keyblock_names(Key *key, short* mval){
     int        but=0, i, keynum;
     char       str[64];
-	float      x, min, max;
+	float      x;
 	KeyBlock   *kb;
 	/* get the keynum cooresponding to the y value
 	 * of the mouse pointer, return if this is
diff --git a/source/blender/src/editimasel.c b/source/blender/src/editimasel.c
index 76594c62ad8..6cb680d16d9 100644
--- a/source/blender/src/editimasel.c
+++ b/source/blender/src/editimasel.c
@@ -89,7 +89,6 @@ void winqreadimaselspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 {
 	unsigned short event= evt->event;
 	short val= evt->val;
-	char ascii= evt->ascii;
 	SpaceImaSel *simasel;
 	
 	short mval[2];
diff --git a/source/blender/src/editnla.c b/source/blender/src/editnla.c
index 7ac6a1d86fc..94bbcabbcce 100644
--- a/source/blender/src/editnla.c
+++ b/source/blender/src/editnla.c
@@ -115,7 +115,6 @@ void winqreadnlaspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 {
 	unsigned short event= evt->event;
 	short val= evt->val;
-	char ascii= evt->ascii;
 	SpaceNla *snla = curarea->spacedata.first;
 	int doredraw= 0;
 	short	mval[2];
diff --git a/source/blender/src/editobject.c b/source/blender/src/editobject.c
index 00748187cf3..fcaf29d5190 100644
--- a/source/blender/src/editobject.c
+++ b/source/blender/src/editobject.c
@@ -1738,9 +1738,7 @@ void convertmenu(void)
 
 void flip_subdivison(Object *ob, int level)
 {
-	Base *base;
-	Mesh *me, *tme;
-	short i, j;
+	Mesh *me;
 
 	me = ob->data;
 
diff --git a/source/blender/src/editoops.c b/source/blender/src/editoops.c
index 9612024cd18..562931c0a99 100644
--- a/source/blender/src/editoops.c
+++ b/source/blender/src/editoops.c
@@ -609,7 +609,6 @@ void clever_numbuts_oops()
 {
 	Oops *oops;
 	Object *ob;
-	ID *id = idt;
 	char str1[10];
 	static char naam[256];
 	static char naam2[256];
diff --git a/source/blender/src/editsound.c b/source/blender/src/editsound.c
index 27a68a76153..29942926d5f 100644
--- a/source/blender/src/editsound.c
+++ b/source/blender/src/editsound.c
@@ -101,7 +101,6 @@ void winqreadsoundspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 {
 	unsigned short event= evt->event;
 	short val= evt->val;
-	char ascii= evt->ascii;
 	float dx, dy;
 	int doredraw= 0, cfra, first = 0;
 	short mval[2];
diff --git a/source/blender/src/filesel.c b/source/blender/src/filesel.c
index 9c4d54ba494..5c98b465d01 100644
--- a/source/blender/src/filesel.c
+++ b/source/blender/src/filesel.c
@@ -1797,7 +1797,7 @@ static void fs_fake_users(SpaceFile *sfile)
 
 static int get_hilited_entry(SpaceFile *sfile)
 {
-	int a, count=0;
+	int a;
 
 	for(a=0; a<sfile->totfile; a++) {
 		if(sfile->filelist[a].flags & HILITE) {
@@ -1812,7 +1812,6 @@ void winqreadfilespace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 {
 	unsigned short event= evt->event;
 	short val= evt->val;
-	char ascii= evt->ascii;
 	static int acto=0;
 	SpaceFile *sfile;
 	int act, do_draw= 0, i, test, ret = 0;
diff --git a/source/blender/src/space.c b/source/blender/src/space.c
index 304b3b990a9..60c2c76d13c 100644
--- a/source/blender/src/space.c
+++ b/source/blender/src/space.c
@@ -463,8 +463,8 @@ void select_parent(void)	/* Makes parent active and de-selected OBACT */
 void group_menu(void)
 {
 	Base *base;
-	short nr, len;
-	char *str, tstr[40];
+	short nr;
+	char *str;
 
 	/* make menu string */
 	
diff --git a/source/blender/src/usiblender.c b/source/blender/src/usiblender.c
index 57120f66b95..b79d98cfdb4 100644
--- a/source/blender/src/usiblender.c
+++ b/source/blender/src/usiblender.c
@@ -134,8 +134,6 @@
 void BIF_read_file(char *name)
 {
 	extern short winqueue_break; /* editscreen.c */
-	extern char datatoc_splash_jpg[];
-	extern int datatoc_splash_jpg_size;
 
 	//here?
 	//sound_end_all_sounds();
@@ -159,9 +157,9 @@ int BIF_read_homefile(void)
 	char tstr[FILE_MAXDIR+FILE_MAXFILE], scestr[FILE_MAXDIR];
 	char *home= BLI_gethome();
 	int success;
+#ifdef _WIN32	// FULLSCREEN
 	static int screenmode = -1;
 
-#ifdef _WIN32	// FULLSCREEN
 	screenmode = U.uiflag & FLIPFULLSCREEN;
 #endif
 
@@ -519,8 +517,6 @@ extern ListBase editelems;
 
 void exit_usiblender(void)
 {
-	extern char *fsmenu;	/* filesel.c */
-	
 	freeAllRad();
 	BKE_freecubetable();
 
diff --git a/source/blender/writeblenfile/intern/BLO_writeblenfile.c b/source/blender/writeblenfile/intern/BLO_writeblenfile.c
index de8e70017ca..ab459359822 100644
--- a/source/blender/writeblenfile/intern/BLO_writeblenfile.c
+++ b/source/blender/writeblenfile/intern/BLO_writeblenfile.c
@@ -111,7 +111,6 @@ int BLO_writeblenfile(
 	unsigned int dataIn,
 	struct streamGlueHeaderStruct *streamGlueHeader)
 {
-	static char *functionality_check= "\0FUNCTIONALITY_CHECK += BLO_writeblenfile\n";
 	struct BLO_writeblenfileStruct *writeblenfileStruct = 0;
 	int fileDes;	
 	extern int mywfile;