Changeset 3167 for trunk/src/kObjCache/kObjCache.c

Timestamp:

Mar 20, 2018, 10:47:25 PM (7 years ago)

Author:

bird

Message:

kDep*: no globals; dir-nt-bird.c: only main thread

File:

• trunk/src/kObjCache/kObjCache.c (modified) (7 diffs)

trunk/src/kObjCache/kObjCache.c

@@ -807 +807 @@
     /** The current dependency file. */
     PDEP pCurDep;
+    /** The core dependency collector state. */
+    DEPGLOBALS Core;
 } KOCDEP;
 /** Pointer to a KOCDEP.  */
@@ -824 +826 @@
     pDepState->pszFilename = NULL;
     pDepState->pCurDep = NULL;
+    depInit(&pDepState->Core);
 }
 
@@ -837 +840 @@
     free(pDepState->pszFilename);
     pDepState->pszFilename = NULL;
-    depCleanup();
+    depCleanup(&pDepState->Core);
 }
 
@@ -908 +911 @@
         || cchFilename != pDepState->pCurDep->cchFilename
         || strcmp(pDepState->pszFilename, pDepState->pCurDep->szFilename))
-        pDepState->pCurDep = depAdd(pDepState->pszFilename, cchFilename);
+        pDepState->pCurDep = depAdd(&pDepState->Core, pDepState->pszFilename, cchFilename);
 }
 
@@ -1070 +1073 @@
                             || cchFilename != pDepState->pCurDep->cchFilename
                             || strcmp(pDepState->pszFilename, pDepState->pCurDep->szFilename))
-                            pDepState->pCurDep = depAdd(pDepState->pszFilename, cchFilename);
+                            pDepState->pCurDep = depAdd(&pDepState->Core, pDepState->pszFilename, cchFilename);
                         pDepState->offFilename = 0;
                         break;
@@ -1112 +1115 @@
         FatalMsg("Failed to open dependency file '%s': %s\n", pszFilename, strerror(errno));
 
-    depOptimize(fFixCase, fQuiet, NULL /*pszIgnoredExt*/);
+    depOptimize(&pDepState->Core, fFixCase, fQuiet, NULL /*pszIgnoredExt*/);
 
     /* Make object file name with unix slashes. */
@@ -1122 +1125 @@
     fprintf(pFile, "%s:", pszObjFileAbs);
     free(pszObjFileAbs);
-    depPrint(pFile);
+    depPrint(&pDepState->Core, pFile);
     if (fGenStubs)
-        depPrintStubs(pFile);
+        depPrintStubs(&pDepState->Core, pFile);
 
     if (fclose(pFile) != 0)