Compiler stuff

[wimlib] / src / dentry.c

diff --git a/src/dentry.c b/src/dentry.c
index 6e13d3d697838ca681bd92b35ffd2b6e3763ac02..88e279925f4abe5c250b39010c6271fe2ef90184 100644 (file)
--- a/src/dentry.c
+++ b/src/dentry.c
@@ -26,18 +26,27 @@
  * wimlib; if not, see http://www.gnu.org/licenses/.
  */
 
-#include "buffer_io.h"
-#include "dentry.h"
-#include "lookup_table.h"
-#include "timestamp.h"
-#include "wimlib_internal.h"
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
+#include "wimlib.h"
+#include "wimlib/buffer_io.h"
+#include "wimlib/dentry.h"
+#include "wimlib/encoding.h"
+#include "wimlib/error.h"
+#include "wimlib/lookup_table.h"
+#include "wimlib/metadata.h"
+#include "wimlib/resource.h"
+#include "wimlib/timestamp.h"
+
 #include <errno.h>
 
 /* Calculates the unaligned length, in bytes, of an on-disk WIM dentry that has
  * a file name and short name that take the specified numbers of bytes.  This
  * excludes any alternate data stream entries that may follow the dentry. */
 static u64
-__dentry_correct_length_unaligned(u16 file_name_nbytes, u16 short_name_nbytes)
+_dentry_correct_length_unaligned(u16 file_name_nbytes, u16 short_name_nbytes)
 {
        u64 length = WIM_DENTRY_DISK_SIZE;
        if (file_name_nbytes)
@@ -54,7 +63,7 @@ __dentry_correct_length_unaligned(u16 file_name_nbytes, u16 short_name_nbytes)
 static u64
 dentry_correct_length_unaligned(const struct wim_dentry *dentry)
 {
-       return __dentry_correct_length_unaligned(dentry->file_name_nbytes,
+       return _dentry_correct_length_unaligned(dentry->file_name_nbytes,
                                                 dentry->short_name_nbytes);
 }
 
@@ -146,7 +155,7 @@ ads_entry_total_length(const struct wim_ads_entry *entry)
 
 
 static u64
-__dentry_total_length(const struct wim_dentry *dentry, u64 length)
+_dentry_total_length(const struct wim_dentry *dentry, u64 length)
 {
        const struct wim_inode *inode = dentry->d_inode;
        for (u16 i = 0; i < inode->i_num_ads; i++)
@@ -159,7 +168,7 @@ __dentry_total_length(const struct wim_dentry *dentry, u64 length)
 u64
 dentry_correct_total_length(const struct wim_dentry *dentry)
 {
-       return __dentry_total_length(dentry,
+       return _dentry_total_length(dentry,
                                     dentry_correct_length_unaligned(dentry));
 }
 
@@ -168,7 +177,7 @@ dentry_correct_total_length(const struct wim_dentry *dentry)
 static u64
 dentry_total_length(const struct wim_dentry *dentry)
 {
-       return __dentry_total_length(dentry, dentry->length);
+       return _dentry_total_length(dentry, dentry->length);
 }
 
 int
@@ -713,7 +722,7 @@ dentry_common_init(struct wim_dentry *dentry)
 }
 
 struct wim_inode *
-new_timeless_inode()
+new_timeless_inode(void)
 {
        struct wim_inode *inode = CALLOC(1, sizeof(struct wim_inode));
        if (inode) {
@@ -735,7 +744,7 @@ new_timeless_inode()
 }
 
 static struct wim_inode *
-new_inode()
+new_inode(void)
 {
        struct wim_inode *inode = new_timeless_inode();
        if (inode) {
@@ -773,7 +782,7 @@ new_dentry(const tchar *name, struct wim_dentry **dentry_ret)
 
 
 static int
-__new_dentry_with_inode(const tchar *name, struct wim_dentry **dentry_ret,
+_new_dentry_with_inode(const tchar *name, struct wim_dentry **dentry_ret,
                        bool timeless)
 {
        struct wim_dentry *dentry;
@@ -800,13 +809,13 @@ __new_dentry_with_inode(const tchar *name, struct wim_dentry **dentry_ret,
 int
 new_dentry_with_timeless_inode(const tchar *name, struct wim_dentry **dentry_ret)
 {
-       return __new_dentry_with_inode(name, dentry_ret, true);
+       return _new_dentry_with_inode(name, dentry_ret, true);
 }
 
 int
 new_dentry_with_inode(const tchar *name, struct wim_dentry **dentry_ret)
 {
-       return __new_dentry_with_inode(name, dentry_ret, false);
+       return _new_dentry_with_inode(name, dentry_ret, false);
 }
 
 int
@@ -917,9 +926,9 @@ free_dentry(struct wim_dentry *dentry)
 /* This function is passed as an argument to for_dentry_in_tree_depth() in order
  * to free a directory tree. */
 static int
-do_free_dentry(struct wim_dentry *dentry, void *__lookup_table)
+do_free_dentry(struct wim_dentry *dentry, void *_lookup_table)
 {
-       struct wim_lookup_table *lookup_table = __lookup_table;
+       struct wim_lookup_table *lookup_table = _lookup_table;
        unsigned i;
 
        if (lookup_table) {
@@ -1587,7 +1596,7 @@ read_dentry(const u8 metadata_resource[], u64 metadata_resource_len,
         * The calculated length here is unaligned to allow for the possibility
         * that the dentry->length names an unaligned length, although this
         * would be unexpected. */
-       calculated_size = __dentry_correct_length_unaligned(file_name_nbytes,
+       calculated_size = _dentry_correct_length_unaligned(file_name_nbytes,
                                                            short_name_nbytes);
 
        if (dentry->length < calculated_size) {
@@ -1883,7 +1892,7 @@ write_dentry(const struct wim_dentry *dentry, u8 *p)
                }
                p = put_zeroes(p, (8 - (p - orig_p) % 8) % 8);
        }
-       wimlib_assert(p - orig_p == __dentry_total_length(dentry, length));
+       wimlib_assert(p - orig_p == _dentry_total_length(dentry, length));
        return p;
 }