This is the follow up of rs/qsort series, merged in b8688ad (Merge
branch 'rs/qsort' - 2016-10-10), where coccinelle was used to do
automatic transformation.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@xxxxxxxxx>
---
coccinelle missed this place, understandably, because it can't know
that
sizeof(*entries->items)
is the same as
sizeof(*df_name_compare.items)
without some semantic analysis.
merge-recursive.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/merge-recursive.c b/merge-recursive.c
index 9041c2f..2d4dca9 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -451,7 +451,7 @@ static void record_df_conflict_files(struct merge_options *o,
string_list_append(&df_sorted_entries, next->string)->util =
next->util;
}
- qsort(df_sorted_entries.items, entries->nr, sizeof(*entries->items),
+ QSORT(df_sorted_entries.items, entries->nr,
string_list_df_name_compare);
string_list_clear(&o->df_conflict_file_set, 1);
--
2.8.2.524.g6ff3d78