{"thread":{"id":"5262","subject":"[PATCH 13/28] builtin-unpack-objects.c cleanup","startedAt":"2006-08-14T20:30:13Z","lastAt":"2006-08-14T20:30:13Z","messageCount":1,"participants":["David Rientjes"],"isPatch":true,"patchVersion":1,"patchTotal":28},"messages":[{"id":"25293","messageId":"Pine.LNX.4.63.0608141329070.19383@chino.corp.google.com","threadId":"5262","inReplyTo":null,"subject":"[PATCH 13/28] builtin-unpack-objects.c cleanup","fromName":"David Rientjes","fromEmail":"rientjes@google.com","sentAt":"2006-08-14T20:30:13Z","receivedAt":"2006-08-14T20:30:13Z","isPatch":true,"sender":{"key":"rientjes@google.com","avatar":null},"body":"Makes resolve_delta, added_object, unpack_non_delta_entry, and \nunpack_delta_entry void.\n\n\t\tDavid\n\nSigned-off-by: David Rientjes <rientjes@google.com>\n---\n builtin-unpack-objects.c |   23 ++++++++++-------------\n 1 files changed, 10 insertions(+), 13 deletions(-)\n\ndiff --git a/builtin-unpack-objects.c b/builtin-unpack-objects.c\nindex 63f4b8e..e65f80e 100644\n--- a/builtin-unpack-objects.c\n+++ b/builtin-unpack-objects.c\n@@ -112,9 +112,9 @@ static void write_object(void *buf, unsi\n \tadded_object(sha1, type, buf, size);\n }\n \n-static int resolve_delta(const char *type,\n-\tvoid *base, unsigned long base_size,\n-\tvoid *delta, unsigned long delta_size)\n+static void resolve_delta(const char *type,\n+\t\t\t  void *base, unsigned long base_size,\n+\t\t\t  void *delta, unsigned long delta_size)\n {\n \tvoid *result;\n \tunsigned long result_size;\n@@ -127,10 +127,10 @@ static int resolve_delta(const char *typ\n \tfree(delta);\n \twrite_object(result, result_size, type);\n \tfree(result);\n-\treturn 0;\n }\n \n-static void added_object(unsigned char *sha1, const char *type, void *data, unsigned long size)\n+static void added_object(unsigned char *sha1, const char *type, void *data,\n+\t\t\t unsigned long size)\n {\n \tstruct delta_info **p = &delta_list;\n \tstruct delta_info *info;\n@@ -147,7 +147,7 @@ static void added_object(unsigned char *\n \t}\n }\n \n-static int unpack_non_delta_entry(enum object_type kind, unsigned long size)\n+static void unpack_non_delta_entry(enum object_type kind, unsigned long size)\n {\n \tvoid *buf = get_data(size);\n \tconst char *type;\n@@ -162,16 +162,14 @@ static int unpack_non_delta_entry(enum o\n \tif (!dry_run)\n \t\twrite_object(buf, size, type);\n \tfree(buf);\n-\treturn 0;\n }\n \n-static int unpack_delta_entry(unsigned long delta_size)\n+static void unpack_delta_entry(unsigned long delta_size)\n {\n \tvoid *delta_data, *base;\n \tunsigned long base_size;\n \tchar type[20];\n \tunsigned char base_sha1[20];\n-\tint result;\n \n \tmemcpy(base_sha1, fill(20), 20);\n \tuse(20);\n@@ -179,19 +177,18 @@ static int unpack_delta_entry(unsigned l\n \tdelta_data = get_data(delta_size);\n \tif (dry_run) {\n \t\tfree(delta_data);\n-\t\treturn 0;\n+\t\treturn;\n \t}\n \n \tif (!has_sha1_file(base_sha1)) {\n \t\tadd_delta_to_list(base_sha1, delta_data, delta_size);\n-\t\treturn 0;\n+\t\treturn;\n \t}\n \tbase = read_sha1_file(base_sha1, type, &base_size);\n \tif (!base)\n \t\tdie(\"failed to read delta-pack base object %s\", sha1_to_hex(base_sha1));\n-\tresult = resolve_delta(type, base, base_size, delta_data, delta_size);\n+\tresolve_delta(type, base, base_size, delta_data, delta_size);\n \tfree(base);\n-\treturn result;\n }\n \n static void unpack_one(unsigned nr, unsigned total)\n-- \n1.4.2.g89bb-dirty\n"}]}