X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=cache.h;h=f0c9b01aa394c0a9a356f4b661141b77a0d7c9f6;hb=7eb93c89651c47c8095d476251f2e4314656b292;hp=e4f4664572ae3b6d58f04a87fe57ab8b460dd48f;hpb=c7c81b3a51de2778535c8bb18d42a4bb7dfd57bc;p=git.git

diff --git a/cache.h b/cache.h
index e4f46645..f0c9b01a 100644
--- a/cache.h
+++ b/cache.h
@@ -104,7 +104,7 @@ struct cache_entry {
 	unsigned int ce_size;
 	unsigned char sha1[20];
 	unsigned short ce_flags;
-	char name[];
+	char name[0];
 };
 
 #define CE_NAMEMASK  (0x0fff)
@@ -287,7 +287,7 @@ extern int checkout_entry(struct cache_entry *ce, struct checkout *state);
 extern struct alternate_object_database {
 	struct alternate_object_database *next;
 	char *name;
-	char base[]; /* more */
+	char base[0]; /* more */
 } *alt_odb_list;
 extern void prepare_alt_odb(void);
 
@@ -300,7 +300,7 @@ extern struct packed_git {
 	unsigned int pack_last_used;
 	unsigned int pack_use_cnt;
 	unsigned char sha1[20];
-	char pack_name[]; /* something like ".git/objects/pack/xxxxx.pack" */
+	char pack_name[0]; /* something like ".git/objects/pack/xxxxx.pack" */
 } *packed_git;
 
 struct pack_entry {
@@ -313,8 +313,9 @@ struct ref {
 	struct ref *next;
 	unsigned char old_sha1[20];
 	unsigned char new_sha1[20];
+	unsigned char force;
 	struct ref *peer_ref; /* when renaming */
-	char name[];
+	char name[0];
 };
 
 extern int git_connect(int fd[2], char *url, const char *prog);
@@ -326,7 +327,7 @@ extern int get_ack(int fd, unsigned char *result_sha1);
 extern struct ref **get_remote_heads(int in, struct ref **list, int nr_match, char **match);
 
 extern struct packed_git *parse_pack_index(unsigned char *sha1);
-extern struct packed_git *parse_pack_index_file(unsigned char *sha1, 
+extern struct packed_git *parse_pack_index_file(const unsigned char *sha1,
 						char *idx_path);
 
 extern void prepare_packed_git(void);