[PATCH] Documentation/repository-layout.txt typo

[git.git] / cache.h

diff --git a/cache.h b/cache.h
index e4f4664..dcfcbbc 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -54,17 +54,6 @@
 #define DEFAULT_GIT_PORT 9418
 
 /*
- * Environment variables transition.
- * We accept older names for now but warn.
- */
-extern char *gitenv_bc(const char *);
-#ifdef __GNUC__
-#define gitenv(e) (getenv(e) ? : gitenv_bc(e))
-#else
-#define gitenv(e) (getenv(e) ? getenv(e) : gitenv_bc(e))
-#endif
-
-/*
  * Basic data structures for the directory cache
  */
 
@@ -104,7 +93,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 +276,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 +289,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 +302,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 +316,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);