osl_update_object(): Honor OSL_DONT_FREE.

[osl.git] / fsck.c

diff --git a/fsck.c b/fsck.c
index 84e624d7981a822efa923d9b1ffcfd83a2f672fd..ce8f1dc704c6c335f356233284a85093b11ddcad 100644 (file)
--- a/fsck.c
+++ b/fsck.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2007-2009 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -18,13 +18,12 @@
 #include "osl_core.h"
 #include "fsck.cmdline.h"
 
-/** version text used by various commands if -V switch was given */
-#define VERSION_TEXT(prefix) "osl_" prefix " " VERSION " " "\n" \
+#define VERSION_TEXT(prefix) "osl" prefix " " VERSION " " "\n" \
        "Copyright (C) 2008-2009 Andre Noll\n" \
        "This is free software with ABSOLUTELY NO WARRANTY." \
        " See COPYING for details.\n" \
        "Written by Andre Noll.\n" \
-       "Report bugs to <maan@systemlinux.org>.\n"
+       "Report bugs to <maan@tuebingen.mpg.de>.\n"
 
 /** print out \p VERSION_TEXT and exit if version flag was given */
 #define HANDLE_VERSION_FLAG(_prefix, _args_info_struct) \
@@ -51,7 +50,7 @@ enum {
 };
 #undef FSCK_ERROR
 #define FSCK_ERROR(num, txt) txt
-const char const *fsck_errors[] = {
+static const char *fsck_errors[] = {
        FSCK_ERRORS
 };
 
@@ -65,7 +64,7 @@ static const char *fsck_strerror(int num)
 extern int loglevel;
 
 /* taken from git */
-signed char hexval_table[256] = {
+static signed char hexval_table[256] = {
         -1, -1, -1, -1, -1, -1, -1, -1,                /* 00-07 */
         -1, -1, -1, -1, -1, -1, -1, -1,                /* 08-0f */
         -1, -1, -1, -1, -1, -1, -1, -1,                /* 10-17 */
@@ -100,7 +99,7 @@ signed char hexval_table[256] = {
         -1, -1, -1, -1, -1, -1, -1, -1,                /* f8-ff */
 };
 
-int asc_to_hash(const char *asc_hash, int len, HASH_TYPE *hash)
+static int asc_to_hash(const char *asc_hash, int len, HASH_TYPE *hash)
 {
        int i = 0;
        const unsigned char *asc = (const unsigned char *) asc_hash;
@@ -758,7 +757,7 @@ static int dummy_compare(const struct osl_object *obj1, const struct osl_object
 
 static unsigned files_pruned;
 
-int prune_disk_storage_file(const char *path, void *private_data)
+static int prune_disk_storage_file(const char *path, void *private_data)
 {
        HASH_TYPE hash[HASH_SIZE];
        uint8_t flags = *(uint8_t *)private_data;
@@ -930,7 +929,7 @@ static void fsck_cleanup(struct osl_table *t)
 
 #define ST_CASE(st) case st: return #st
 
-const char *get_asc_storage_type(enum osl_storage_type st)
+static const char *get_asc_storage_type(enum osl_storage_type st)
 {
        switch (st) {
                ST_CASE(OSL_MAPPED_STORAGE);
@@ -945,7 +944,7 @@ const char *get_asc_storage_type(enum osl_storage_type st)
        else str = fsck_strdup(#flag); }} while (0)
 
 
-char *get_asc_storage_flags(enum osl_storage_type sf)
+static char *get_asc_storage_flags(enum osl_storage_type sf)
 {
        char *asc_sf = NULL;