Merge branch 'ak/typofixes'

* ak/typofixes:
t/lib-terminal.sh: fix typo
pack-bitmap: fix typo

diff --combined pack-bitmap.c
index 6a818419ca46f8d66adbeb0027da49e6bab1bfa3,40cbeabe68ed694c8373b7c53f4bb6c02c5a2678..3281df389e23e2fdf220e3b8aa74f4051f397c74
--- 1/pack-bitmap.c
--- 2/pack-bitmap.c
+++ b/pack-bitmap.c
@@@ -60,7 -60,7 +60,7 @@@ static struct bitmap_index 
        struct ewah_bitmap *blobs;
        struct ewah_bitmap *tags;
  
-       /* Map from SHA1 -> `stored_bitmap` for all the bitmapped comits */
+       /* Map from SHA1 -> `stored_bitmap` for all the bitmapped commits */
        khash_sha1 *bitmaps;
  
        /* Number of bitmapped commits */
@@@ -197,24 -197,13 +197,24 @@@ static struct stored_bitmap *store_bitm
        return stored;
  }
  
 +static inline uint32_t read_be32(const unsigned char *buffer, size_t *pos)
 +{
 +      uint32_t result = get_be32(buffer + *pos);
 +      (*pos) += sizeof(result);
 +      return result;
 +}
 +
 +static inline uint8_t read_u8(const unsigned char *buffer, size_t *pos)
 +{
 +      return buffer[(*pos)++];
 +}
 +
  static int load_bitmap_entries_v1(struct bitmap_index *index)
  {
        static const size_t MAX_XOR_OFFSET = 160;
  
        uint32_t i;
        struct stored_bitmap **recent_bitmaps;
 -      struct bitmap_disk_entry *entry;
  
        recent_bitmaps = xcalloc(MAX_XOR_OFFSET, sizeof(struct stored_bitmap));
  
@@@ -225,12 -214,15 +225,12 @@@
                uint32_t commit_idx_pos;
                const unsigned char *sha1;
  
 -              entry = (struct bitmap_disk_entry *)(index->map + index->map_pos);
 -              index->map_pos += sizeof(struct bitmap_disk_entry);
 +              commit_idx_pos = read_be32(index->map, &index->map_pos);
 +              xor_offset = read_u8(index->map, &index->map_pos);
 +              flags = read_u8(index->map, &index->map_pos);
  
 -              commit_idx_pos = ntohl(entry->object_pos);
                sha1 = nth_packed_object_sha1(index->pack, commit_idx_pos);
  
 -              xor_offset = (int)entry->xor_offset;
 -              flags = (int)entry->flags;
 -
                bitmap = read_bitmap_1(index);
                if (!bitmap)
                        return -1;
@@@ -408,8 -400,10 +408,8 @@@ static int ext_index_add_object(struct 
        if (hash_ret > 0) {
                if (eindex->count >= eindex->alloc) {
                        eindex->alloc = (eindex->alloc + 16) * 3 / 2;
 -                      eindex->objects = xrealloc(eindex->objects,
 -                              eindex->alloc * sizeof(struct object *));
 -                      eindex->hashes = xrealloc(eindex->hashes,
 -                              eindex->alloc * sizeof(uint32_t));
 +                      REALLOC_ARRAY(eindex->objects, eindex->alloc);
 +                      REALLOC_ARRAY(eindex->hashes, eindex->alloc);
                }
  
                bitmap_pos = eindex->count;