git/pack-bitmap.c, branch v2.4.3

Merge branch 'rs/plug-leak-in-pack-bitmaps' into maint

2015-06-05T19:00:22Z

The code to read pack-bitmap wanted to allocate a few hundred pointers to a structure, but by mistake allocated and leaked memory enough to hold that many actual structures. Correct the allocation size and also have it on stack, as it is small enough. * rs/plug-leak-in-pack-bitmaps: pack-bitmaps: plug memory leak, fix allocation size for recent_bitmaps

pack-bitmaps: plug memory leak, fix allocation size for recent_bitmaps

2015-05-19T16:31:09Z

Use an automatic variable for recent_bitmaps, an array of pointers. This way we don't allocate too much and don't have to free the memory at the end. The old code over-allocated because it reserved enough memory to store all of the structs it is only pointing to and never freed it. 160 64-bit pointers take up 1280 bytes, which is not too much to be placed on the stack. MAX_XOR_OFFSET is turned into a preprocessor constant to make it constant enough for use in an non-variable array declaration. Noticed-by: Stefan Beller Suggested-by: Jeff King Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

Merge branch 'sb/test-bitmap-free-at-end' into maint

2015-05-13T21:05:56Z

* sb/test-bitmap-free-at-end: pack-bitmap.c: fix a memleak

pack-bitmap.c: fix a memleak

2015-04-13T04:45:27Z

Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano

Merge branch 'jc/unused-symbols'

2015-02-11T21:44:07Z

Mark file-local symbols as "static", and drop functions that nobody uses. * jc/unused-symbols: shallow.c: make check_shallow_file_for_update() static remote.c: make clear_cas_option() static urlmatch.c: make match_urls() static revision.c: make save_parents() and free_saved_parents() static line-log.c: make line_log_data_init() static pack-bitmap.c: make pack_bitmap_filename() static prompt.c: remove git_getpass() nobody uses http.c: make finish_active_slot() and handle_curl_result() static

Merge branch 'ak/typofixes'

2015-02-11T21:37:39Z

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

pack-bitmap: fix typo

2015-01-21T20:40:05Z

Signed-off-by: Alexander Kuleshov Signed-off-by: Junio C Hamano

pack-bitmap.c: make pack_bitmap_filename() static

2015-01-15T19:04:10Z

Reviewed-by: Jeff King Signed-off-by: Junio C Hamano

Merge branch 'jk/pack-bitmap'

2014-12-12T22:31:42Z

* jk/pack-bitmap: pack-bitmap: do not use gcc packed attribute

pack-bitmap: do not use gcc packed attribute

2014-12-01T02:07:34Z

The "__attribute__" flag may be a noop on some compilers. That's OK as long as the code is correct without the attribute, but in this case it is not. We would typically end up with a struct that is 2 bytes too long due to struct padding, breaking both reading and writing of bitmaps. Instead of marshalling the data in a struct, let's just provide helpers for reading and writing the appropriate types. Besides being correct on all platforms, the result is more efficient and simpler to read. Signed-off-by: Karsten Blees Signed-off-by: Jeff King Signed-off-by: Junio C Hamano