summaryrefslogtreecommitdiff
path: root/fast-import.c
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2007-03-07 01:44:34 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-03-07 19:06:33 (GMT)
commit6777a59fcdfd96b9ca5cba49cb265c6c47de3d02 (patch)
tree1442d70f95f9688cc45586ea8f27d219f7b23773 /fast-import.c
parentc4001d92be61766d3494489b15590ca0147ee19d (diff)
downloadgit-6777a59fcdfd96b9ca5cba49cb265c6c47de3d02.zip
git-6777a59fcdfd96b9ca5cba49cb265c6c47de3d02.tar.gz
git-6777a59fcdfd96b9ca5cba49cb265c6c47de3d02.tar.bz2
Use off_t in pack-objects/fast-import when we mean an offset
Always use an off_t value in pack-objects anytime we are dealing with an offset to some data within a packfile. Also fixed a minor uintmax_t that was incorrectly defined before. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'fast-import.c')
-rw-r--r--fast-import.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fast-import.c b/fast-import.c
index a418a17..fda5018 100644
--- a/fast-import.c
+++ b/fast-import.c
@@ -249,7 +249,7 @@ typedef enum {
/* Configured limits on output */
static unsigned long max_depth = 10;
-static unsigned long max_packsize = (1LL << 32) - 1;
+static off_t max_packsize = (1LL << 32) - 1;
static int force_update;
/* Stats and misc. counters */
@@ -1527,7 +1527,7 @@ static void unload_one_branch(void)
{
while (cur_active_branches
&& cur_active_branches >= max_active_branches) {
- unsigned long min_commit = ULONG_MAX;
+ uintmax_t min_commit = ULONG_MAX;
struct branch *e, *l = NULL, *p = NULL;
for (e = active_branches; e; e = e->active_next_branch) {