summaryrefslogtreecommitdiff
path: root/object.h
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2014-09-10 15:52:44 +0200
committerJunio C Hamano <gitster@pobox.com>2014-09-10 13:52:13 -0700
commitfe8e3b71805cd13d139b62fa5a0c75387568c9ea (patch)
tree62a7b6b4a44cbc07cc58d36bccc2d2df205471b8 /object.h
parent0c72b98f31bf6eabd75be565a08ffcf0d8e74b1f (diff)
downloadgit-fe8e3b71805cd13d139b62fa5a0c75387568c9ea.tar.gz
Refactor type_from_string() to allow continuing after detecting an error
In the next commits, we will enhance the fsck_tag() function to check tag objects more thoroughly. To this end, we need a function to verify that a given string is a valid object type, but that does not die() in the negative case. While at it, prepare type_from_string() for counted strings, i.e. strings with an explicitly specified length rather than a NUL termination. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'object.h')
-rw-r--r--object.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/object.h b/object.h
index 5e8d8ee548..e028ced74c 100644
--- a/object.h
+++ b/object.h
@@ -53,7 +53,8 @@ struct object {
};
extern const char *typename(unsigned int type);
-extern int type_from_string(const char *str);
+extern int type_from_string_gently(const char *str, ssize_t, int gentle);
+#define type_from_string(str) type_from_string_gently(str, -1, 0)
/*
* Return the current number of buckets in the object hashmap.