2 files changed, 22 insertions, 18 deletions
diff --git a/tools/render-test/shader-input-layout.cpp b/tools/render-test/shader-input-layout.cpp
index 6ded388e8..6c6f67c86 100644
--- a/tools/render-test/shader-input-layout.cpp
+++ b/tools/render-test/shader-input-layout.cpp
@@ -273,17 +273,17 @@ namespace renderer_test
                                     SlangScalarType scalarType = _getScalarType(type.getUnownedSlice());
                                     if (scalarType == SLANG_SCALAR_TYPE_NONE)
                                     {
-                                        StringBuilder builder;
+                                        StringBuilder scalarTypeNames;
                                         for (const auto& info : g_scalarTypeInfos)
                                         {
-                                            if (builder.getLength() != 0)
+                                            if (scalarTypeNames.getLength() != 0)
                                             {
-                                                builder << ", ";
+                                                scalarTypeNames << ", ";
                                             }
-                                            builder << info.name;
+                                            scalarTypeNames << info.name;
                                         }
 
-                                        throw TextFormatException("Expecting " + builder + " " + parser.NextToken().Position.Line);
+                                        throw TextFormatException(StringBuilder() << "Expecting " << scalarTypeNames << " " << parser.NextToken().Position.Line);
                                     }
 
                                     parser.Read(",");
@@ -549,7 +549,7 @@ namespace renderer_test
                                     Token nameToken = parser.ReadToken();
                                     if (nameToken.Type != TokenType::Identifier)
                                     {
-                                        throw TextFormatException(String("Invalid input syntax at line ") + parser.NextToken().Position.Line);
+                                        throw TextFormatException(StringBuilder() << "Invalid input syntax at line " << parser.NextToken().Position.Line);
                                     }
                                     builder << nameToken.Content;
 
@@ -580,7 +580,7 @@ namespace renderer_test
                                         }
                                         else
                                         {
-                                            throw TextFormatException(String("Invalid input syntax at line ") + parser.NextToken().Position.Line);
+                                            throw TextFormatException(StringBuilder() << "Invalid input syntax at line " << parser.NextToken().Position.Line);
                                         }
                                     }
 
@@ -606,7 +606,9 @@ namespace renderer_test
                 }
                 catch (const TextFormatException&)
                 {
-                    throw TextFormatException(String("Invalid input syntax at line ") + parser.NextToken().Position.Line);
+                    StringBuilder msg;
+                    msg << "Invalid input syntax at line " << parser.NextToken().Position.Line;
+                    throw TextFormatException(msg);
                 }
             }
         }
diff --git a/tools/slang-generate/main.cpp b/tools/slang-generate/main.cpp
index 700c1bb21..796bbd59d 100644
--- a/tools/slang-generate/main.cpp
+++ b/tools/slang-generate/main.cpp
@@ -690,37 +690,39 @@ void usage(char const* appName)
     fprintf(stderr, "usage: %s <input>\n", appName);
 }
 
-SlangResult readAllText(char const * fileName, String& stringOut)
+SlangResult readAllText(char const * fileName, String& outString)
 {
-    FILE * f;
+    FILE* f;
     fopen_s(&f, fileName, "rb");
     if (!f)
     {
-        stringOut = "";
+        outString = "";
         return SLANG_FAIL;
     }
     else
     {
-        stringOut = 
         fseek(f, 0, SEEK_END);
         auto size = ftell(f);
 
         StringRepresentation* stringRep = StringRepresentation::createWithCapacityAndLength(size, size);
-        stringOut = String(stringRep);
+        outString = String(stringRep);
+
+        char* buffer = stringRep->getData();
+
+        // Seems unnecessary
+        //memset(buffer, 0, size);
 
-        char * buffer = stringRep->getData();
-        memset(buffer, 0, size);
         fseek(f, 0, SEEK_SET);
-        fread(buffer, sizeof(char), size, f);
+        size_t readCount = fread(buffer, sizeof(char), size, f);
         fclose(f);
 
-        return SLANG_OK;
+        return (readCount == size) ? SLANG_OK : SLANG_FAIL;
     }
 }
 
 void writeAllText(char const *srcFileName, char const* fileName, const char* content)
 {
-    FILE * f = nullptr;
+    FILE* f = nullptr;
     fopen_s(&f, fileName, "wb");
     if (!f)
     {