Second Life viewer sources 1.14.0.0

1 files changed, 3 insertions, 4 deletions

diff --git a/linden/indra/llinventory/llnotecard.cpp b/linden/indra/llinventory/llnotecard.cpp
index 5f48f0e..d40cabb 100644
--- a/linden/indra/llinventory/llnotecard.cpp
+++ b/linden/indra/llinventory/llnotecard.cpp
@@ -26,11 +26,10 @@
  */
 
 #include "linden_common.h"
-#include "llinventory.h"
 #include "llnotecard.h"
 #include "llstreamtools.h"
 
-LLNotecard::LLNotecard(U32 max_text)
+LLNotecard::LLNotecard(S32 max_text)
 : mMaxText(max_text)
 {
 }
@@ -189,7 +188,7 @@ bool LLNotecard::importStream(std::istream& str)
                 return FALSE;
         }
 
-        char line_buf[STD_STRING_BUF_SIZE];
+        char line_buf[STD_STRING_BUF_SIZE];     /* Flawfinder: ignore */
         str.getline(line_buf, STD_STRING_BUF_SIZE);
         if(str.fail())
         {
@@ -198,7 +197,7 @@ bool LLNotecard::importStream(std::istream& str)
         }
         line_buf[STD_STRING_STR_LEN] = '\0';
         
-        U32 text_len = 0;
+        S32 text_len = 0;
         if( 1 != sscanf(line_buf, "Text length %d", &text_len) )
         {
                 llwarns << "Invalid Linden text length field" << llendl;