Changeset 3192 for trunk/src/kmk/dir-nt-bird.c

Timestamp:

Mar 26, 2018, 10:25:56 PM (7 years ago)

Author:

bird

Message:

kmkbuiltin: funnel output thru output.c (usually via err.c).

File:

• trunk/src/kmk/dir-nt-bird.c (modified) (5 diffs)

trunk/src/kmk/dir-nt-bird.c

@@ -40 +40 @@
 #endif
 #include <assert.h>
+#include "kmkbuiltin.h"
+#include "kmkbuiltin/err.h"
 
 #include "nt_fullpath.h" /* for the time being - will be implemented here later on. */
@@ -730 +732 @@
 
 
-int kmk_builtin_dircache(int argc, char **argv, char **envp)
+int kmk_builtin_dircache(int argc, char **argv, char **envp, PKMKBUILTINCTX pCtx)
 {
     assert(GetCurrentThreadId() == g_idMainThread);
@@ -743 +745 @@
                 return 0;
             }
-            fprintf(stderr, "kmk_builtin_dircache: the 'invalidate' command takes no arguments!\n");
+            errx(pCtx, 2, "the 'invalidate' command takes no arguments!\n");
         }
         else if (strcmp(pszCmd, "invalidate-missing") == 0)
@@ -752 +754 @@
                 return 0;
             }
-            fprintf(stderr, "kmk_builtin_dircache: the 'invalidate-missing' command takes no arguments!\n");
+            errx(pCtx, 2, "the 'invalidate-missing' command takes no arguments!\n");
         }
         else if (strcmp(pszCmd, "volatile") == 0)
@@ -769 +771 @@
         }
         else
-            fprintf(stderr, "kmk_builtin_dircache: Invalid command '%s'!\n", pszCmd);
-    }
-    else
-        fprintf(stderr, "kmk_builtin_dircache: No command given!\n");
+            errx(pCtx, 2, "Invalid command '%s'!\n", pszCmd);
+    }
+    else
+        errx(pCtx, 2, "No command given!\n");
 
     K_NOREF(envp);