projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/git/gitweb
[git.git]
/
blob.c
diff --git
a/blob.c
b/blob.c
index
d4af4a3
..
c1fdd86
100644
(file)
--- a/
blob.c
+++ b/
blob.c
@@
-1,19
+1,20
@@
-#include "blob.h"
#include "cache.h"
#include "cache.h"
+#include "blob.h"
#include <stdlib.h>
const char *blob_type = "blob";
#include <stdlib.h>
const char *blob_type = "blob";
-struct blob *lookup_blob(unsigned char *sha1)
+struct blob *lookup_blob(
const
unsigned char *sha1)
{
struct object *obj = lookup_object(sha1);
if (!obj) {
{
struct object *obj = lookup_object(sha1);
if (!obj) {
- struct blob *ret = xmalloc(sizeof(struct blob));
- memset(ret, 0, sizeof(struct blob));
+ struct blob *ret = xcalloc(1, sizeof(struct blob));
created_object(sha1, &ret->object);
ret->object.type = blob_type;
return ret;
}
created_object(sha1, &ret->object);
ret->object.type = blob_type;
return ret;
}
+ if (!obj->type)
+ obj->type = blob_type;
if (obj->type != blob_type) {
error("Object %s is a %s, not a blob",
sha1_to_hex(sha1), obj->type);
if (obj->type != blob_type) {
error("Object %s is a %s, not a blob",
sha1_to_hex(sha1), obj->type);
@@
-22,14
+23,21
@@
struct blob *lookup_blob(unsigned char *sha1)
return (struct blob *) obj;
}
return (struct blob *) obj;
}
+int parse_blob_buffer(struct blob *item, void *buffer, unsigned long size)
+{
+ item->object.parsed = 1;
+ return 0;
+}
+
int parse_blob(struct blob *item)
{
char type[20];
void *buffer;
unsigned long size;
int parse_blob(struct blob *item)
{
char type[20];
void *buffer;
unsigned long size;
+ int ret;
+
if (item->object.parsed)
return 0;
if (item->object.parsed)
return 0;
- item->object.parsed = 1;
buffer = read_sha1_file(item->object.sha1, type, &size);
if (!buffer)
return error("Could not read %s",
buffer = read_sha1_file(item->object.sha1, type, &size);
if (!buffer)
return error("Could not read %s",
@@
-37,5
+45,7
@@
int parse_blob(struct blob *item)
if (strcmp(type, blob_type))
return error("Object %s not a blob",
sha1_to_hex(item->object.sha1));
if (strcmp(type, blob_type))
return error("Object %s not a blob",
sha1_to_hex(item->object.sha1));
- return 0;
+ ret = parse_blob_buffer(item, buffer, size);
+ free(buffer);
+ return ret;
}
}