6afedba8c9
Most of our semantic patches in 'contrib/coccinelle/object_id.cocci'
turn calls of SHA1-specific functions into calls of their
corresponding object_id counterparts, e.g. sha1_to_hex() to
oid_to_hex(). These semantic patches look something like this:
@@
expression E1;
@@
- sha1_to_hex(E1.hash)
+ oid_to_hex(&E1)
and match the access to the 'hash' field in any data type, not only in
'struct object_id', and, consquently, can produce wrong
transformations.
Case in point is the recent hash function transition patch "rerere:
convert to use the_hash_algo" [1], which, among other things, renamed
'struct rerere_dir's 'sha1' field to 'hash', and then 'make
coccicheck' started to suggest the following wrong transformations for
'rerere.c' [2]:
- return sha1_to_hex(id->collection->hash);
+ return oid_to_hex(id->collection);
and
- DIR *dir = opendir(git_path("rr-cache/%s", sha1_to_hex(rr_dir->hash)));
+ DIR *dir = opendir(git_path("rr-cache/%s", oid_to_hex(rr_dir)));
Avoid such wrong transformations by tightening semantic patches in
'object_id.cocci' to match only type of or pointers to 'struct
object_id'.
[1] https://public-inbox.org/git/20181008215701.779099-15-sandals@crustytoothpaste.net/
[2] https://travis-ci.org/git/git/jobs/440463476#L580
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
150 lines
2.2 KiB
Plaintext
150 lines
2.2 KiB
Plaintext
@@
|
|
struct object_id OID;
|
|
@@
|
|
- is_null_sha1(OID.hash)
|
|
+ is_null_oid(&OID)
|
|
|
|
@@
|
|
struct object_id *OIDPTR;
|
|
@@
|
|
- is_null_sha1(OIDPTR->hash)
|
|
+ is_null_oid(OIDPTR)
|
|
|
|
@@
|
|
struct object_id OID;
|
|
@@
|
|
- sha1_to_hex(OID.hash)
|
|
+ oid_to_hex(&OID)
|
|
|
|
@@
|
|
identifier f != oid_to_hex;
|
|
struct object_id *OIDPTR;
|
|
@@
|
|
f(...) {<...
|
|
- sha1_to_hex(OIDPTR->hash)
|
|
+ oid_to_hex(OIDPTR)
|
|
...>}
|
|
|
|
@@
|
|
expression E;
|
|
struct object_id OID;
|
|
@@
|
|
- sha1_to_hex_r(E, OID.hash)
|
|
+ oid_to_hex_r(E, &OID)
|
|
|
|
@@
|
|
identifier f != oid_to_hex_r;
|
|
expression E;
|
|
struct object_id *OIDPTR;
|
|
@@
|
|
f(...) {<...
|
|
- sha1_to_hex_r(E, OIDPTR->hash)
|
|
+ oid_to_hex_r(E, OIDPTR)
|
|
...>}
|
|
|
|
@@
|
|
struct object_id OID;
|
|
@@
|
|
- hashclr(OID.hash)
|
|
+ oidclr(&OID)
|
|
|
|
@@
|
|
identifier f != oidclr;
|
|
struct object_id *OIDPTR;
|
|
@@
|
|
f(...) {<...
|
|
- hashclr(OIDPTR->hash)
|
|
+ oidclr(OIDPTR)
|
|
...>}
|
|
|
|
@@
|
|
struct object_id OID1, OID2;
|
|
@@
|
|
- hashcmp(OID1.hash, OID2.hash)
|
|
+ oidcmp(&OID1, &OID2)
|
|
|
|
@@
|
|
identifier f != oidcmp;
|
|
struct object_id *OIDPTR1, OIDPTR2;
|
|
@@
|
|
f(...) {<...
|
|
- hashcmp(OIDPTR1->hash, OIDPTR2->hash)
|
|
+ oidcmp(OIDPTR1, OIDPTR2)
|
|
...>}
|
|
|
|
@@
|
|
struct object_id *OIDPTR;
|
|
struct object_id OID;
|
|
@@
|
|
- hashcmp(OIDPTR->hash, OID.hash)
|
|
+ oidcmp(OIDPTR, &OID)
|
|
|
|
@@
|
|
struct object_id *OIDPTR;
|
|
struct object_id OID;
|
|
@@
|
|
- hashcmp(OID.hash, OIDPTR->hash)
|
|
+ oidcmp(&OID, OIDPTR)
|
|
|
|
@@
|
|
struct object_id OID1, OID2;
|
|
@@
|
|
- hashcpy(OID1.hash, OID2.hash)
|
|
+ oidcpy(&OID1, &OID2)
|
|
|
|
@@
|
|
identifier f != oidcpy;
|
|
struct object_id *OIDPTR1;
|
|
struct object_id *OIDPTR2;
|
|
@@
|
|
f(...) {<...
|
|
- hashcpy(OIDPTR1->hash, OIDPTR2->hash)
|
|
+ oidcpy(OIDPTR1, OIDPTR2)
|
|
...>}
|
|
|
|
@@
|
|
struct object_id *OIDPTR;
|
|
struct object_id OID;
|
|
@@
|
|
- hashcpy(OIDPTR->hash, OID.hash)
|
|
+ oidcpy(OIDPTR, &OID)
|
|
|
|
@@
|
|
struct object_id *OIDPTR;
|
|
struct object_id OID;
|
|
@@
|
|
- hashcpy(OID.hash, OIDPTR->hash)
|
|
+ oidcpy(&OID, OIDPTR)
|
|
|
|
@@
|
|
struct object_id *OIDPTR1;
|
|
struct object_id *OIDPTR2;
|
|
@@
|
|
- oidcmp(OIDPTR1, OIDPTR2) == 0
|
|
+ oideq(OIDPTR1, OIDPTR2)
|
|
|
|
@@
|
|
identifier f != hasheq;
|
|
expression E1, E2;
|
|
@@
|
|
f(...) {<...
|
|
- hashcmp(E1, E2) == 0
|
|
+ hasheq(E1, E2)
|
|
...>}
|
|
|
|
@@
|
|
struct object_id *OIDPTR1;
|
|
struct object_id *OIDPTR2;
|
|
@@
|
|
- oidcmp(OIDPTR1, OIDPTR2) != 0
|
|
+ !oideq(OIDPTR1, OIDPTR2)
|
|
|
|
@@
|
|
identifier f != hasheq;
|
|
expression E1, E2;
|
|
@@
|
|
f(...) {<...
|
|
- hashcmp(E1, E2) != 0
|
|
+ !hasheq(E1, E2)
|
|
...>}
|