strbuf: add strbuf_reencode helper

This is a convenience wrapper around `reencode_string_len`
and `strbuf_attach`.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2014-05-22 05:30:14 -04:00 committed by Junio C Hamano
parent e31316263a
commit d4241f52d1
3 changed files with 23 additions and 0 deletions

View File

@ -125,6 +125,11 @@ Functions
Strip whitespace from the end of a string.
`strbuf_reencode`::
Replace the contents of the strbuf with a reencoded form. Returns -1
on error, 0 on success.
`strbuf_cmp`::
Compare two buffers. Returns an integer less than, equal to, or greater

View File

@ -1,5 +1,6 @@
#include "cache.h"
#include "refs.h"
#include "utf8.h"
int starts_with(const char *str, const char *prefix)
{
@ -106,6 +107,22 @@ void strbuf_ltrim(struct strbuf *sb)
sb->buf[sb->len] = '\0';
}
int strbuf_reencode(struct strbuf *sb, const char *from, const char *to)
{
char *out;
int len;
if (same_encoding(from, to))
return 0;
out = reencode_string_len(sb->buf, sb->len, to, from, &len);
if (!out)
return -1;
strbuf_attach(sb, out, len, len);
return 0;
}
struct strbuf **strbuf_split_buf(const char *str, size_t slen,
int terminator, int max)
{

View File

@ -45,6 +45,7 @@ static inline void strbuf_setlen(struct strbuf *sb, size_t len)
extern void strbuf_trim(struct strbuf *);
extern void strbuf_rtrim(struct strbuf *);
extern void strbuf_ltrim(struct strbuf *);
extern int strbuf_reencode(struct strbuf *sb, const char *from, const char *to);
extern int strbuf_cmp(const struct strbuf *, const struct strbuf *);
/*