mirror of
https://github.com/git/git.git
synced 2024-05-06 04:06:14 +02:00
Merge branch 'ab/misc-cleanup'
Code clean-up. * ab/misc-cleanup: alloc.[ch]: remove alloc_report() function object-store.h: remove unused has_sha1_file*() pack-bitmap-write: remove unused bitmap_reset() function xdiff/xmacros.h: remove unused XDL_PTRFREE configure.ac: remove USE_PIC comment run-command.h: remove always unused "clean_on_exit_handler_cbdata"
This commit is contained in:
commit
88cbd17e87
21
alloc.c
21
alloc.c
|
@ -27,7 +27,6 @@ union any_object {
|
||||||
};
|
};
|
||||||
|
|
||||||
struct alloc_state {
|
struct alloc_state {
|
||||||
int count; /* total number of nodes allocated */
|
|
||||||
int nr; /* number of nodes left in current allocation */
|
int nr; /* number of nodes left in current allocation */
|
||||||
void *p; /* first free node in current allocation */
|
void *p; /* first free node in current allocation */
|
||||||
|
|
||||||
|
@ -63,7 +62,6 @@ static inline void *alloc_node(struct alloc_state *s, size_t node_size)
|
||||||
s->slabs[s->slab_nr++] = s->p;
|
s->slabs[s->slab_nr++] = s->p;
|
||||||
}
|
}
|
||||||
s->nr--;
|
s->nr--;
|
||||||
s->count++;
|
|
||||||
ret = s->p;
|
ret = s->p;
|
||||||
s->p = (char *)s->p + node_size;
|
s->p = (char *)s->p + node_size;
|
||||||
memset(ret, 0, node_size);
|
memset(ret, 0, node_size);
|
||||||
|
@ -122,22 +120,3 @@ void *alloc_commit_node(struct repository *r)
|
||||||
init_commit_node(c);
|
init_commit_node(c);
|
||||||
return c;
|
return c;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void report(const char *name, unsigned int count, size_t size)
|
|
||||||
{
|
|
||||||
fprintf(stderr, "%10s: %8u (%"PRIuMAX" kB)\n",
|
|
||||||
name, count, (uintmax_t) size);
|
|
||||||
}
|
|
||||||
|
|
||||||
#define REPORT(name, type) \
|
|
||||||
report(#name, r->parsed_objects->name##_state->count, \
|
|
||||||
r->parsed_objects->name##_state->count * sizeof(type) >> 10)
|
|
||||||
|
|
||||||
void alloc_report(struct repository *r)
|
|
||||||
{
|
|
||||||
REPORT(blob, struct blob);
|
|
||||||
REPORT(tree, struct tree);
|
|
||||||
REPORT(commit, struct commit);
|
|
||||||
REPORT(tag, struct tag);
|
|
||||||
REPORT(object, union any_object);
|
|
||||||
}
|
|
||||||
|
|
1
alloc.h
1
alloc.h
|
@ -13,7 +13,6 @@ void init_commit_node(struct commit *c);
|
||||||
void *alloc_commit_node(struct repository *r);
|
void *alloc_commit_node(struct repository *r);
|
||||||
void *alloc_tag_node(struct repository *r);
|
void *alloc_tag_node(struct repository *r);
|
||||||
void *alloc_object_node(struct repository *r);
|
void *alloc_object_node(struct repository *r);
|
||||||
void alloc_report(struct repository *r);
|
|
||||||
|
|
||||||
struct alloc_state *allocate_alloc_state(void);
|
struct alloc_state *allocate_alloc_state(void);
|
||||||
void clear_alloc_state(struct alloc_state *s);
|
void clear_alloc_state(struct alloc_state *s);
|
||||||
|
|
|
@ -1189,9 +1189,6 @@ AC_COMPILE_IFELSE([BSD_SYSCTL_SRC],
|
||||||
GIT_CONF_SUBST([HAVE_BSD_SYSCTL])
|
GIT_CONF_SUBST([HAVE_BSD_SYSCTL])
|
||||||
|
|
||||||
## Other checks.
|
## Other checks.
|
||||||
# Define USE_PIC if you need the main git objects to be built with -fPIC
|
|
||||||
# in order to build and link perl/Git.so. x86-64 seems to need this.
|
|
||||||
#
|
|
||||||
# Define NO_SYMLINK_HEAD if you never want .git/HEAD to be a symbolic link.
|
# Define NO_SYMLINK_HEAD if you never want .git/HEAD to be a symbolic link.
|
||||||
# Enable it on Windows. By default, symrefs are still used.
|
# Enable it on Windows. By default, symrefs are still used.
|
||||||
#
|
#
|
||||||
|
|
|
@ -11,21 +11,6 @@ expression G;
|
||||||
+ repo_read_object_file(the_repository,
|
+ repo_read_object_file(the_repository,
|
||||||
E, F, G)
|
E, F, G)
|
||||||
|
|
||||||
@@
|
|
||||||
expression E;
|
|
||||||
@@
|
|
||||||
- has_sha1_file(
|
|
||||||
+ repo_has_sha1_file(the_repository,
|
|
||||||
E)
|
|
||||||
|
|
||||||
@@
|
|
||||||
expression E;
|
|
||||||
expression F;
|
|
||||||
@@
|
|
||||||
- has_sha1_file_with_flags(
|
|
||||||
+ repo_has_sha1_file_with_flags(the_repository,
|
|
||||||
E)
|
|
||||||
|
|
||||||
@@
|
@@
|
||||||
expression E;
|
expression E;
|
||||||
@@
|
@@
|
||||||
|
|
|
@ -216,11 +216,6 @@ int bitmap_is_subset(struct bitmap *self, struct bitmap *other)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void bitmap_reset(struct bitmap *bitmap)
|
|
||||||
{
|
|
||||||
memset(bitmap->words, 0x0, bitmap->word_alloc * sizeof(eword_t));
|
|
||||||
}
|
|
||||||
|
|
||||||
void bitmap_free(struct bitmap *bitmap)
|
void bitmap_free(struct bitmap *bitmap)
|
||||||
{
|
{
|
||||||
if (bitmap == NULL)
|
if (bitmap == NULL)
|
||||||
|
|
|
@ -177,7 +177,6 @@ struct bitmap *bitmap_dup(const struct bitmap *src);
|
||||||
void bitmap_set(struct bitmap *self, size_t pos);
|
void bitmap_set(struct bitmap *self, size_t pos);
|
||||||
void bitmap_unset(struct bitmap *self, size_t pos);
|
void bitmap_unset(struct bitmap *self, size_t pos);
|
||||||
int bitmap_get(struct bitmap *self, size_t pos);
|
int bitmap_get(struct bitmap *self, size_t pos);
|
||||||
void bitmap_reset(struct bitmap *self);
|
|
||||||
void bitmap_free(struct bitmap *self);
|
void bitmap_free(struct bitmap *self);
|
||||||
int bitmap_equals(struct bitmap *self, struct bitmap *other);
|
int bitmap_equals(struct bitmap *self, struct bitmap *other);
|
||||||
int bitmap_is_subset(struct bitmap *self, struct bitmap *other);
|
int bitmap_is_subset(struct bitmap *self, struct bitmap *other);
|
||||||
|
|
|
@ -312,10 +312,6 @@ int has_object(struct repository *r, const struct object_id *oid,
|
||||||
* These functions can be removed once all callers have migrated to
|
* These functions can be removed once all callers have migrated to
|
||||||
* has_object() and/or oid_object_info_extended().
|
* has_object() and/or oid_object_info_extended().
|
||||||
*/
|
*/
|
||||||
#ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS
|
|
||||||
#define has_sha1_file_with_flags(sha1, flags) repo_has_sha1_file_with_flags(the_repository, sha1, flags)
|
|
||||||
#define has_sha1_file(sha1) repo_has_sha1_file(the_repository, sha1)
|
|
||||||
#endif
|
|
||||||
int repo_has_object_file(struct repository *r, const struct object_id *oid);
|
int repo_has_object_file(struct repository *r, const struct object_id *oid);
|
||||||
int repo_has_object_file_with_flags(struct repository *r,
|
int repo_has_object_file_with_flags(struct repository *r,
|
||||||
const struct object_id *oid, int flags);
|
const struct object_id *oid, int flags);
|
||||||
|
|
|
@ -142,7 +142,6 @@ struct child_process {
|
||||||
unsigned clean_on_exit:1;
|
unsigned clean_on_exit:1;
|
||||||
unsigned wait_after_clean:1;
|
unsigned wait_after_clean:1;
|
||||||
void (*clean_on_exit_handler)(struct child_process *process);
|
void (*clean_on_exit_handler)(struct child_process *process);
|
||||||
void *clean_on_exit_handler_cbdata;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#define CHILD_PROCESS_INIT { \
|
#define CHILD_PROCESS_INIT { \
|
||||||
|
|
|
@ -34,7 +34,6 @@
|
||||||
#define XDL_ADDBITS(v,b) ((v) + ((v) >> (b)))
|
#define XDL_ADDBITS(v,b) ((v) + ((v) >> (b)))
|
||||||
#define XDL_MASKBITS(b) ((1UL << (b)) - 1)
|
#define XDL_MASKBITS(b) ((1UL << (b)) - 1)
|
||||||
#define XDL_HASHLONG(v,b) (XDL_ADDBITS((unsigned long)(v), b) & XDL_MASKBITS(b))
|
#define XDL_HASHLONG(v,b) (XDL_ADDBITS((unsigned long)(v), b) & XDL_MASKBITS(b))
|
||||||
#define XDL_PTRFREE(p) do { if (p) { xdl_free(p); (p) = NULL; } } while (0)
|
|
||||||
#define XDL_LE32_PUT(p, v) \
|
#define XDL_LE32_PUT(p, v) \
|
||||||
do { \
|
do { \
|
||||||
unsigned char *__p = (unsigned char *) (p); \
|
unsigned char *__p = (unsigned char *) (p); \
|
||||||
|
|
Loading…
Reference in New Issue