development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-11-05 01:58:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

wrapper: reduce scope of remove_or_warn()

Browse source 
remove_or_warn() is only used by entry.c and apply.c, but it is
currently declared and defined in wrapper.{h,c}, so it has a scope much
greater than it needs. This needlessly large scope also causes wrapper.c
to need to include object.h, when this file is largely unconcerned with
Git objects.

Move remove_or_warn() to entry.{h,c}. The file apply.c still has access
to it, since it already includes entry.h for another reason.

Signed-off-by: Calvin Wan <calvinwan@google.com>
Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Calvin Wan 2023-09-29 14:20:49 -07:00 committed by Junio C Hamano
parent d88e8106e8
commit afd2a1d5f1
4 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
entry.c
View file

@ -581,3 +581,8 @@ void unlink_entry(const struct cache_entry *ce, const char *super_prefix)
return; return;
schedule_dir_for_removal(ce->name, ce_namelen(ce)); schedule_dir_for_removal(ce->name, ce_namelen(ce));
} }
int remove_or_warn(unsigned int mode, const char *file)
{
return S_ISGITLINK(mode) ? rmdir_or_warn(file) : unlink_or_warn(file);
}

6
entry.h
View file

@ -62,4 +62,10 @@ int fstat_checkout_output(int fd, const struct checkout *state, struct stat *st)
void update_ce_after_write(const struct checkout *state, struct cache_entry *ce, void update_ce_after_write(const struct checkout *state, struct cache_entry *ce,
struct stat *st); struct stat *st);
/*
* Calls the correct function out of {unlink,rmdir}_or_warn based on
* the supplied file mode.
*/
int remove_or_warn(unsigned int mode, const char *path);
#endif /* ENTRY_H */ #endif /* ENTRY_H */

6
wrapper.c
View file

@ -5,7 +5,6 @@
#include "abspath.h" #include "abspath.h"
#include "config.h" #include "config.h"
#include "gettext.h" #include "gettext.h"
#include "object.h"
#include "repository.h" #include "repository.h"
#include "strbuf.h" #include "strbuf.h"
#include "trace2.h" #include "trace2.h"
@ -632,11 +631,6 @@ int rmdir_or_warn(const char *file)
return warn_if_unremovable("rmdir", file, rmdir(file)); return warn_if_unremovable("rmdir", file, rmdir(file));
} }
int remove_or_warn(unsigned int mode, const char *file)
{
return S_ISGITLINK(mode) ? rmdir_or_warn(file) : unlink_or_warn(file);
}
static int access_error_is_ok(int err, unsigned flag) static int access_error_is_ok(int err, unsigned flag)
{ {
return (is_missing_file_error(err) || return (is_missing_file_error(err) ||

5
wrapper.h
View file

@ -106,11 +106,6 @@ int unlink_or_msg(const char *file, struct strbuf *err);
* not exist. * not exist.
*/ */
int rmdir_or_warn(const char *path); int rmdir_or_warn(const char *path);
/*
* Calls the correct function out of {unlink,rmdir}_or_warn based on
* the supplied file mode.
*/
int remove_or_warn(unsigned int mode, const char *path);
/* /*
* Call access(2), but warn for any error except "missing file" * Call access(2), but warn for any error except "missing file"