Commit 9762ad993dc1afff90a3d14751f1b1f666ad0c95
2012-10-24T13:43:23
Renaming: fix example
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 95 96 97 98 99 100 101 102
diff --git a/examples/network/clone.c b/examples/network/clone.c
index 6f98192..7916001 100644
--- a/examples/network/clone.c
+++ b/examples/network/clone.c
@@ -8,7 +8,7 @@
#include <unistd.h>
typedef struct progress_data {
- git_indexer_stats fetch_progress;
+ git_transfer_progress fetch_progress;
size_t completed_steps;
size_t total_steps;
const char *path;
@@ -16,20 +16,21 @@ typedef struct progress_data {
static void print_progress(const progress_data *pd)
{
- int network_percent = (100*pd->fetch_progress.received) / pd->fetch_progress.total;
- int index_percent = (100*pd->fetch_progress.processed) / pd->fetch_progress.total;
+ int network_percent = (100*pd->fetch_progress.received_objects) / pd->fetch_progress.total_objects;
+ int index_percent = (100*pd->fetch_progress.indexed_objects) / pd->fetch_progress.total_objects;
int checkout_percent = pd->total_steps > 0
? (100 * pd->completed_steps) / pd->total_steps
: 0.f;
- int kbytes = pd->fetch_progress.bytes / 1024;
+ int kbytes = pd->fetch_progress.received_bytes / 1024;
printf("net %3d%% (%4d kb, %5d/%5d) / idx %3d%% (%5d/%5d) / chk %3d%% (%4lu/%4lu) %s\n",
- network_percent, kbytes, pd->fetch_progress.received, pd->fetch_progress.total,
- index_percent, pd->fetch_progress.processed, pd->fetch_progress.total,
+ network_percent, kbytes,
+ pd->fetch_progress.received_objects, pd->fetch_progress.total_objects,
+ index_percent, pd->fetch_progress.indexed_objects, pd->fetch_progress.total_objects,
checkout_percent, pd->completed_steps, pd->total_steps,
pd->path);
}
-static void fetch_progress(const git_indexer_stats *stats, void *payload)
+static void fetch_progress(const git_transfer_progress *stats, void *payload)
{
progress_data *pd = (progress_data*)payload;
pd->fetch_progress = *stats;
diff --git a/examples/network/fetch.c b/examples/network/fetch.c
index 39cb0de..8bfe10c 100644
--- a/examples/network/fetch.c
+++ b/examples/network/fetch.c
@@ -105,16 +105,18 @@ int fetch(git_repository *repo, int argc, char **argv)
do {
usleep(10000);
- if (stats->total > 0)
+ if (stats->total_objects > 0)
printf("Received %d/%d objects (%d) in %d bytes\r",
- stats->received, stats->total, stats->processed, bytes);
+ stats->received_objects, stats->total_objects,
+ stats->indexed_objects, bytes);
} while (!data.finished);
if (data.ret < 0)
goto on_error;
pthread_join(worker, NULL);
- printf("\rReceived %d/%d objects in %zu bytes\n", stats->processed, stats->total, bytes);
+ printf("\rReceived %d/%d objects in %zu bytes\n",
+ stats->indexed_objects, stats->total_objects, bytes);
// Disconnect the underlying connection to prevent from idling.
git_remote_disconnect(remote);
diff --git a/examples/network/index-pack.c b/examples/network/index-pack.c
index 69338b3..4d3dc84 100644
--- a/examples/network/index-pack.c
+++ b/examples/network/index-pack.c
@@ -10,10 +10,10 @@
// This could be run in the main loop whilst the application waits for
// the indexing to finish in a worker thread
-static int index_cb(const git_indexer_stats *stats, void *data)
+static int index_cb(const git_transfer_progress *stats, void *data)
{
data = data;
- printf("\rProcessing %d of %d", stats->processed, stats->total);
+ printf("\rProcessing %d of %d", stats->indexed_objects, stats->total_objects);
return 0;
}
@@ -21,7 +21,7 @@ static int index_cb(const git_indexer_stats *stats, void *data)
int index_pack(git_repository *repo, int argc, char **argv)
{
git_indexer_stream *idx;
- git_indexer_stats stats = {0, 0};
+ git_transfer_progress stats = {0, 0};
int error, fd;
char hash[GIT_OID_HEXSZ + 1] = {0};
ssize_t read_bytes;
@@ -63,7 +63,7 @@ int index_pack(git_repository *repo, int argc, char **argv)
if ((error = git_indexer_stream_finalize(idx, &stats)) < 0)
goto cleanup;
- printf("\rIndexing %d of %d\n", stats.processed, stats.total);
+ printf("\rIndexing %d of %d\n", stats.indexed_objects, stats.total_objects);
git_oid_fmt(hash, git_indexer_stream_hash(idx));
puts(hash);