summaryrefslogtreecommitdiff
path: root/object-store.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-05-13 14:50:32 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-05-13 14:50:32 (GMT)
commit4aeeef377347934d6f459e27f7d793de4ce384bb (patch)
treea8031c9623eac896bf474ba2158e39afc6abb5b3 /object-store.h
parent2bfb182bc544214b3a15058b52b3a00c9811e3c2 (diff)
parentad6dad0996f9226b2c3a5a3c725bf2952e52d7e7 (diff)
downloadgit-4aeeef377347934d6f459e27f7d793de4ce384bb.zip
git-4aeeef377347934d6f459e27f7d793de4ce384bb.tar.gz
git-4aeeef377347934d6f459e27f7d793de4ce384bb.tar.bz2
Merge branch 'dl/no-extern-in-func-decl'
Mechanically and systematically drop "extern" from function declarlation. * dl/no-extern-in-func-decl: *.[ch]: manually align parameter lists *.[ch]: remove extern from function declarations using sed *.[ch]: remove extern from function declarations using spatch
Diffstat (limited to 'object-store.h')
-rw-r--r--object-store.h32
1 files changed, 16 insertions, 16 deletions
diff --git a/object-store.h b/object-store.h
index b086f5e..46a1da7 100644
--- a/object-store.h
+++ b/object-store.h
@@ -162,10 +162,10 @@ const char *loose_object_path(struct repository *r, struct strbuf *buf,
void *map_loose_object(struct repository *r, const struct object_id *oid,
unsigned long *size);
-extern void *read_object_file_extended(struct repository *r,
- const struct object_id *oid,
- enum object_type *type,
- unsigned long *size, int lookup_replace);
+void *read_object_file_extended(struct repository *r,
+ const struct object_id *oid,
+ enum object_type *type,
+ unsigned long *size, int lookup_replace);
static inline void *repo_read_object_file(struct repository *r,
const struct object_id *oid,
enum object_type *type,
@@ -180,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,
- const char *type, struct object_id *oid);
+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,
- const char *type, struct object_id *oid);
+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,
- const char *type, struct object_id *oid,
- unsigned flags);
+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,
- struct object_id *oid);
+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,
@@ -227,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 */