[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33297] trunk/blender: fix for crash introduced r33257, also tag some vars as unused.

[Campbell Barton]

Revision: 33297
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33297
Author:   campbellbarton
Date:     2010-11-24 21:13:37 +0100 (Wed, 24 Nov 2010)

Log Message:
-----------
fix for crash introduced r33257, also tag some vars as unused.

Modified Paths:
--------------
    trunk/blender/intern/guardedalloc/intern/mmap_win.c
    trunk/blender/source/blender/blenlib/intern/fileops.c
    trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
    trunk/blender/source/blender/windowmanager/intern/wm_operators.c

Modified: trunk/blender/intern/guardedalloc/intern/mmap_win.c
===================================================================
--- trunk/blender/intern/guardedalloc/intern/mmap_win.c	2010-11-24 19:06:56 UTC (rev 33296)
+++ trunk/blender/intern/guardedalloc/intern/mmap_win.c	2010-11-24 20:13:37 UTC (rev 33297)
@@ -86,7 +86,7 @@
 /* --------------------------------------------------------------------- */
 
 /* mmap for windows */
-void *mmap(void *start, size_t len, int prot, int flags, int fd, off_t offset)
+void *mmap(void *UNUSED(start), size_t len, int prot, int flags, int fd, off_t offset)
 {
 	HANDLE fhandle = INVALID_HANDLE_VALUE;
 	HANDLE maphandle;
@@ -151,7 +151,7 @@
 }
 
 /* munmap for windows */
-intptr_t munmap(void *ptr, intptr_t size)
+intptr_t munmap(void *ptr, intptr_t UNUSED(size))
 {
 	MemMap *mm = mmap_findlink(mmapbase, ptr);
 	if (!mm) {

Modified: trunk/blender/source/blender/blenlib/intern/fileops.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/fileops.c	2010-11-24 19:06:56 UTC (rev 33296)
+++ trunk/blender/source/blender/blenlib/intern/fileops.c	2010-11-24 20:13:37 UTC (rev 33297)
@@ -218,7 +218,7 @@
 	return err;
 }
 
-int BLI_link(const char *file, const char *to) {
+int BLI_link(const char *UNUSED(file), const char *UNUSED(to)) {
 	callLocalErrorCallBack("Linking files is unsupported on Windows");
 	
 	return 1;

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_draw.c	2010-11-24 19:06:56 UTC (rev 33296)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_draw.c	2010-11-24 20:13:37 UTC (rev 33297)
@@ -2526,7 +2526,7 @@
 
 		UI_ThemeColor(TH_TEXT_HI);
 		if(v3d->grid != 1.0f) {
-			BLI_snprintf(tstr, sizeof(tstr), "%s x %.4g", v3d->grid, grid_unit);
+			BLI_snprintf(tstr, sizeof(tstr), "%s x %.4g", grid_unit, v3d->grid);
 		}
 
 		BLF_draw_default(22,  ar->winy-(USER_SHOW_VIEWPORTNAME?40:20), 0.0f, tstr[0]?tstr : grid_unit, sizeof(tstr)); /* XXX, use real length */

Modified: trunk/blender/source/blender/windowmanager/intern/wm_operators.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_operators.c	2010-11-24 19:06:56 UTC (rev 33296)
+++ trunk/blender/source/blender/windowmanager/intern/wm_operators.c	2010-11-24 20:13:37 UTC (rev 33297)
@@ -2041,7 +2041,7 @@
 /* *********************** */
 #if defined(WIN32)
 static int console= 1;
-void WM_toggle_console(bContext *C, short show)
+void WM_toggle_console(bContext *UNUSED(C), short show)
 {
 	if(show) {
 		ShowWindow(GetConsoleWindow(),SW_SHOW);
@@ -2053,7 +2053,7 @@
 	}
 }
 
-static int wm_toggle_console_op(bContext *C, wmOperator *op)
+static int wm_toggle_console_op(bContext *C, wmOperator *UNUSED(op))
 {
 	if(console) {
 		WM_toggle_console(C, 0);