Merge branch 'jk/war-on-sprintf'

* jk/war-on-sprintf:
compat/mingw.c: remove printf format warning
read_branches_file: plug a FILE* leak

diff --git a/compat/mingw.c b/compat/mingw.c
index a168800ae0d1a6ffe741dfda26dbe5133cc4c4fc..90bdb1edde15ccd39055c376f5d920c29af013c0 100644 (file)
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -2131,7 +2131,7 @@ void mingw_startup()
 
 int uname(struct utsname *buf)
 {
-       DWORD v = GetVersion();
+       unsigned v = (unsigned)GetVersion();
        memset(buf, 0, sizeof(*buf));
        xsnprintf(buf->sysname, sizeof(buf->sysname), "Windows");
        xsnprintf(buf->release, sizeof(buf->release),

diff --git a/remote.c b/remote.c
index 1101f82eaf34b936d51e0d61837c568b3691a468..fb161530cdd5e286716d45532c1d58da26250e22 100644 (file)
--- a/remote.c
+++ b/remote.c
@@ -282,6 +282,7 @@ static void read_branches_file(struct remote *remote)
                return;
 
        strbuf_getline(&buf, f, '\n');
+       fclose(f);
        strbuf_trim(&buf);
        if (!buf.len) {
                strbuf_release(&buf);