Commit 2b175ca9 by Carlos Martín Nieto

indexer: kill git_indexer_stats.data_received

It's not really needed with the current code as we have EOS and the
sideband's flush to tell us we're done.

Keep the distinction between processed and received objects.
parent cc1d85d1
......@@ -20,7 +20,6 @@ typedef struct git_indexer_stats {
unsigned int total;
unsigned int processed;
unsigned int received;
unsigned int data_received;
} git_indexer_stats;
......
......@@ -306,10 +306,7 @@ static int no_sideband(git_indexer_stream *idx, gitno_buffer *buf, git_off_t *by
return -1;
*bytes += recvd;
} while(recvd > 0 && stats->data_received);
if (!stats->data_received)
giterr_set(GITERR_NET, "Early EOF while downloading packfile");
} while(recvd > 0);
if (git_indexer_stream_finalize(idx, stats))
return -1;
......@@ -374,13 +371,10 @@ int git_fetch__download_pack(
git__free(pkt);
break;
}
} while (!stats->data_received);
if (!stats->data_received)
giterr_set(GITERR_NET, "Early EOF while downloading packfile");
} while (1);
if (git_indexer_stream_finalize(idx, stats))
return -1;
if (git_indexer_stream_finalize(idx, stats) < 0)
goto on_error;
git_indexer_stream_free(idx);
return 0;
......
......@@ -383,14 +383,6 @@ int git_indexer_stream_add(git_indexer_stream *idx, const void *data, size_t siz
stats->received++;
}
/*
* If we've received all of the objects and our packfile is
* one hash beyond the end of the last object, all of the
* packfile is here.
*/
if (stats->received == idx->nr_objects && idx->pack->mwf.size >= idx->off + 20)
stats->data_received = 1;
return 0;
on_error:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment