convert object type handling from a string to a number
We currently have two parallel notation for dealing with object types in the code: a string and a numerical value. One of them is obviously redundent, and the most used one requires more stack space and a bunch of strcmp() all over the place. This is an initial step for the removal of the version using a char array found in object reading code paths. The patch is unfortunately large but there is no sane way to split it in smaller parts without breaking the system. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
committed by
Junio C Hamano
parent
df8436622f
commit
21666f1aae
@ -479,7 +479,7 @@ static void start_put(struct transfer_request *request)
|
||||
char *hex = sha1_to_hex(request->obj->sha1);
|
||||
struct active_request_slot *slot;
|
||||
char *posn;
|
||||
char type[20];
|
||||
enum object_type type;
|
||||
char hdr[50];
|
||||
void *unpacked;
|
||||
unsigned long len;
|
||||
@ -487,8 +487,8 @@ static void start_put(struct transfer_request *request)
|
||||
ssize_t size;
|
||||
z_stream stream;
|
||||
|
||||
unpacked = read_sha1_file(request->obj->sha1, type, &len);
|
||||
hdrlen = sprintf(hdr, "%s %lu", type, len) + 1;
|
||||
unpacked = read_sha1_file(request->obj->sha1, &type, &len);
|
||||
hdrlen = sprintf(hdr, "%s %lu", typename(type), len) + 1;
|
||||
|
||||
/* Set it up */
|
||||
memset(&stream, 0, sizeof(stream));
|
||||
|
||||
Reference in New Issue
Block a user