odb: rename `odb_write_object()` flags
Rename `odb_write_object()` flags to be properly prefixed with the function name. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Patrick Steinhardt committed
Apr 1, 2026 at 01:57 UTC
ff2e9d85d61f2f51793acbdb4bad68d48cc8bb85
3 files changed
+5
-5
cache-tree.c
+1
-1
@@ -456,7 +456,7 @@ static int update_one(struct cache_tree *it,
456
hash_object_file(the_hash_algo, buffer.buf, buffer.len,
457
OBJ_TREE, &it->oid);
458
} else if (odb_write_object_ext(the_repository->objects, buffer.buf, buffer.len, OBJ_TREE,
459
- &it->oid, NULL, flags & WRITE_TREE_SILENT ? WRITE_OBJECT_SILENT : 0)) {
459
+ &it->oid, NULL, flags & WRITE_TREE_SILENT ? ODB_WRITE_OBJECT_SILENT : 0)) {
460
strbuf_release(&buffer);
461
return -1;
462
}
object-file.c
+2
-2
@@ -909,7 +909,7 @@ static int start_loose_object_common(struct odb_source *source,
909
910
fd = create_tmpfile(source->odb->repo, tmp_file, filename);
911
if (fd < 0) {
912
- if (flags & WRITE_OBJECT_SILENT)
912
+ if (flags & ODB_WRITE_OBJECT_SILENT)
913
return -1;
914
else if (errno == EACCES)
915
return error(_("insufficient permission for adding "
@@ -1042,7 +1042,7 @@ static int write_loose_object(struct odb_source *source,
1042
utb.actime = mtime;
1043
utb.modtime = mtime;
1044
if (utime(tmp_file.buf, &utb) < 0 &&
1045
- !(flags & WRITE_OBJECT_SILENT))
1045
+ !(flags & ODB_WRITE_OBJECT_SILENT))
1046
warning_errno(_("failed utime() on %s"), tmp_file.buf);
1047
}
1048
odb.h
+2
-2
@@ -568,12 +568,12 @@ enum {
568
* changes that so that the object will be written as a loose object
569
* and persisted.
570
*/
571
- WRITE_OBJECT_PERSIST = (1 << 0),
571
+ ODB_WRITE_OBJECT_PERSIST = (1 << 0),
572
573
/*
574
* Do not print an error in case something goes wrong.
575
*/
576
- WRITE_OBJECT_SILENT = (1 << 1),
576
+ ODB_WRITE_OBJECT_SILENT = (1 << 1),
577
};
578
579
/*