Compilation fixes for Windows for new string implementation.

4 files changed, 14 insertions, 10 deletions

diff --git a/src/definition.cpp b/src/definition.cpp
index 4a8c65d..4491bc4 100644
--- a/src/definition.cpp
+++ b/src/definition.cpp
@@ -896,11 +896,11 @@ QCString Definition::getSourceAnchor() const
   {
     if (Htags::useHtags)
     {
-      snprintf(anchorStr,maxAnchorStrLen,"L%d",m_impl->body->startLine);
+      qsnprintf(anchorStr,maxAnchorStrLen,"L%d",m_impl->body->startLine);
     }
     else
     {
-      snprintf(anchorStr,maxAnchorStrLen,"l%05d",m_impl->body->startLine);
+      qsnprintf(anchorStr,maxAnchorStrLen,"l%05d",m_impl->body->startLine);
     }
   }
   return anchorStr;
@@ -1166,7 +1166,7 @@ void Definition::_writeSourceRefList(OutputList &ol,const char *scopeName,
           }
           const int maxLineNrStr = 10;
           char anchorStr[maxLineNrStr];
-          snprintf(anchorStr,maxLineNrStr,"l%05d",md->getStartBodyLine());
+          qsnprintf(anchorStr,maxLineNrStr,"l%05d",md->getStartBodyLine());
           //printf("Write object link to %s\n",md->getBodyDef()->getSourceFileBase().data());
           ol.writeObjectLink(0,md->getBodyDef()->getSourceFileBase(),anchorStr,name);
           ol.popGeneratorState();
diff --git a/src/htmlgen.cpp b/src/htmlgen.cpp
index b459446..1ee3c16 100644
--- a/src/htmlgen.cpp
+++ b/src/htmlgen.cpp
@@ -1311,8 +1311,8 @@ void HtmlCodeGenerator::writeLineNumber(const char *ref,const char *filename,
   const int maxLineNrStr = 10;
   char lineNumber[maxLineNrStr];
   char lineAnchor[maxLineNrStr];
-  snprintf(lineNumber,maxLineNrStr,"%5d",l);
-  snprintf(lineAnchor,maxLineNrStr,"l%05d",l);
+  qsnprintf(lineNumber,maxLineNrStr,"%5d",l);
+  qsnprintf(lineAnchor,maxLineNrStr,"l%05d",l);
 
   m_t << "<div class=\"line\">";
   m_t << "<a name=\"" << lineAnchor << "\"></a><span class=\"lineno\">"; 
diff --git a/src/tclscanner.l b/src/tclscanner.l
index 88e3d1d..f162637 100644
--- a/src/tclscanner.l
+++ b/src/tclscanner.l
@@ -2833,14 +2833,18 @@ tcl_inf("TCL_SUBST: use '%s'\n",s);
     }
   }
 
-  if (tcl.input_string.at(tcl.input_string.length()-1) == '\n') 
+  if (tcl.input_string.at(tcl.input_string.length()-1) == 0x1A)
+  {
+  }
+  else if (tcl.input_string.at(tcl.input_string.length()-1) == '\n')
   {
     tcl.input_string[tcl.input_string.length()-1] = 0x1A;
-  } 
-  else 
+  }
+  else
   {
     tcl.input_string += 0x1A;
   }
+
   tcl.code = NULL;
   tcl.code_font=NULL;
   tcl.code_line=1;
diff --git a/src/util.cpp b/src/util.cpp
index 666fd04..bc39cfb 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -266,7 +266,7 @@ QCString generateMarker(int id)
 {
   const int maxMarkerStrLen = 20;
   char result[maxMarkerStrLen];
-  snprintf(result,maxMarkerStrLen,"@%d",id);
+  qsnprintf(result,maxMarkerStrLen,"@%d",id);
   return result;
 }
 
@@ -4916,7 +4916,7 @@ FileDef *findFileDef(const FileNameDict *fnDict,const char *n,bool &ambig)
 
   const int maxAddrSize = 20;
   char addr[maxAddrSize];
-  snprintf(addr,maxAddrSize,"%p:",fnDict);
+  qsnprintf(addr,maxAddrSize,"%p:",fnDict);
   QCString key = addr;
   key+=n;