Minor error fixes

Clear the error in pkt when we notice that the remote is starting to
send the packfile.

Fix the format string for Windows networking errors.
This commit is contained in:
Carlos Martín Nieto 2012-05-08 14:28:21 +02:00
parent 8d89c8e972
commit 65ca81a63e
2 changed files with 2 additions and 1 deletions

View File

@ -35,7 +35,7 @@ static void net_set_error(const char *str)
size = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
0, error, 0, (LPSTR)&err_str, 0, 0);
giterr_set(GITERR_NET, "%s: $s", str, err_str);
giterr_set(GITERR_NET, "%s: %s", str, err_str);
LocalFree(err_str);
}
#else

View File

@ -217,6 +217,7 @@ int git_pkt_parse_line(
* server is trying to send us the packfile already.
*/
if (bufflen >= 4 && !git__prefixcmp(line, "PACK")) {
giterr_clear();
*out = line;
return pack_pkt(head);
}