Changeset 3167 for trunk/src/lib

Timestamp:

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

Author:

bird

Message:

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

Location:

trunk/src/lib

Files:

• kDep.c (modified) (9 diffs)
• kDep.h (modified) (1 diff)

trunk/src/lib/kDep.c

@@ -73 +73 @@
 
 
-/*******************************************************************************
-*   Global Variables                                                           *
-*******************************************************************************/
-/** List of dependencies. */
-static PDEP g_pDeps = NULL;
+/**
+ * Initializes the dep instance.
+ *
+ * @param   pThis       The dep instance to init.
+ */
+void depInit(PDEPGLOBALS pThis)
+{
+    pThis->pDeps = NULL;
+}
+
+
+/**
+ * Cleans up the dep instance (frees resources).
+ *
+ * @param   pThis       The dep instance to cleanup.
+ */
+void depCleanup(PDEPGLOBALS pThis)
+{
+    PDEP pDep = pThis->pDeps;
+    pThis->pDeps = NULL;
+    while (pDep)
+    {
+        PDEP pFree = pDep;
+        pDep = pDep->pNext;
+        free(pFree);
+    }
+}
 
 
@@ -196 +218 @@
  * 'Optimizes' and corrects the dependencies.
  */
-void depOptimize(int fFixCase, int fQuiet, const char *pszIgnoredExt)
+void depOptimize(PDEPGLOBALS pThis, int fFixCase, int fQuiet, const char *pszIgnoredExt)
 {
     /*
@@ -202 +224 @@
      */
     size_t  cchIgnoredExt = pszIgnoredExt ? strlen(pszIgnoredExt) : 0;
-    PDEP    pDepOrg = g_pDeps;
-    PDEP    pDep = g_pDeps;
-    g_pDeps = NULL;
+    PDEP    pDepOrg = pThis->pDeps;
+    PDEP    pDep = pThis->pDeps;
+    pThis->pDeps = NULL;
     for (; pDep; pDep = pDep->pNext)
     {
@@ -287 +309 @@
          * Insert the corrected dependency.
          */
-        depAdd(pszFilename, strlen(pszFilename));
+        depAdd(pThis, pszFilename, strlen(pszFilename));
     }
 
@@ -305 +327 @@
  * Prints the dependency chain.
  *
- * @returns Pointer to the allocated dependency.
+ * @param   pThis       The 'dep' instance.
  * @param   pOutput     Output stream.
  */
-void depPrint(FILE *pOutput)
+void depPrint(PDEPGLOBALS pThis, FILE *pOutput)
 {
     PDEP pDep;
-    for (pDep = g_pDeps; pDep; pDep = pDep->pNext)
+    for (pDep = pThis->pDeps; pDep; pDep = pDep->pNext)
         fprintf(pOutput, " \\\n\t%s", pDep->szFilename);
     fprintf(pOutput, "\n\n");
@@ -319 +341 @@
 /**
  * Prints empty dependency stubs for all dependencies.
- */
-void depPrintStubs(FILE *pOutput)
+ *
+ * @param   pThis       The 'dep' instance.
+ * @param   pOutput     Output stream.
+ */
+void depPrintStubs(PDEPGLOBALS pThis, FILE *pOutput)
 {
     PDEP pDep;
-    for (pDep = g_pDeps; pDep; pDep = pDep->pNext)
+    for (pDep = pThis->pDeps; pDep; pDep = pDep->pNext)
         fprintf(pOutput, "%s:\n\n", pDep->szFilename);
 }
@@ -355 +380 @@
  *
  * @returns Pointer to the allocated dependency.
+ * @param   pThis       The 'dep' instance.
  * @param   pszFilename     The filename. Does not need to be terminated.
  * @param   cchFilename     The length of the filename.
  */
-PDEP depAdd(const char *pszFilename, size_t cchFilename)
+PDEP depAdd(PDEPGLOBALS pThis, const char *pszFilename, size_t cchFilename)
 {
     unsigned    uHash = sdbm(pszFilename, cchFilename);
@@ -368 +394 @@
      */
     pDepPrev = NULL;
-    for (pDep = g_pDeps; pDep; pDepPrev = pDep, pDep = pDep->pNext)
+    for (pDep = pThis->pDeps; pDep; pDepPrev = pDep, pDep = pDep->pNext)
         if (    pDep->uHash == uHash
             &&  pDep->cchFilename == cchFilename
@@ -397 +423 @@
     else
     {
-        pDep->pNext = g_pDeps;
-        g_pDeps = pDep;
+        pDep->pNext = pThis->pDeps;
+        pThis->pDeps = pDep;
     }
     return pDep;
-}
-
-
-/**
- * Frees the current dependency chain.
- */
-void depCleanup(void)
-{
-    PDEP pDep = g_pDeps;
-    g_pDeps = NULL;
-    while (pDep)
-    {
-        PDEP pFree = pDep;
-        pDep = pDep->pNext;
-        free(pFree);
-    }
 }
 

trunk/src/lib/kDep.h

@@ -46 +46 @@
 } DEP, *PDEP;
 
+typedef struct DEPGLOBALS
+{
+    /** List of dependencies. */
+    PDEP pDeps;
 
-extern PDEP depAdd(const char *pszFilename, size_t cchFilename);
-extern void depOptimize(int fFixCase, int fQuiet, const char *pszIgnoredExt);
-extern void depPrint(FILE *pOutput);
-extern void depPrintStubs(FILE *pOutput);
-extern void depCleanup(void);
+} DEPGLOBALS;
+typedef DEPGLOBALS *PDEPGLOBALS;
+
+extern void depInit(PDEPGLOBALS pThis);
+extern void depCleanup(PDEPGLOBALS pThis);
+extern PDEP depAdd(PDEPGLOBALS pThis, const char *pszFilename, size_t cchFilename);
+extern void depOptimize(PDEPGLOBALS pThis, int fFixCase, int fQuiet, const char *pszIgnoredExt);
+extern void depPrint(PDEPGLOBALS pThis, FILE *pOutput);
+extern void depPrintStubs(PDEPGLOBALS pThis, FILE *pOutput);
+
 extern void *depReadFileIntoMemory(FILE *pInput, size_t *pcbFile, void **ppvOpaque);
 extern void depFreeFileMemory(void *pvFile, void *pvOpaque);