diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2008-10-03 07:41:25 -0700 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2008-10-03 07:41:25 -0700 |
| commit | 3e3d4ee7cb7726dcf799f95d27bce384c32b2c8a (patch) | |
| tree | fe6a29d3d62f85eea9953deaf5653741fe73e54c /csum-file.c | |
| parent | gitweb: Add support for extending the action bar with custom links (diff) | |
| parent | gitweb: Support for simple project search form (diff) | |
| download | git-3e3d4ee7cb7726dcf799f95d27bce384c32b2c8a.tar.gz git-3e3d4ee7cb7726dcf799f95d27bce384c32b2c8a.zip | |
Merge branch 'pb/gitweb-tagcloud' into pb/gitweb
* pb/gitweb-tagcloud:
gitweb: Support for simple project search form
gitweb: Make the by_tag filter delve in forks as well
gitweb: Support for tag clouds
... (+ many updates from master) ...
Conflicts:
gitweb/gitweb.perl
Diffstat (limited to 'csum-file.c')
| -rw-r--r-- | csum-file.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/csum-file.c b/csum-file.c index bb70c75ee1..717d29fc03 100644 --- a/csum-file.c +++ b/csum-file.c @@ -36,11 +36,11 @@ int sha1close(struct sha1file *f, unsigned char *result, unsigned int flags) unsigned offset = f->offset; if (offset) { - SHA1_Update(&f->ctx, f->buffer, offset); + git_SHA1_Update(&f->ctx, f->buffer, offset); sha1flush(f, f->buffer, offset); f->offset = 0; } - SHA1_Final(f->buffer, &f->ctx); + git_SHA1_Final(f->buffer, &f->ctx); if (result) hashcpy(result, f->buffer); if (flags & (CSUM_CLOSE | CSUM_FSYNC)) { @@ -82,7 +82,7 @@ int sha1write(struct sha1file *f, void *buf, unsigned int count) buf = (char *) buf + nr; left -= nr; if (!left) { - SHA1_Update(&f->ctx, data, offset); + git_SHA1_Update(&f->ctx, data, offset); sha1flush(f, data, offset); offset = 0; } @@ -105,7 +105,7 @@ struct sha1file *sha1fd_throughput(int fd, const char *name, struct progress *tp f->tp = tp; f->name = name; f->do_crc = 0; - SHA1_Init(&f->ctx); + git_SHA1_Init(&f->ctx); return f; } |