projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into next
[git.git]
/
imap-send.c
diff --git
a/imap-send.c
b/imap-send.c
index
1b38b3a
..
e33c78b
100644
(file)
--- a/
imap-send.c
+++ b/
imap-send.c
@@
-372,7
+372,7
@@
free_generic_messages( message_t *msgs )
}
static int
}
static int
-vasprintf( char **strp, const char *fmt, va_list ap )
+
git_
vasprintf( char **strp, const char *fmt, va_list ap )
{
int len;
char tmp[1024];
{
int len;
char tmp[1024];
@@
-402,7
+402,7
@@
nfsnprintf( char *buf, int blen, const char *fmt, ... )
static int
nfvasprintf( char **str, const char *fmt, va_list va )
{
static int
nfvasprintf( char **str, const char *fmt, va_list va )
{
- int ret = vasprintf( str, fmt, va );
+ int ret =
git_
vasprintf( str, fmt, va );
if (ret < 0)
die( "Fatal: Out of memory\n");
return ret;
if (ret < 0)
die( "Fatal: Out of memory\n");
return ret;