diff options
| author | Russell Belfer <arrbee@arrbee.com> | 2012-03-13 09:55:40 +0400 |
|---|---|---|
| committer | Russell Belfer <arrbee@arrbee.com> | 2012-03-13 09:55:40 +0400 |
| commit | e1de726c15937a8dbf81d12ef0c872cf6576ebd0 (patch) | |
| tree | 84b437dd23e8250b0a4f983875fb3849569ad63a /src/pack.h | |
| parent | dda708e78f3c3f43d814d46c29ab9f2b9d47ed5c (diff) | |
Migrate ODB files to new error handling
This migrates odb.c, odb_loose.c, odb_pack.c and pack.c to
the new style of error handling. Also got the unix and win32
versions of map.c. There are some minor changes to other
files but no others were completely converted.
This also contains an update to filebuf so that a zeroed out
filebuf will not think that the fd (== 0) is actually open
(and inadvertently call close() on fd 0 if cleaned up).
Lastly, this was built and tested on win32 and contains a
bunch of fixes for the win32 build which was pretty broken.
Diffstat (limited to 'src/pack.h')
| -rw-r--r-- | src/pack.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/pack.h b/src/pack.h index 590297847..7cf41c183 100644 --- a/src/pack.h +++ b/src/pack.h @@ -70,7 +70,7 @@ struct git_pack_file { }; struct git_pack_entry { - off_t offset; + git_off_t offset; git_oid sha1; struct git_pack_file *p; }; @@ -80,13 +80,13 @@ int git_packfile_unpack_header( git_otype *type_p, git_mwindow_file *mwf, git_mwindow **w_curs, - off_t *curpos); + git_off_t *curpos); -int git_packfile_unpack(git_rawobj *obj, struct git_pack_file *p, off_t *obj_offset); +int git_packfile_unpack(git_rawobj *obj, struct git_pack_file *p, git_off_t *obj_offset); -off_t get_delta_base(struct git_pack_file *p, git_mwindow **w_curs, - off_t *curpos, git_otype type, - off_t delta_obj_offset); +git_off_t get_delta_base(struct git_pack_file *p, git_mwindow **w_curs, + git_off_t *curpos, git_otype type, + git_off_t delta_obj_offset); void packfile_free(struct git_pack_file *p); int git_packfile_check(struct git_pack_file **pack_out, const char *path); |