sha1-file: drop has_sha1_file()

diff --git a/object-store.h b/object-store.h
index 139feb75b25dc4e62b74b36aaefbac8a75f033c6..a7808bb6244b2c74cbf28aab86ba9291c4b0b477 100644 (file)
--- a/object-store.h
+++ b/object-store.h
@@ -202,20 +202,16 @@ int read_loose_object(const char *path,
                      void **contents);
 
 /*
- * Convenience for sha1_object_info_extended() with a NULL struct
+ * Convenience for oid_object_info_extended() with a NULL struct
  * object_info. OBJECT_INFO_SKIP_CACHED is automatically set; pass
  * nonzero flags to also set other flags.
  */
-extern int has_sha1_file_with_flags(const unsigned char *sha1, int flags);
-static inline int has_sha1_file(const unsigned char *sha1)
+int has_object_file_with_flags(const struct object_id *oid, int flags);
+static inline int has_object_file(const struct object_id *oid)
 {
-       return has_sha1_file_with_flags(sha1, 0);
+       return has_object_file_with_flags(oid, 0);
 }
 
-/* Same as the above, except for struct object_id. */
-extern int has_object_file(const struct object_id *oid);
-extern int has_object_file_with_flags(const struct object_id *oid, int flags);
-
 /*
  * Return true iff an alternate object database has a loose object
  * with the specified name.  This function does not respect replace