commit e288864f310a1e7de1387da9722da51ac538782e from: Stefan Sperling date: Tue Mar 26 05:44:27 2019 UTC renmae GOT_FILEIDX_F_NOT_ON_DISK to GOT_FILEIDX_F_NOT_FLUSHED commit - 2181e0c84adadde053b715a649efe95f446c4f96 commit + e288864f310a1e7de1387da9722da51ac538782e blob - a8587e97439fced1410fdf3726c295593a68d7af blob + 5e6ac2f420d2f25a3991a938f2754f3819982537 --- lib/fileindex.c +++ lib/fileindex.c @@ -122,7 +122,7 @@ got_fileindex_entry_add(struct got_fileindex *fileinde struct got_fileindex_entry *entry) { /* Flag this entry until it gets written out to disk. */ - entry->flags |= GOT_FILEIDX_F_NOT_ON_DISK; + entry->flags |= GOT_FILEIDX_F_NOT_FLUSHED; return add_entry(fileindex, entry); } @@ -328,7 +328,7 @@ got_fileindex_write(struct got_fileindex *fileindex, F return got_ferror(outfile, GOT_ERR_IO); RB_FOREACH(entry, got_fileindex_tree, &fileindex->entries) { - entry->flags &= ~GOT_FILEIDX_F_NOT_ON_DISK; + entry->flags &= ~GOT_FILEIDX_F_NOT_FLUSHED; err = write_fileindex_entry(&ctx, entry, outfile); if (err) return err; @@ -561,7 +561,7 @@ walk_fileindex(struct got_fileindex *fileindex, struct next = RB_NEXT(got_fileindex_tree, &fileindex->entries, ie); /* Skip entries which were newly added by diff callbacks. */ - while (next && (next->flags & GOT_FILEIDX_F_NOT_ON_DISK)) + while (next && (next->flags & GOT_FILEIDX_F_NOT_FLUSHED)) next = RB_NEXT(got_fileindex_tree, &fileindex->entries, next); return next; blob - 31312868a6f9071306b347c0ebf4421f16ece641 blob + 3bbed3dbcef386c81397fef12c3802b316f8143f --- lib/got_lib_fileindex.h +++ lib/got_lib_fileindex.h @@ -53,7 +53,7 @@ struct got_fileindex_entry { #define GOT_FILEIDX_F_STAGE 0x00003000 #define GOT_FILEIDX_F_EXTENDED 0x00004000 #define GOT_FILEIDX_F_ASSUME_VALID 0x00008000 -#define GOT_FILEIDX_F_NOT_ON_DISK 0x20000000 +#define GOT_FILEIDX_F_NOT_FLUSHED 0x20000000 /* * UNIX-style path, relative to work tree root.