Merge lp:~steve-stevebaker/nux/coverity-fixes into lp:nux

[Steve Baker]

Cleaning up some coverity warnings.

Some janitorial work going through some Coverity bugs, just to get familiar with the codebase.

[Tim Penhey (thumper)]

Single letter variables are fine if and only if they are used very close to their declaration.

The change in Nux/AnimatedTextureArea.cpp is acceptable because there is only one use, and it is effectively the next line.

However the change in NuxGraphics/FontTexture.cpp is not so acceptable. Oh dear, just read the source. Just renaming this to "stream" for now would be fine, although the entire function needs refactoring.

For the snprintf, please use sizeof(resultfilename) not the hard coded value of 27.

review: Needs Fixing

[Steve Baker (steve-stevebaker)]

Hi Tim

Thanks for the feedback, I'll resubmit when it is ready.

cheers

On Thu, Jun 7, 2012 at 11:56 AM, Tim Penhey <email address hidden> wrote:
> Review: Needs Fixing
>
> Single letter variables are fine if and only if they are used very close to their declaration.
>
> The change in Nux/AnimatedTextureArea.cpp is acceptable because there is only one use, and it is effectively the next line.
>
> However the change in NuxGraphics/FontTexture.cpp is not so acceptable.  Oh dear, just read the source.  Just renaming this to "stream" for now would be fine, although the entire function needs refactoring.
>
> For the snprintf, please use sizeof(resultfilename) not the hard coded value of 27.
> --
> https://code.launchpad.net/~steve-stevebaker/nux/coverity-fixes/+merge/108523
> You are the owner of lp:~steve-stevebaker/nux/coverity-fixes.

[lp:~steve-stevebaker/nux/coverity-fixes]

623. By Steve Baker on 2012-06-09

rename s to stream

624. By Steve Baker on 2012-06-09

use sizeof(resultfilename)

625. By Steve Baker on 2012-06-09

Merge from main branch

[Steve Baker (steve-stevebaker)]

Ready for review

review: Needs Resubmitting

[Tim Penhey (thumper)]

The code is nicer now. Thanks.

review: Approve

[Tim Penhey (thumper)]

Steve, can I get you to sign the contributors agreement? http://www.canonical.com/contributors

[Steve Baker (steve-stevebaker)]

On Mon, Jun 11, 2012 at 3:31 PM, Tim Penhey <email address hidden> wrote:
> Steve, can I get you to sign the contributors agreement? http://www.canonical.com/contributors

I have just signed it.

[Tim Penhey (thumper)]

Thanks... just waiting now for confirmation to flow through the system.

=== modified file 'Nux/AnimatedTextureArea.cpp'
--- Nux/AnimatedTextureArea.cpp	2011-10-17 20:57:35 +0000
+++ Nux/AnimatedTextureArea.cpp	2012-06-09 05:28:20 +0000
@@ -71,9 +71,9 @@
 
   }
 
-  void AnimatedTextureArea::SetTexture(TextureFrameAnimation *Texture)
+  void AnimatedTextureArea::SetTexture(TextureFrameAnimation *t)
   {
-    m_UserTexture = Texture;
+    m_UserTexture = t;
 
     if (m_UserTexture)
     {

=== modified file 'NuxGraphics/FontTexture.cpp'
--- NuxGraphics/FontTexture.cpp	2011-10-19 20:32:38 +0000
+++ NuxGraphics/FontTexture.cpp	2012-06-09 05:28:20 +0000
@@ -147,11 +147,11 @@
 
       unsigned int line_size = (unsigned int) Line.length();
       char *tc = new char[line_size+1];
-      const char *Stream = tc;
+      const char *stream = tc;
       Memcpy(tc, Line.c_str(), line_size + 1);
       tc[line_size] = 0;
 
-      if ( ParseCommand(&Stream, "common") /*Read == "common"*/)
+      if ( ParseCommand(&stream, "common") /*Read == "common"*/)
       {
         Parse_bool(tc, "Bold=",        m_Charset.bold);
         Parse_bool(tc, "Italic=",      m_Charset.italic);
@@ -169,7 +169,7 @@
         // Constant for now... Should be read from the font file
         m_Charset.NumChar = 256;
       }
-      else if (ParseCommand(&Stream, "char"))
+      else if (ParseCommand(&stream, "char"))
       {
 
         unsigned short CharID = 0;
@@ -187,14 +187,14 @@
         Parse_s16(tc, "abcC=", m_Charset.Chars[CharID].abcC);
         Parse_u16(tc, "page=", m_Charset.Chars[CharID].page);
       }
-      else if ( ParseCommand(&Stream, "Kerning"))
+      else if ( ParseCommand(&stream, "Kerning"))
       {
         Parse_u16(tc, "count=", m_Charset.NumKerningPairs);
 
         if (m_Charset.NumKerningPairs > 0)
           m_Charset.Kerning = new KerningPair[m_Charset.NumKerningPairs];
       }
-      else if ( ParseCommand(&Stream, "KerningPair"))
+      else if ( ParseCommand(&stream, "KerningPair"))
       {
         if (KerningIndex < m_Charset.NumKerningPairs)
         {
@@ -204,11 +204,11 @@
           KerningIndex++;
         }
       }
-      else if ( ParseCommand(&Stream, "Texture"))
+      else if ( ParseCommand(&stream, "Texture"))
       {
         char texture[256];
 
-        if (ParseLine(&Stream, texture, 256))
+        if (ParseLine(&stream, texture, 256))
         {
 //                 FilePath FontPath;
 //                 FontPath.AddSearchPath(""); // for case where fully qualified path is given

=== modified file 'NuxGraphics/GLTextureResourceManager.cpp'
--- NuxGraphics/GLTextureResourceManager.cpp	2012-02-18 21:32:06 +0000
+++ NuxGraphics/GLTextureResourceManager.cpp	2012-06-09 05:28:20 +0000
@@ -828,7 +828,7 @@
     return ret;
   }
 
-  void TextureVolume::GetData(void* Buffer, int MipIndex, int StrideY, int slice)
+  void TextureVolume::GetData(void* Buffer, int MipIndex, int StrideY, int face)
   {
     BYTE               *Dest        = (BYTE *) Buffer;
 //     const BYTE*         Src         = _image.GetSurface(MipIndex, slice).GetPtrRawData();

=== modified file 'tools/unity_support_test.c'
--- tools/unity_support_test.c	2012-01-05 16:56:56 +0000
+++ tools/unity_support_test.c	2012-06-09 05:28:20 +0000
@@ -845,7 +845,7 @@
 
   // drop result file
   if (results.result != 5) {
-    sprintf(resultfilename, "/tmp/unity_support_test.%i", results.result);
+    snprintf(resultfilename, sizeof(resultfilename), "/tmp/unity_support_test.%i", results.result);
     resultfile = open(resultfilename, O_CREAT|O_WRONLY|O_EXCL, 0666);
     if (resultfile > 0)
       close(resultfile);