Changeset 3167 for trunk/src/kDepPre/kDepPre.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/kDepPre/kDepPre.c (modified) (6 diffs)

trunk/src/kDepPre/kDepPre.c

@@ -56 +56 @@
  * @returns 0 on success.
  * @returns 1 or other approriate exit code on failure.
+ * @param   pThis       Pointer to the 'dep' instance.
  * @param   pInput      Input stream. (probably not seekable)
  */
-static int ParseCPrecompiler(FILE *pInput)
+static int ParseCPrecompiler(PDEPGLOBALS pThis, FILE *pInput)
 {
     enum
@@ -186 +187 @@
                             ||  pDep->cchFilename != cchFilename
                             ||  memcmp(pDep->szFilename, szBuf, cchFilename))
-                            pDep = depAdd(szBuf, cchFilename);
+                            pDep = depAdd(pThis, szBuf, cchFilename);
                         break;
                     }
@@ -225 +226 @@
 {
     int         i;
+    DEPGLOBALS  This;
 
     /* Arguments. */
@@ -450 +452 @@
      * Do the parsing.
      */
-    i = ParseCPrecompiler(pInput);
+    depInit(&This);
+    i = ParseCPrecompiler(&This, pInput);
 
     /*
@@ -465 +468 @@
     if (!i)
     {
-        depOptimize(fFixCase, 0 /* fQuiet */, NULL /*pszIgnoredExt*/);
+        depOptimize(&This, fFixCase, 0 /* fQuiet */, NULL /*pszIgnoredExt*/);
         fprintf(pOutput, "%s:", pszTarget);
-        depPrint(pOutput);
+        depPrint(&This, pOutput);
         if (fStubs)
-            depPrintStubs(pOutput);
+            depPrintStubs(&This, pOutput);
     }
 
@@ -487 +490 @@
     }
 
+    depCleanup(&This);
+
     return i;
 }