Merge branch 'jk/war-on-sprintf'

gitster · gitster · commit 228905fbce62 · 2015-10-29T13:59:17.000-07:00
* 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
@@ -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
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -2131,7 +2131,7 @@ void mingw_startup()`
`2131`	`2131`
`2132`	`2132`	`int uname(struct utsname *buf)`
`2133`	`2133`	`{`
`2134`		`- DWORD v = GetVersion();`
	`2134`	`+ unsigned v = (unsigned)GetVersion();`
`2135`	`2135`	`memset(buf, 0, sizeof(*buf));`
`2136`	`2136`	`xsnprintf(buf->sysname, sizeof(buf->sysname), "Windows");`
`2137`	`2137`	`xsnprintf(buf->release, sizeof(buf->release),`