Revision 1a8fb155cff5b19bc41ee3ac96e34f0f2ad95763 authored by Junio C Hamano on 17 June 2008, 07:23:31 UTC, committed by Junio C Hamano on 17 June 2008, 23:39:59 UTC
The data read from MERGE_RR file is kept in path-list by hanging textual 40-byte conflict signature to path of the blob that contains the conflict. The signature is strdup'ed twice, and the second copy is given to the path-list, leaking the first copy. Signed-off-by: Junio C Hamano <junio@pobox.com> Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
1 parent 61fb0b7
utf8.h
#ifndef GIT_UTF8_H
#define GIT_UTF8_H
typedef unsigned int ucs_char_t; /* assuming 32bit int */
ucs_char_t pick_one_utf8_char(const char **start, size_t *remainder_p);
int utf8_width(const char **start, size_t *remainder_p);
int is_utf8(const char *text);
int is_encoding_utf8(const char *name);
int print_wrapped_text(const char *text, int indent, int indent2, int len);
#ifndef NO_ICONV
char *reencode_string(const char *in, const char *out_encoding, const char *in_encoding);
#else
#define reencode_string(a,b,c) NULL
#endif
#endif
Computing file changes ...
