cmdline: print error after usage and before fatal
authorRobert Swiecki <robert@swiecki.net>
Tue, 26 Sep 2017 22:47:57 +0000 (00:47 +0200)
committerRobert Swiecki <robert@swiecki.net>
Tue, 26 Sep 2017 22:47:57 +0000 (00:47 +0200)
cmdline.c
contain.h

index fdf64f414cde6de6724a1b6141471f699f97ec7b..516867dfc0f33b4dbf9f3c1ed6b57546a390d52f 100644 (file)
--- a/cmdline.c
+++ b/cmdline.c
@@ -824,8 +824,8 @@ bool cmdlineParse(int argc, char *argv[], struct nsjconf_t * nsjconf)
                nsjconf->argv = &argv[optind];
        }
        if (nsjconf->argv == NULL || nsjconf->argv[0] == NULL) {
-               LOG_E("No command provided");
                cmdlineUsage(argv[0]);
+               LOG_E("No command provided");
                return false;
        }
        if (nsjconf->exec_file == NULL) {
index 31c871484107992321a32c756444e3330d0f3d7d..edba108cc362850dd01c305132d0457356fea549 100644 (file)
--- a/contain.h
+++ b/contain.h
@@ -26,7 +26,7 @@
 
 #include "common.h"
 
-bool containSetupFD(struct nsjconf_t * nsjconf, int fd_in, int fd_out, int fd_err);
+bool containSetupFD(struct nsjconf_t *nsjconf, int fd_in, int fd_out, int fd_err);
 bool containContain(struct nsjconf_t *nsjconf);
 
 #endif                         /* NS_CONTAIN_H */