{"thread":{"id":"5258","subject":"[PATCH 09/28] makes prune_dir void","startedAt":"2006-08-14T20:26:15Z","lastAt":"2006-08-14T20:26:15Z","messageCount":1,"participants":["David Rientjes"],"isPatch":true,"patchVersion":1,"patchTotal":28},"messages":[{"id":"25289","messageId":"Pine.LNX.4.63.0608141325350.19383@chino.corp.google.com","threadId":"5258","inReplyTo":null,"subject":"[PATCH 09/28] makes prune_dir void","fromName":"David Rientjes","fromEmail":"rientjes@google.com","sentAt":"2006-08-14T20:26:15Z","receivedAt":"2006-08-14T20:26:15Z","isPatch":true,"sender":{"key":"rientjes@google.com","avatar":null},"body":"Makes prune_dir void and cleans up function calls.\n\n\t\tDavid\n\nSigned-off-by: David Rientjes <rientjes@google.com>\n---\n builtin-prune.c |   15 +++++++--------\n 1 files changed, 7 insertions(+), 8 deletions(-)\n\ndiff --git a/builtin-prune.c b/builtin-prune.c\nindex 89ec7f1..f01f275 100644\n--- a/builtin-prune.c\n+++ b/builtin-prune.c\n@@ -14,24 +14,24 @@ static const char prune_usage[] = \"git-p\n static int show_only = 0;\n static struct rev_info revs;\n \n-static int prune_object(char *path, const char *filename, const unsigned char *sha1)\n+static void prune_object(char *path, const char *filename,\n+\t\t\t const unsigned char *sha1)\n {\n \tif (show_only) {\n \t\tprintf(\"would prune %s/%s\\n\", path, filename);\n-\t\treturn 0;\n+\t} else {\n+\t\tunlink(mkpath(\"%s/%s\", path, filename));\n+\t\trmdir(path);\n \t}\n-\tunlink(mkpath(\"%s/%s\", path, filename));\n-\trmdir(path);\n-\treturn 0;\n }\n \n-static int prune_dir(int i, char *path)\n+static void prune_dir(int i, char *path)\n {\n \tDIR *dir = opendir(path);\n \tstruct dirent *de;\n \n \tif (!dir)\n-\t\treturn 0;\n+\t\treturn;\n \n \twhile ((de = readdir(dir)) != NULL) {\n \t\tchar name[100];\n@@ -65,7 +65,6 @@ static int prune_dir(int i, char *path)\n \t\tfprintf(stderr, \"bad sha1 file: %s/%s\\n\", path, de->d_name);\n \t}\n \tclosedir(dir);\n-\treturn 0;\n }\n \n static void prune_object_dir(const char *path)\n-- \n1.4.2.g89bb-dirty\n"}]}