summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorLibravatar René Scharfe <l.s.r@web.de>2021-09-10 22:25:50 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-09-10 14:22:50 -0700
commit6346f704a00a2fc94cc2ca26dbe872b446500bfd (patch)
treea3f475493afe4eed7318ceaa34737ddd18f1b0b4 /contrib
parentuse xopen() to handle fatal open(2) failures (diff)
downloadtgif-6346f704a00a2fc94cc2ca26dbe872b446500bfd.tar.xz
index-pack: use xopen in init_thread
Support an arbitrary file descriptor expression in the semantic patch for replacing open+die_errno with xopen, not just an identifier, and apply it. This makes the error message at the single affected place more consistent and reduces code duplication. Signed-off-by: René Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib')
-rw-r--r--contrib/coccinelle/xopen.cocci13
1 files changed, 8 insertions, 5 deletions
diff --git a/contrib/coccinelle/xopen.cocci b/contrib/coccinelle/xopen.cocci
index 814d7b8a1a..b71db67019 100644
--- a/contrib/coccinelle/xopen.cocci
+++ b/contrib/coccinelle/xopen.cocci
@@ -2,15 +2,18 @@
identifier fd;
identifier die_fn =~ "^(die|die_errno)$";
@@
-(
- fd =
+ int fd =
- open
+ xopen
(...);
-|
- int fd =
+- if ( \( fd < 0 \| fd == -1 \) ) { die_fn(...); }
+
+@@
+expression fd;
+identifier die_fn =~ "^(die|die_errno)$";
+@@
+ fd =
- open
+ xopen
(...);
-)
- if ( \( fd < 0 \| fd == -1 \) ) { die_fn(...); }