*.[ch]: remove extern from function declarations using spatch

[thirdparty/git.git] / object-store.h

diff --git a/object-store.h b/object-store.h
index ba57630677fac412c6f8a771ed64eccf6000e833..9700d1aca7ff038adbe364dcfa3b6d9da855ea41 100644 (file)
--- a/object-store.h
+++ b/object-store.h
@@ -154,13 +154,15 @@ void raw_object_store_clear(struct raw_object_store *o);
 
 /*
  * Put in `buf` the name of the file in the local object database that
- * would be used to store a loose object with the specified sha1.
+ * would be used to store a loose object with the specified oid.
  */
-const char *loose_object_path(struct repository *r, struct strbuf *buf, const unsigned char *sha1);
+const char *loose_object_path(struct repository *r, struct strbuf *buf,
+                             const struct object_id *oid);
 
-void *map_sha1_file(struct repository *r, const unsigned char *sha1, unsigned long *size);
+void *map_loose_object(struct repository *r, const struct object_id *oid,
+                      unsigned long *size);
 
-extern void *read_object_file_extended(struct repository *r,
+void *read_object_file_extended(struct repository *r,
                                       const struct object_id *oid,
                                       enum object_type *type,
                                       unsigned long *size, int lookup_replace);
@@ -178,20 +180,20 @@ static inline void *repo_read_object_file(struct repository *r,
 /* Read and unpack an object file into memory, write memory to an object file */
 int oid_object_info(struct repository *r, const struct object_id *, unsigned long *);
 
-extern int hash_object_file(const void *buf, unsigned long len,
+int hash_object_file(const void *buf, unsigned long len,
                            const char *type, struct object_id *oid);
 
-extern int write_object_file(const void *buf, unsigned long len,
+int write_object_file(const void *buf, unsigned long len,
                             const char *type, struct object_id *oid);
 
-extern int hash_object_file_literally(const void *buf, unsigned long len,
+int hash_object_file_literally(const void *buf, unsigned long len,
                                      const char *type, struct object_id *oid,
                                      unsigned flags);
 
-extern int pretend_object_file(void *, unsigned long, enum object_type,
+int pretend_object_file(void *, unsigned long, enum object_type,
                               struct object_id *oid);
 
-extern int force_object_loose(const struct object_id *oid, time_t mtime);
+int force_object_loose(const struct object_id *oid, time_t mtime);
 
 /*
  * Open the loose object at path, check its hash, and return the contents,
@@ -206,19 +208,6 @@ int read_loose_object(const char *path,
                      unsigned long *size,
                      void **contents);
 
-/*
- * Convenience for sha1_object_info_extended() with a NULL struct
- * object_info. OBJECT_INFO_SKIP_CACHED is automatically set; pass
- * nonzero flags to also set other flags.
- */
-int repo_has_sha1_file_with_flags(struct repository *r,
-                                 const unsigned char *sha1, int flags);
-static inline int repo_has_sha1_file(struct repository *r,
-                                    const unsigned char *sha1)
-{
-       return repo_has_sha1_file_with_flags(r, sha1, 0);
-}
-
 #ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS
 #define has_sha1_file_with_flags(sha1, flags) repo_has_sha1_file_with_flags(the_repository, sha1, flags)
 #define has_sha1_file(sha1) repo_has_sha1_file(the_repository, sha1)
@@ -238,9 +227,9 @@ int repo_has_object_file_with_flags(struct repository *r,
  * with the specified name.  This function does not respect replace
  * references.
  */
-extern int has_loose_object_nonlocal(const struct object_id *);
+int has_loose_object_nonlocal(const struct object_id *);
 
-extern void assert_oid_type(const struct object_id *oid, enum object_type expect);
+void assert_oid_type(const struct object_id *oid, enum object_type expect);
 
 struct object_info {
        /* Request */