Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKen Hughes <khughes@pacific.edu>2008-09-03 01:09:29 +0400
committerKen Hughes <khughes@pacific.edu>2008-09-03 01:09:29 +0400
commitbbf2ff410b4d14967c929cef91ed741beca256b6 (patch)
treea2a2698f9f83c99b0147bbf9090c11a163d26826 /source/blender
parente4dbf0e7d6d80701edc5b41fe9a2d49027abcb44 (diff)
Fix some more gcc warnings.
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/src/drawtext.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/src/drawtext.c b/source/blender/src/drawtext.c
index 0797a425f2a..daa2d52d485 100644
--- a/source/blender/src/drawtext.c
+++ b/source/blender/src/drawtext.c
@@ -328,12 +328,14 @@ void txt_format_line(SpaceText *st, TextLine *line, int do_next) {
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 @@ void txt_format_line(SpaceText *st, TextLine *line, int do_next) {
prev = 'b';
if (i>0) {
while (i>1) {
- *fmt = prev; *fmt++; *str++;
+ *fmt = prev; fmt++; str++;
i--;
}
*fmt = prev;