mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'pe/cleanup'

Browse Source 
* pe/cleanup:
  Replace xmalloc+memset(0) with xcalloc.
  Use blob_, commit_, tag_, and tree_type throughout.
This commit is contained in:
Junio C Hamano
2006-04-04 13:43:00 -07:00
parent 4c61b7d15a 90321c106c
commit 810e152375
30 changed files with 120 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pack-objects.c
View File

@ -1,5 +1,9 @@
#include "cache.h"
#include "object.h"
#include "blob.h"
#include "commit.h"
#include "tag.h"
#include "tree.h"
#include "delta.h"
#include "pack.h"
#include "csum-file.h"
@ -603,7 +607,7 @@ static void add_pbase_tree(struct tree_desc *tree, struct name_path *up)
if (!add_object_entry(sha1, hash, 1))
continue;
if (!strcmp(type, "tree")) {
if (!strcmp(type, tree_type)) {
struct tree_desc sub;
void *elem;
struct name_path me;
@ -626,7 +630,7 @@ static void add_preferred_base(unsigned char *sha1)
struct tree_desc tree;
void *elem;
elem = read_object_with_reference(sha1, "tree", &tree.size, NULL);
elem = read_object_with_reference(sha1, tree_type, &tree.size, NULL);
tree.buf = elem;
if (!tree.buf)
return;
@ -684,13 +688,13 @@ static void check_object(struct object_entry *entry)
die("unable to get type of object %s",
sha1_to_hex(entry->sha1));
if (!strcmp(type, "commit")) {
if (!strcmp(type, commit_type)) {
entry->type = OBJ_COMMIT;
} else if (!strcmp(type, "tree")) {
} else if (!strcmp(type, tree_type)) {
entry->type = OBJ_TREE;
} else if (!strcmp(type, "blob")) {
} else if (!strcmp(type, blob_type)) {
entry->type = OBJ_BLOB;
} else if (!strcmp(type, "tag")) {
} else if (!strcmp(type, tag_type)) {
entry->type = OBJ_TAG;
} else
die("unable to pack object %s of type %s",