Don't let make write the filename into the output

[paraslash.git] / fsck.c

diff --git a/fsck.c b/fsck.c
index ee7f4ee..3b605c2 100644 (file)
--- a/fsck.c
+++ b/fsck.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (C) 1997-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2009 Andre Noll <maan@systemlinux.org>

  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */


@@ -19,7 +19,9 @@
 static struct fsck_args_info conf;
 
 INIT_FSCK_ERRLISTS;
 static struct fsck_args_info conf;
 
 INIT_FSCK_ERRLISTS;

-INIT_STDERR_LOGGING(conf.loglevel_arg);
+
+static int loglevel;
+INIT_STDERR_LOGGING(loglevel);

 
 /* taken from git */
 signed char hexval_table[256] = {
 
 /* taken from git */
 signed char hexval_table[256] = {


@@ -936,6 +938,14 @@ static int check_all_tables(char *base_dir)
        return ret;
 }
 
        return ret;
 }
 

+/**
+ * The praslash database check program.
+ *
+ * \param argc Usual arg count.
+ * \param argv Usual arg vector.
+ *
+ * \return \p EXIT_SUCCESS or \p EXIT_FAILURE.
+ */

 int main(int argc, char **argv)
 {
        int i, ret;
 int main(int argc, char **argv)
 {
        int i, ret;


@@ -947,6 +957,7 @@ int main(int argc, char **argv)
                goto out;
        }
        HANDLE_VERSION_FLAG("fsck", conf);
                goto out;
        }
        HANDLE_VERSION_FLAG("fsck", conf);

+       loglevel = get_loglevel_by_name(conf.loglevel_arg);

        if (conf.base_dir_given)
                base_dir = para_strdup(conf.base_dir_arg);
        else {
        if (conf.base_dir_given)
                base_dir = para_strdup(conf.base_dir_arg);
        else {


@@ -970,9 +981,6 @@ out:
                        base_dir? base_dir : "",
                        para_strerror(-ret)
                );
                        base_dir? base_dir : "",
                        para_strerror(-ret)
                );

-               if (conf.loglevel_arg > 1)
-                       PARA_EMERG_LOG("re-run with \"--loglevel %d\" to increase verbosity\n",
-                               conf.loglevel_arg - 1);

        } else
                PARA_NOTICE_LOG("success\n");
        if (base_dir)
        } else
                PARA_NOTICE_LOG("success\n");
        if (base_dir)