undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge early parts of jk/cached-textconv

Browse Source
This commit is contained in:
Junio C Hamano 2010-04-08 23:31:27 -07:00
commit 7ec1eb93f7
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cache.h
View File

@ -701,7 +701,7 @@ static inline void *read_sha1_file(const unsigned char *sha1, enum object_type *
return read_sha1_file_repl(sha1, type, size, NULL); return read_sha1_file_repl(sha1, type, size, NULL);
} }
extern int hash_sha1_file(const void *buf, unsigned long len, const char *type, unsigned char *sha1); extern int hash_sha1_file(const void *buf, unsigned long len, const char *type, unsigned char *sha1);
extern int write_sha1_file(void *buf, unsigned long len, const char *type, unsigned char *return_sha1); extern int write_sha1_file(const void *buf, unsigned long len, const char *type, unsigned char *return_sha1);
extern int pretend_sha1_file(void *, unsigned long, enum object_type, unsigned char *); extern int pretend_sha1_file(void *, unsigned long, enum object_type, unsigned char *);
extern int force_object_loose(const unsigned char *sha1, time_t mtime); extern int force_object_loose(const unsigned char *sha1, time_t mtime);

4
diff.c
View File

@ -551,6 +551,10 @@ static void emit_rewrite_diff(const char *name_a,
emit_rewrite_lines(&ecbdata, '-', data_one, size_one); emit_rewrite_lines(&ecbdata, '-', data_one, size_one);
if (lc_b) if (lc_b)
emit_rewrite_lines(&ecbdata, '+', data_two, size_two); emit_rewrite_lines(&ecbdata, '+', data_two, size_two);
if (textconv_one)
free((char *)data_one);
if (textconv_two)
free((char *)data_two);
} }
struct diff_words_buffer { struct diff_words_buffer {

6
sha1_file.c
View File

@ -2271,7 +2271,7 @@ static int create_tmpfile(char *buffer, size_t bufsiz, const char *filename)
} }
static int write_loose_object(const unsigned char *sha1, char *hdr, int hdrlen, static int write_loose_object(const unsigned char *sha1, char *hdr, int hdrlen,
void *buf, unsigned long len, time_t mtime) const void *buf, unsigned long len, time_t mtime)
{ {
int fd, ret; int fd, ret;
unsigned char compressed[4096]; unsigned char compressed[4096];
@ -2307,7 +2307,7 @@ static int write_loose_object(const unsigned char *sha1, char *hdr, int hdrlen,
git_SHA1_Update(&c, hdr, hdrlen); git_SHA1_Update(&c, hdr, hdrlen);
/* Then the data itself.. */ /* Then the data itself.. */
stream.next_in = buf; stream.next_in = (void *)buf;
stream.avail_in = len; stream.avail_in = len;
do { do {
unsigned char *in0 = stream.next_in; unsigned char *in0 = stream.next_in;
@ -2342,7 +2342,7 @@ static int write_loose_object(const unsigned char *sha1, char *hdr, int hdrlen,
return move_temp_to_file(tmpfile, filename); return move_temp_to_file(tmpfile, filename);
} }
int write_sha1_file(void *buf, unsigned long len, const char *type, unsigned char *returnsha1) int write_sha1_file(const void *buf, unsigned long len, const char *type, unsigned char *returnsha1)
{ {
unsigned char sha1[20]; unsigned char sha1[20];
char hdr[32]; char hdr[32];