Commit 6131ab45b4ac2e03447e28d41d92c53ecfe632e3
2020-07-23T14:22:36
remove pointless error checking in got_fileindex_entry_filetype_set()
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94
diff --git a/lib/fileindex.c b/lib/fileindex.c
index b9ebd92..c4e79c0 100644
--- a/lib/fileindex.c
+++ b/lib/fileindex.c
@@ -183,21 +183,11 @@ got_fileindex_entry_filetype_get(struct got_fileindex_entry *ie)
return (ie->mode & GOT_FILEIDX_MODE_FILE_TYPE_ONDISK);
}
-const struct got_error *
+void
got_fileindex_entry_filetype_set(struct got_fileindex_entry *ie, int type)
{
- switch (type) {
- case GOT_FILEIDX_MODE_REGULAR_FILE:
- case GOT_FILEIDX_MODE_SYMLINK:
- case GOT_FILEIDX_MODE_BAD_SYMLINK:
- break;
- default:
- return got_error(GOT_ERR_BAD_FILETYPE);
- }
-
ie->mode &= ~GOT_FILEIDX_MODE_FILE_TYPE_ONDISK;
- ie->mode |= type;
- return NULL;
+ ie->mode |= (type & GOT_FILEIDX_MODE_FILE_TYPE_ONDISK);
}
void
diff --git a/lib/got_lib_fileindex.h b/lib/got_lib_fileindex.h
index 5054bb8..8535201 100644
--- a/lib/got_lib_fileindex.h
+++ b/lib/got_lib_fileindex.h
@@ -166,8 +166,7 @@ int got_fileindex_entry_has_file_on_disk(struct got_fileindex_entry *);
uint32_t got_fileindex_entry_stage_get(const struct got_fileindex_entry *);
void got_fileindex_entry_stage_set(struct got_fileindex_entry *ie, uint32_t);
int got_fileindex_entry_filetype_get(struct got_fileindex_entry *);
-const struct got_error *got_fileindex_entry_filetype_set(
- struct got_fileindex_entry *, int);
+void got_fileindex_entry_filetype_set(struct got_fileindex_entry *, int);
void got_fileindex_entry_staged_filetype_set(struct got_fileindex_entry *, int);
int got_fileindex_entry_staged_filetype_get(struct got_fileindex_entry *);
diff --git a/lib/worktree.c b/lib/worktree.c
index b98e8e7..315fadb 100644
--- a/lib/worktree.c
+++ b/lib/worktree.c
@@ -1980,10 +1980,8 @@ update_blob(struct got_worktree *worktree,
goto done;
if (is_bad_symlink) {
- err = got_fileindex_entry_filetype_set(ie,
+ got_fileindex_entry_filetype_set(ie,
GOT_FILEIDX_MODE_BAD_SYMLINK);
- if (err)
- goto done;
}
}
got_object_blob_close(blob);
@@ -2857,10 +2855,8 @@ merge_file_cb(void *arg, struct got_blob_object *blob1,
goto done;
}
if (is_bad_symlink) {
- err = got_fileindex_entry_filetype_set(ie,
+ got_fileindex_entry_filetype_set(ie,
GOT_FILEIDX_MODE_BAD_SYMLINK);
- if (err)
- goto done;
}
}
}
@@ -4381,10 +4377,8 @@ revert_file(void *arg, unsigned char status, unsigned char staged_status,
goto done;
}
if (is_bad_symlink) {
- err = got_fileindex_entry_filetype_set(ie,
+ got_fileindex_entry_filetype_set(ie,
GOT_FILEIDX_MODE_BAD_SYMLINK);
- if (err)
- goto done;
}
}
break;
@@ -5124,10 +5118,8 @@ reinstall_symlinks_after_commit(struct got_pathlist_head *commitable_paths,
ie = got_fileindex_entry_get(fileindex, ct->path,
strlen(ct->path));
if (ie && is_bad_symlink) {
- err = got_fileindex_entry_filetype_set(ie,
+ got_fileindex_entry_filetype_set(ie,
GOT_FILEIDX_MODE_BAD_SYMLINK);
- if (err)
- break;
}
}