[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34785] trunk/blender/source/blender/ render/intern/source/pipeline.c: render stats_background() was giving clang warning about unused argument and wasn' t checking for buffer overrun (though this would be very unlikely).

[Campbell Barton]

Revision: 34785
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34785
Author:   campbellbarton
Date:     2011-02-12 01:02:21 +0000 (Sat, 12 Feb 2011)
Log Message:
-----------
render stats_background() was giving clang warning about unused argument and 
wasn't checking for buffer overrun (though this would be very unlikely).
write to the stdout directly rather then building a string and writing that. 
(no functional change).

Modified Paths:
--------------
    trunk/blender/source/blender/render/intern/source/pipeline.c

Modified: trunk/blender/source/blender/render/intern/source/pipeline.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/pipeline.c        
2011-02-11 19:36:58 UTC (rev 34784)
+++ trunk/blender/source/blender/render/intern/source/pipeline.c        
2011-02-12 01:02:21 UTC (rev 34785)
@@ -139,7 +139,6 @@
 
 static void stats_background(void *UNUSED(arg), RenderStats *rs)
 {
-       char str[400], *spos= str;
        uintptr_t mem_in_use, mmap_in_use, peak_memory;
        float megs_used_memory, mmap_used_memory, megs_peak_memory;
 
@@ -151,24 +150,24 @@
        mmap_used_memory= (mmap_in_use)/(1024.0*1024.0);
        megs_peak_memory = (peak_memory)/(1024.0*1024.0);
 
-       spos+= sprintf(spos, "Fra:%d Mem:%.2fM (%.2fM, peak %.2fM) ", rs->cfra,
+       fprintf(stdout, "Fra:%d Mem:%.2fM (%.2fM, peak %.2fM) ", rs->cfra,
                                   megs_used_memory, mmap_used_memory, 
megs_peak_memory);
-       
+
        if(rs->curfield)
-               spos+= sprintf(spos, "Field %d ", rs->curfield);
+               fprintf(stdout, "Field %d ", rs->curfield);
        if(rs->curblur)
-               spos+= sprintf(spos, "Blur %d ", rs->curblur);
-       
+               fprintf(stdout, "Blur %d ", rs->curblur);
+
        if(rs->infostr) {
-               spos+= sprintf(spos, "| %s", rs->infostr);
+               fprintf(stdout, "| %s", rs->infostr);
        }
        else {
                if(rs->tothalo)
-                       spos+= sprintf(spos, "Sce: %s Ve:%d Fa:%d Ha:%d La:%d", 
rs->scenename, rs->totvert, rs->totface, rs->tothalo, rs->totlamp);
-               else 
-                       spos+= sprintf(spos, "Sce: %s Ve:%d Fa:%d La:%d", 
rs->scenename, rs->totvert, rs->totface, rs->totlamp);
+                       fprintf(stdout, "Sce: %s Ve:%d Fa:%d Ha:%d La:%d", 
rs->scenename, rs->totvert, rs->totface, rs->tothalo, rs->totlamp);
+               else
+                       fprintf(stdout, "Sce: %s Ve:%d Fa:%d La:%d", 
rs->scenename, rs->totvert, rs->totface, rs->totlamp);
        }
-       printf("%s\n", str);
+       fflush(stdout);
 }
 
 void RE_FreeRenderResult(RenderResult *res)

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs