[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47596] branches/soc-2012-swiss_cheese/ source/blender: warning fixes

[Jason Wilkins]

Revision: 47596
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47596
Author:   jwilkins
Date:     2012-06-08 07:15:38 +0000 (Fri, 08 Jun 2012)
Log Message:
-----------
warning fixes

GPU_immediate.h: casting a pointer directly to a GLboolean and a complaint about how I wrote GPU_SAFE_RETURN
text_draw.c: uninitialized and unused variables.  also some style changes

Modified Paths:
--------------
    branches/soc-2012-swiss_cheese/source/blender/editors/space_text/text_draw.c
    branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_immediate.h

Modified: branches/soc-2012-swiss_cheese/source/blender/editors/space_text/text_draw.c
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/editors/space_text/text_draw.c	2012-06-08 06:11:24 UTC (rev 47595)
+++ branches/soc-2012-swiss_cheese/source/blender/editors/space_text/text_draw.c	2012-06-08 07:15:38 UTC (rev 47596)
@@ -138,7 +138,8 @@
 	fs->accum = fs->fixedaccum;
 	fs->len = sizeof(fs->fixedbuf);
 
-	for (r = 0, i = 0; *in; r++) {
+	i = 0;
+	for (r = 0; *in; r++) {
 		if (*in == '\t') {
 			i = st->tabnumber - (total % st->tabnumber);
 			total += i;
@@ -712,7 +713,6 @@
 	
 	for (i = 0, mi = 0; str[mi]; i++, mi += BLI_str_utf8_size(str + mi)) {
 		if (i - start >= max) {
-			int str_shift = 0;
 			int ox;
 			char last_format;
 			char buffer[BLF_DRAW_STR_DUMMY_MAX];
@@ -778,13 +778,13 @@
 
 	/* Draw the remaining text */
 	if (y > 0) {
-		int str_shift = 0;
 		int ox;
 		char last_format;
 		char buffer[BLF_DRAW_STR_DUMMY_MAX];
 		size_t len = 0;
+		const int showsyntax = st->showsyntax && format;
 
-		if (st->showsyntax && format) {
+		if (showsyntax) {
 			last_format = format[start];
 			format_draw_color(format[start]);
 		}
@@ -796,7 +796,7 @@
 		for (a = start; str[ma]; a++) {
 			size_t char_len;
 
-			if (st->showsyntax && format && last_format != format[a]) {
+			if (showsyntax && last_format != format[a]) {
 				memcpy(buffer, str + ma - len, len);
 				buffer[len] = '\0';
 				text_font_draw(st, ox, y, buffer);
@@ -1642,11 +1642,15 @@
 			}
 
 			y -= froml * st->lheight;
-			gpuSingleRecti(GL_QUADS, x + fromc * st->cwidth - 1, y, ar->winx, y - st->lheight); y -= st->lheight;
-			for (i = froml + 1; i < tol; i++)
-				gpuSingleRecti(GL_QUADS, x - 4, y, ar->winx, y - st->lheight),  y -= st->lheight;
+			gpuSingleRecti(GL_QUADS, x + fromc * st->cwidth - 1, y, ar->winx, y - st->lheight);
+			y -= st->lheight;
 
-			gpuSingleRecti(GL_QUADS, x - 4, y, x + toc * st->cwidth, y - st->lheight);  y -= st->lheight;
+			for (i = froml + 1; i < tol; i++) {
+				gpuSingleRecti(GL_QUADS, x - 4, y, ar->winx, y - st->lheight);
+				y -= st->lheight;
+			}
+
+			gpuSingleRecti(GL_QUADS, x - 4, y, x + toc * st->cwidth, y - st->lheight);
 		}
 	}
 	else {
@@ -1689,7 +1693,7 @@
 			glDisable(GL_BLEND);
 		}
 	}
-	
+
 	if (!hidden) {
 		/* Draw the cursor itself (we draw the sel. cursor as this is the leading edge) */
 		x = st->showlinenrs ? TXT_OFFSET + TEXTXLOC : TXT_OFFSET;

Modified: branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_immediate.h
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_immediate.h	2012-06-08 06:11:24 UTC (rev 47595)
+++ branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_immediate.h	2012-06-08 07:15:38 UTC (rev 47596)
@@ -65,13 +65,13 @@
    Can only be used in functions that return void. */
 #define GPU_SAFE_RETURN(test, var, ret) \
     var = (GLboolean)(test);            \
-    GPU_ASSERT((#test, var));           \
+    GPU_ASSERT(((void)#test, var));     \
     if (!var) {                         \
         return ret;                     \
     }
 
 #define GPU_CHECK_BASE(var) \
-    GPU_SAFE_RETURN(GPU_IMMEDIATE, var,);
+    GPU_SAFE_RETURN(GPU_IMMEDIATE != NULL, var,);
 
 #define GPU_CHECK_NO_BEGIN(var) \
     GPU_SAFE_RETURN(GPU_IMMEDIATE->buffer == NULL, var,);