undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cocci & cache.h: apply pending "index_cache_pos" rule

Browse Source 
Apply the rule added in [1] to change "cache_name_pos" to
"index_name_pos", which allows us to get rid of another
"USE_THE_INDEX_COMPATIBILITY_MACROS" macro.

The replacement of "USE_THE_INDEX_COMPATIBILITY_MACROS" here with
"USE_THE_INDEX_VARIABLE" is a manual change on top, now that these
files only use "&the_index", and don't need any compatibility
macros (or functions).

1. 0e6550a2c6 (cocci: add a index-compatibility.pending.cocci,
   2022-11-19)

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ævar Arnfjörð Bjarmason 2023-02-10 11:28:36 +01:00 committed by Junio C Hamano
parent cec13b9514
commit babed893f5
5 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
builtin/mv.c
View File

@ -3,7 +3,7 @@
* *
* Copyright (C) 2006 Johannes Schindelin * Copyright (C) 2006 Johannes Schindelin
*/ */
#define USE_THE_INDEX_COMPATIBILITY_MACROS #define USE_THE_INDEX_VARIABLE
#include "builtin.h" #include "builtin.h"
#include "config.h" #include "config.h"
#include "pathspec.h" #include "pathspec.h"
@ -489,7 +489,8 @@ remove_entry:
if ((mode & SPARSE) && if ((mode & SPARSE) &&
path_in_sparse_checkout(dst, &the_index)) { path_in_sparse_checkout(dst, &the_index)) {
/* from out-of-cone to in-cone */ /* from out-of-cone to in-cone */
int dst_pos = cache_name_pos(dst, strlen(dst)); int dst_pos = index_name_pos(&the_index, dst,
strlen(dst));
struct cache_entry *dst_ce = the_index.cache[dst_pos]; struct cache_entry *dst_ce = the_index.cache[dst_pos];
dst_ce->ce_flags &= ~CE_SKIP_WORKTREE; dst_ce->ce_flags &= ~CE_SKIP_WORKTREE;
@ -500,7 +501,8 @@ remove_entry:
!(mode & SPARSE) && !(mode & SPARSE) &&
!path_in_sparse_checkout(dst, &the_index)) { !path_in_sparse_checkout(dst, &the_index)) {
/* from in-cone to out-of-cone */ /* from in-cone to out-of-cone */
int dst_pos = cache_name_pos(dst, strlen(dst)); int dst_pos = index_name_pos(&the_index, dst,
strlen(dst));
struct cache_entry *dst_ce = the_index.cache[dst_pos]; struct cache_entry *dst_ce = the_index.cache[dst_pos];
/* /*

4
builtin/update-index.c
View File

@ -3,7 +3,7 @@
* *
* Copyright (C) Linus Torvalds, 2005 * Copyright (C) Linus Torvalds, 2005
*/ */
#define USE_THE_INDEX_COMPATIBILITY_MACROS #define USE_THE_INDEX_VARIABLE
#include "cache.h" #include "cache.h"
#include "bulk-checkin.h" #include "bulk-checkin.h"
#include "config.h" #include "config.h"
@ -381,7 +381,7 @@ static int process_path(const char *path, struct stat *st, int stat_errno)
if (has_symlink_leading_path(path, len)) if (has_symlink_leading_path(path, len))
return error("'%s' is beyond a symbolic link", path); return error("'%s' is beyond a symbolic link", path);
pos = cache_name_pos(path, len); pos = index_name_pos(&the_index, path, len);
ce = pos < 0 ? NULL : the_index.cache[pos]; ce = pos < 0 ? NULL : the_index.cache[pos];
if (ce && ce_skip_worktree(ce)) { if (ce && ce_skip_worktree(ce)) {
/* /*

1
cache.h
View File

@ -456,7 +456,6 @@ extern struct index_state the_index;
#ifdef USE_THE_INDEX_COMPATIBILITY_MACROS #ifdef USE_THE_INDEX_COMPATIBILITY_MACROS
#define read_cache() repo_read_index(the_repository) #define read_cache() repo_read_index(the_repository)
#define discard_cache() discard_index(&the_index) #define discard_cache() discard_index(&the_index)
#define cache_name_pos(name, namelen) index_name_pos(&the_index,(name),(namelen))
#endif #endif
#endif #endif
#endif #endif

3
contrib/coccinelle/index-compatibility.cocci
View File

@ -91,6 +91,9 @@ identifier ACT = active_cache_tree;
| |
- resolve_undo_clear - resolve_undo_clear
+ resolve_undo_clear_index + resolve_undo_clear_index
|
- cache_name_pos
+ index_name_pos
) )
( (
+ &the_index, + &the_index,

3
contrib/coccinelle/index-compatibility.pending.cocci
View File

@ -15,9 +15,6 @@
( (
- discard_cache - discard_cache
+ discard_index + discard_index
|
- cache_name_pos
+ index_name_pos
) )
( (
+ &the_index, + &the_index,