{"thread":{"id":"5389","subject":"[PATCH 1/5] Reorganize/rename unpack_non_delta_entry to unpack_compressed_entry.","startedAt":"2006-08-26T08:10:43Z","lastAt":"2006-08-26T08:10:43Z","messageCount":1,"participants":["Shawn Pearce"],"isPatch":true,"patchVersion":1,"patchTotal":5},"messages":[{"id":"25925","messageId":"20060826081043.GC22343@spearce.org","threadId":"5389","inReplyTo":null,"subject":"[PATCH 1/5] Reorganize/rename unpack_non_delta_entry to unpack_compressed_entry.","fromName":"Shawn Pearce","fromEmail":"spearce@spearce.org","sentAt":"2006-08-26T08:10:43Z","receivedAt":"2006-08-26T08:10:43Z","isPatch":true,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"This function was moved above unpack_delta_entry so we can call it\nfrom within unpack_delta_entry without a forward declaration.\n\nThis change looks worse than it is.  Its really just a relocation\nof unpack_non_delta_entry to earlier in the file and renaming the\nfunction to unpack_compressed_entry.  No other changes were made.\n\nSigned-off-by: Shawn O. Pearce <spearce@spearce.org>\n---\n sha1_file.c |   56 ++++++++++++++++++++++++++++----------------------------\n 1 files changed, 28 insertions(+), 28 deletions(-)\n\ndiff --git a/sha1_file.c b/sha1_file.c\nindex 066cff1..024b605 100644\n--- a/sha1_file.c\n+++ b/sha1_file.c\n@@ -1057,6 +1057,33 @@ static int packed_object_info(struct pac\n \treturn 0;\n }\n \n+static void *unpack_compressed_entry(unsigned char *data,\n+\t\t\t\t    unsigned long size,\n+\t\t\t\t    unsigned long left)\n+{\n+\tint st;\n+\tz_stream stream;\n+\tunsigned char *buffer;\n+\n+\tbuffer = xmalloc(size + 1);\n+\tbuffer[size] = 0;\n+\tmemset(&stream, 0, sizeof(stream));\n+\tstream.next_in = data;\n+\tstream.avail_in = left;\n+\tstream.next_out = buffer;\n+\tstream.avail_out = size;\n+\n+\tinflateInit(&stream);\n+\tst = inflate(&stream, Z_FINISH);\n+\tinflateEnd(&stream);\n+\tif ((st != Z_STREAM_END) || stream.total_out != size) {\n+\t\tfree(buffer);\n+\t\treturn NULL;\n+\t}\n+\n+\treturn buffer;\n+}\n+\n static void *unpack_delta_entry(unsigned char *base_sha1,\n \t\t\t\tunsigned long delta_size,\n \t\t\t\tunsigned long left,\n@@ -1110,33 +1137,6 @@ static void *unpack_delta_entry(unsigned\n \treturn result;\n }\n \n-static void *unpack_non_delta_entry(unsigned char *data,\n-\t\t\t\t    unsigned long size,\n-\t\t\t\t    unsigned long left)\n-{\n-\tint st;\n-\tz_stream stream;\n-\tunsigned char *buffer;\n-\n-\tbuffer = xmalloc(size + 1);\n-\tbuffer[size] = 0;\n-\tmemset(&stream, 0, sizeof(stream));\n-\tstream.next_in = data;\n-\tstream.avail_in = left;\n-\tstream.next_out = buffer;\n-\tstream.avail_out = size;\n-\n-\tinflateInit(&stream);\n-\tst = inflate(&stream, Z_FINISH);\n-\tinflateEnd(&stream);\n-\tif ((st != Z_STREAM_END) || stream.total_out != size) {\n-\t\tfree(buffer);\n-\t\treturn NULL;\n-\t}\n-\n-\treturn buffer;\n-}\n-\n static void *unpack_entry(struct pack_entry *entry,\n \t\t\t  char *type, unsigned long *sizep)\n {\n@@ -1185,7 +1185,7 @@ void *unpack_entry_gently(struct pack_en\n \t\treturn NULL;\n \t}\n \t*sizep = size;\n-\tretval = unpack_non_delta_entry(pack, size, left);\n+\tretval = unpack_compressed_entry(pack, size, left);\n \treturn retval;\n }\n \n-- \n1.4.2.g6580\n"}]}