[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16341] trunk/blender/source/blender/src/ drawtext.c: Fix some more gcc warnings.

[Ken Hughes]

Revision: 16341
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16341
Author:   khughes
Date:     2008-09-02 23:09:29 +0200 (Tue, 02 Sep 2008)

Log Message:
-----------
Fix some more gcc warnings.

Modified Paths:
--------------
    trunk/blender/source/blender/src/drawtext.c

Modified: trunk/blender/source/blender/src/drawtext.c
===================================================================
--- trunk/blender/source/blender/src/drawtext.c	2008-09-02 20:53:07 UTC (rev 16340)
+++ trunk/blender/source/blender/src/drawtext.c	2008-09-02 21:09:29 UTC (rev 16341)
@@ -328,12 +328,14 @@
 	int len, i;
 
 	/* Get continuation from previous line */
-	if (line->prev && (fmt=line->prev->format)) {
+	if (line->prev && line->prev->format != NULL) {
+		fmt= line->prev->format;
 		cont = fmt[strlen(fmt)+1]; /* Just after the null-terminator */
 	} else cont = 0;
 
 	/* Get original continuation from this line */
-	if (fmt=line->format) {
+	if (line->format != NULL) {
+		fmt= line->format;
 		orig = fmt[strlen(fmt)+1]; /* Just after the null-terminator */
 	} else orig = 0xFF;
 
@@ -405,7 +407,7 @@
 					prev = 'b';
 				if (i>0) {
 					while (i>1) {
-						*fmt = prev; *fmt++; *str++;
+						*fmt = prev; fmt++; str++;
 						i--;
 					}
 					*fmt = prev;