undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix up strtoul_ui error handling

Browse Source 
Two scanf() calls were converted to strtoul_ui() but the return
values were not updated to match.  scanf() returns the number of
matched "values" which for this usage is 1 on success.  strtoul_ui()
return 0 on success.  Update these call sites to match.

Signed-off-by: Andy Whitcroft <apw@shadowen.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Andy Whitcroft 2007-04-19 03:08:15 +01:00 committed by Junio C Hamano
parent 9f1beb7140
commit 6e6db39afc
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin-update-index.c
View File

@ -551,7 +551,7 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
if (i+3 >= argc) if (i+3 >= argc)
die("git-update-index: --cacheinfo <mode> <sha1> <path>"); die("git-update-index: --cacheinfo <mode> <sha1> <path>");
if ((strtoul_ui(argv[i+1], 8, &mode) != 1) || if (strtoul_ui(argv[i+1], 8, &mode) ||
get_sha1_hex(argv[i+2], sha1) || get_sha1_hex(argv[i+2], sha1) ||
add_cacheinfo(mode, sha1, argv[i+3], 0)) add_cacheinfo(mode, sha1, argv[i+3], 0))
die("git-update-index: --cacheinfo" die("git-update-index: --cacheinfo"

2
convert-objects.c
View File

@ -88,7 +88,7 @@ static int write_subdirectory(void *buffer, unsigned long size, const char *base
unsigned int mode; unsigned int mode;
char *slash, *origpath; char *slash, *origpath;
if (!path || strtoul_ui(buffer, 8, &mode) != 1) if (!path || strtoul_ui(buffer, 8, &mode))
die("bad tree conversion"); die("bad tree conversion");
mode = convert_mode(mode); mode = convert_mode(mode);
path++; path++;