From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 25 Apr 2019 07:41:13 +0000 (+0900)
Subject: Merge branch 'jk/server-info-rabbit-hole'
X-Git-Tag: v2.22.0-rc0~70
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=776f3e1fb73a6440804aa3dde4ffd3b6bdf60a19;p=thirdparty%2Fgit.git

Merge branch 'jk/server-info-rabbit-hole'

Code clean-up around a much-less-important-than-it-used-to-be
update_server_info() funtion.

* jk/server-info-rabbit-hole:
  update_info_refs(): drop unused force parameter
  server-info: drop objdirlen pointer arithmetic
  server-info: drop nr_alloc struct member
  server-info: use strbuf to read old info/packs file
  server-info: simplify cleanup in parse_pack_def()
  server-info: fix blind pointer arithmetic
  http: simplify parsing of remote objects/info/packs
  packfile: fix pack basename computation
  midx: check both pack and index names for containment
  t5319: drop useless --buffer from cat-file
  t5319: fix bogus cat-file argument
  pack-revindex: open index if necessary
  packfile.h: drop extern from function declarations
---

776f3e1fb73a6440804aa3dde4ffd3b6bdf60a19
diff --cc packfile.h
index b1c18504eb,fe05fe0303..12baa6118a
--- a/packfile.h
+++ b/packfile.h
@@@ -74,19 -80,17 +80,19 @@@ int open_pack_index(struct packed_git *
   * munmap the index file for the specified packfile (if it is
   * currently mmapped).
   */
- extern void close_pack_index(struct packed_git *);
+ void close_pack_index(struct packed_git *);
  
 +int close_pack_fd(struct packed_git *p);
 +
- extern uint32_t get_pack_fanout(struct packed_git *p, uint32_t value);
+ uint32_t get_pack_fanout(struct packed_git *p, uint32_t value);
  
- extern unsigned char *use_pack(struct packed_git *, struct pack_window **, off_t, unsigned long *);
- extern void close_pack_windows(struct packed_git *);
- extern void close_pack(struct packed_git *);
- extern void close_all_packs(struct raw_object_store *o);
- extern void unuse_pack(struct pack_window **);
- extern void clear_delta_base_cache(void);
- extern struct packed_git *add_packed_git(const char *path, size_t path_len, int local);
+ unsigned char *use_pack(struct packed_git *, struct pack_window **, off_t, unsigned long *);
+ void close_pack_windows(struct packed_git *);
+ void close_pack(struct packed_git *);
+ void close_all_packs(struct raw_object_store *o);
+ void unuse_pack(struct pack_window **);
+ void clear_delta_base_cache(void);
+ struct packed_git *add_packed_git(const char *path, size_t path_len, int local);
  
  /*
   * Make sure that a pointer access into an mmap'd index file is within bounds,