resolve_ref_1(): eliminate local variable "bad_name"
We can use (*flags & REF_BAD_NAME) for that purpose. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: David Turner <dturner@twopensource.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Michael Haggerty committed
Apr 7, 2016 at 15:03 UTC
afbe782fa3ea4278dee2c19d0f3c2dfa50522ff2
1 file changed
+5
-8
refs/files-backend.c
+5
-8
@@ -1399,19 +1399,17 @@ static const char *resolve_ref_1(const char *refname,
1399
struct strbuf *sb_path,
1400
struct strbuf *sb_contents)
1401
{
1402
- int bad_name = 0;
1402
int symref_count;
1403
1404
*flags = 0;
1405
1406
if (check_refname_format(refname, REFNAME_ALLOW_ONELEVEL)) {
1408
- *flags |= REF_BAD_NAME;
1409
-
1407
if (!(resolve_flags & RESOLVE_REF_ALLOW_BAD_NAME) ||
1408
!refname_is_safe(refname)) {
1409
errno = EINVAL;
1410
return NULL;
1411
}
1412
+
1413
/*
1414
* dwim_ref() uses REF_ISBROKEN to distinguish between
1415
* missing refs and refs that were present but invalid,
@@ -1420,7 +1418,7 @@ static const char *resolve_ref_1(const char *refname,
1418
* We don't know whether the ref exists, so don't set
1419
* REF_ISBROKEN yet.
1420
*/
1423
- bad_name = 1;
1421
+ *flags |= REF_BAD_NAME;
1422
}
1423
1424
for (symref_count = 0; symref_count < MAXDEPTH; symref_count++) {
@@ -1452,7 +1450,7 @@ static const char *resolve_ref_1(const char *refname,
1450
}
1451
hashclr(sha1);
1452
}
1455
- if (bad_name) {
1453
+ if (*flags & REF_BAD_NAME) {
1454
hashclr(sha1);
1455
*flags |= REF_ISBROKEN;
1456
}
@@ -1524,7 +1522,7 @@ static const char *resolve_ref_1(const char *refname,
1522
errno = EINVAL;
1523
return NULL;
1524
}
1527
- if (bad_name) {
1525
+ if (*flags & REF_BAD_NAME) {
1526
hashclr(sha1);
1527
*flags |= REF_ISBROKEN;
1528
}
@@ -1548,8 +1546,7 @@ static const char *resolve_ref_1(const char *refname,
1546
return NULL;
1547
}
1548
1551
- *flags |= REF_ISBROKEN;
1552
- bad_name = 1;
1549
+ *flags |= REF_ISBROKEN | REF_BAD_NAME;
1550
}
1551
}
1552