From f10ab2e1a3d9616fc00d3ccf2323dd4fc05d8bed Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Sun, 31 May 2015 10:19:16 -0500 Subject: [PATCH] Make some declarations formatted the same as the definitions --- include/wimlib/blob_table.h | 6 ++---- include/wimlib/dentry.h | 21 +++++++++------------ include/wimlib/inode.h | 8 ++++---- src/dentry.c | 4 ++-- 4 files changed, 17 insertions(+), 22 deletions(-) diff --git a/include/wimlib/blob_table.h b/include/wimlib/blob_table.h index ee1cd0fa..c5295820 100644 --- a/include/wimlib/blob_table.h +++ b/include/wimlib/blob_table.h @@ -341,8 +341,7 @@ blob_to_wimlib_resource_entry(const struct blob_descriptor *blob, struct wimlib_resource_entry *wentry); extern int -sort_blob_list(struct list_head *blob_list, - size_t list_head_offset, +sort_blob_list(struct list_head *blob_list, size_t list_head_offset, int (*compar)(const void *, const void*)); extern int @@ -402,8 +401,7 @@ after_blob_hashed(struct blob_descriptor *blob, struct blob_table *blob_table); extern int -hash_unhashed_blob(struct blob_descriptor *blob, - struct blob_table *blob_table, +hash_unhashed_blob(struct blob_descriptor *blob, struct blob_table *blob_table, struct blob_descriptor **blob_ret); extern struct blob_descriptor ** diff --git a/include/wimlib/dentry.h b/include/wimlib/dentry.h index ad4e73ec..3e78a861 100644 --- a/include/wimlib/dentry.h +++ b/include/wimlib/dentry.h @@ -132,8 +132,7 @@ dentry_out_total_length(const struct wim_dentry *dentry); extern int for_dentry_in_tree(struct wim_dentry *root, - int (*visitor)(struct wim_dentry*, void*), - void *args); + int (*visitor)(struct wim_dentry *, void *), void *args); /* Iterate through each @child dentry of the @dir directory inode, * in sorted order by case sensitive name. */ @@ -182,19 +181,17 @@ extern void calculate_subdir_offsets(struct wim_dentry *root, u64 *subdir_offset_p); extern int -dentry_set_name(struct wim_dentry *dentry, const tchar *new_name); +dentry_set_name(struct wim_dentry *dentry, const tchar *name); extern int -dentry_set_name_utf16le(struct wim_dentry *dentry, const utf16lechar *new_name, - size_t new_name_nbytes); +dentry_set_name_utf16le(struct wim_dentry *dentry, const utf16lechar *name, + size_t name_nbytes); extern struct wim_dentry * -get_dentry(struct WIMStruct *wim, const tchar *path, - CASE_SENSITIVITY_TYPE case_type); +get_dentry(WIMStruct *wim, const tchar *path, CASE_SENSITIVITY_TYPE case_type); extern struct wim_dentry * -get_dentry_child_with_name(const struct wim_dentry *dentry, - const tchar *name, +get_dentry_child_with_name(const struct wim_dentry *dentry, const tchar *name, CASE_SENSITIVITY_TYPE case_type); extern struct wim_dentry * @@ -204,7 +201,7 @@ get_dentry_child_with_utf16le_name(const struct wim_dentry *dentry, CASE_SENSITIVITY_TYPE case_type); extern struct wim_dentry * -get_parent_dentry(struct WIMStruct *wim, const tchar *path, +get_parent_dentry(WIMStruct *wim, const tchar *path, CASE_SENSITIVITY_TYPE case_type); extern int @@ -231,8 +228,7 @@ extern void free_dentry(struct wim_dentry *dentry); extern void -free_dentry_tree(struct wim_dentry *root, - struct blob_table *blob_table); +free_dentry_tree(struct wim_dentry *root, struct blob_table *blob_table); extern void unlink_dentry(struct wim_dentry *dentry); @@ -284,4 +280,5 @@ dentry_has_short_name(const struct wim_dentry *dentry) { return dentry->d_short_name_nbytes != 0; } + #endif /* _WIMLIB_DENTRY_H */ diff --git a/include/wimlib/inode.h b/include/wimlib/inode.h index 00cd7f1a..07d1885f 100644 --- a/include/wimlib/inode.h +++ b/include/wimlib/inode.h @@ -359,8 +359,8 @@ inode_replace_stream_data(struct wim_inode *inode, struct blob_table *blob_table); extern bool -inode_add_stream_with_data(struct wim_inode *inode, int stream_type, - const utf16lechar *stream_name, +inode_add_stream_with_data(struct wim_inode *inode, + int stream_type, const utf16lechar *stream_name, const void *data, size_t size, struct blob_table *blob_table); @@ -397,8 +397,8 @@ extern bool inode_has_named_data_stream(const struct wim_inode *inode); extern int -inode_resolve_streams(struct wim_inode *inode, - struct blob_table *table, bool force); +inode_resolve_streams(struct wim_inode *inode, struct blob_table *table, + bool force); extern int blob_not_found_error(const struct wim_inode *inode, const u8 *hash); diff --git a/src/dentry.c b/src/dentry.c index 49c0cdf1..a45bdf89 100644 --- a/src/dentry.c +++ b/src/dentry.c @@ -666,10 +666,10 @@ struct wim_dentry * get_dentry_child_with_utf16le_name(const struct wim_dentry *dentry, const utf16lechar *name, size_t name_nbytes, - CASE_SENSITIVITY_TYPE case_ctype) + CASE_SENSITIVITY_TYPE case_type) { const struct wim_inode *dir = dentry->d_inode; - bool ignore_case = will_ignore_case(case_ctype); + bool ignore_case = will_ignore_case(case_type); struct wim_dentry dummy; struct wim_dentry *child; -- 2.43.0