X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=trace_write.cpp;h=4dfba8adeb0ece46dd1c8849842d84dee60cd278;hb=6467406c48d0ac71274100160002d37f74643af6;hp=f77a275524a611e76ceea8586806f3819bd45740;hpb=9a3984ee426e09de1a7588d0224574c97dba5d72;p=apitrace

diff --git a/trace_write.cpp b/trace_write.cpp
index f77a275..4dfba8a 100644
--- a/trace_write.cpp
+++ b/trace_write.cpp
@@ -44,7 +44,7 @@ namespace Trace {
 
 static gzFile g_gzFile = NULL;
 static void _Close(void) {
-    if(g_gzFile != NULL) {
+    if (g_gzFile != NULL) {
         gzclose(g_gzFile);
         g_gzFile = NULL;
     }
@@ -58,7 +58,7 @@ static void _Open(const char *szExtension) {
     char szFileName[PATH_MAX];
     const char *lpFileName;
 
-    lpFileName = getenv("TRACE_PATH");
+    lpFileName = getenv("TRACE_FILE");
     if (lpFileName) {
         strncpy(szFileName, lpFileName, PATH_MAX);
     }
@@ -77,7 +77,7 @@ static void _Open(const char *szExtension) {
                 snprintf(szFileName, PATH_MAX, "%s%c%s.%s", szCurrentDir, PATH_SEP, szProcessName, szExtension);
  
             file = fopen(szFileName, "rb");
-            if(file == NULL)
+            if (file == NULL)
                 break;
  
             fclose(file);
@@ -148,10 +148,6 @@ void Open(void) {
     }
 }
 
-void Close(void) {
-    _Close();
-}
-
 static unsigned call_no = 0;
 
 inline bool lookup(std::vector<bool> &map, size_t index) {
@@ -169,6 +165,15 @@ static std::vector<bool> enums;
 static std::vector<bool> bitmasks;
 
 
+void Close(void) {
+    _Close();
+    call_no = 0;
+    functions = std::vector<bool>();
+    structs = std::vector<bool>();
+    enums = std::vector<bool>();
+    bitmasks = std::vector<bool>();
+}
+
 unsigned BeginEnter(const FunctionSig &function) {
     OS::AcquireMutex();
     Open();
@@ -254,7 +259,7 @@ void LiteralFloat(float value) {
     WriteFloat(value);
 }
 
-void LiteralFloat(double value) {
+void LiteralDouble(double value) {
     WriteByte(Trace::TYPE_DOUBLE);
     WriteDouble(value);
 }