{"thread":{"id":"20757","subject":"[PATCH 0/2] Two janitorial patches","startedAt":"2009-08-27T16:16:32Z","lastAt":"2009-08-27T16:16:34Z","messageCount":3,"participants":["Brandon Casey"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"121873","messageId":"vODpKBYr5sNtCfB7C_mUMqGkpPTwc8quzfdAUjySMC_tekZRVbEOpzkstotoeMXAS6wJ4OaF2NA@cipher.nrlssc.navy.mil","threadId":"20757","inReplyTo":null,"subject":"[PATCH 0/2] Two janitorial patches","fromName":"Brandon Casey","fromEmail":"casey@nrlssc.navy.mil","sentAt":"2009-08-27T16:16:32Z","receivedAt":"2009-08-27T16:16:32Z","isPatch":true,"sender":{"key":"drafnel@gmail.com","avatar":"https://avatars.githubusercontent.com/u/921167?v=4"},"body":"Brandon Casey (2):\n  abspath.c: move declaration of 'len' into inner block and use\n    appropriate type\n  commit.c: rename variable named 'n' which masks previous declaration\n\n abspath.c |    6 +++---\n commit.c  |   10 +++++-----\n 2 files changed, 8 insertions(+), 8 deletions(-)\n"},{"id":"121875","messageId":"vODpKBYr5sNtCfB7C_mUMmQyYO9vzbX98QMYSBId5GcwHT7q6zvrKlJpRNwoJvTTF7qKScin5PA@cipher.nrlssc.navy.mil","threadId":"20757","inReplyTo":"vODpKBYr5sNtCfB7C_mUMqGkpPTwc8quzfdAUjySMC_tekZRVbEOpzkstotoeMXAS6wJ4OaF2NA@cipher.nrlssc.navy.mil","subject":"[PATCH 1/2] abspath.c: move declaration of 'len' into inner block and use appropriate type","fromName":"Brandon Casey","fromEmail":"casey@nrlssc.navy.mil","sentAt":"2009-08-27T16:16:33Z","receivedAt":"2009-08-27T16:16:33Z","isPatch":true,"sender":{"key":"drafnel@gmail.com","avatar":"https://avatars.githubusercontent.com/u/921167?v=4"},"body":"From: Brandon Casey <drafnel@gmail.com>\n\nThe 'len' variable was declared at the beginning of the make_absolute_path\nfunction and also in an inner 'if' block which masked the outer declaration.\nIt is only used in two 'if' blocks, so remove the outer declaration and\nmake a new declaration inside the other 'if' block that uses 'len'.\n\nSigned-off-by: Brandon Casey <casey@nrlssc.navy.mil>\n---\n abspath.c |    6 +++---\n 1 files changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/abspath.c b/abspath.c\nindex 4bee0ba..b88122c 100644\n--- a/abspath.c\n+++ b/abspath.c\n@@ -18,7 +18,7 @@ const char *make_absolute_path(const char *path)\n {\n \tstatic char bufs[2][PATH_MAX + 1], *buf = bufs[0], *next_buf = bufs[1];\n \tchar cwd[1024] = \"\";\n-\tint buf_index = 1, len;\n+\tint buf_index = 1;\n \n \tint depth = MAXDEPTH;\n \tchar *last_elem = NULL;\n@@ -50,7 +50,7 @@ const char *make_absolute_path(const char *path)\n \t\t\tdie_errno (\"Could not get current working directory\");\n \n \t\tif (last_elem) {\n-\t\t\tint len = strlen(buf);\n+\t\t\tsize_t len = strlen(buf);\n \t\t\tif (len + strlen(last_elem) + 2 > PATH_MAX)\n \t\t\t\tdie (\"Too long path name: '%s/%s'\",\n \t\t\t\t\t\tbuf, last_elem);\n@@ -61,7 +61,7 @@ const char *make_absolute_path(const char *path)\n \t\t}\n \n \t\tif (!lstat(buf, &st) && S_ISLNK(st.st_mode)) {\n-\t\t\tlen = readlink(buf, next_buf, PATH_MAX);\n+\t\t\tssize_t len = readlink(buf, next_buf, PATH_MAX);\n \t\t\tif (len < 0)\n \t\t\t\tdie_errno (\"Invalid symlink '%s'\", buf);\n \t\t\tif (PATH_MAX <= len)\n-- \n1.6.4\n"},{"id":"121874","messageId":"vODpKBYr5sNtCfB7C_mUMqn8szqSz58pySpTHpAGYAe6MTvKrSPNr0gs14tbOkuPF97cDvuGi2M@cipher.nrlssc.navy.mil","threadId":"20757","inReplyTo":"vODpKBYr5sNtCfB7C_mUMmQyYO9vzbX98QMYSBId5GcwHT7q6zvrKlJpRNwoJvTTF7qKScin5PA@cipher.nrlssc.navy.mil","subject":"[PATCH 2/2] commit.c: rename variable named 'n' which masks previous declaration","fromName":"Brandon Casey","fromEmail":"casey@nrlssc.navy.mil","sentAt":"2009-08-27T16:16:34Z","receivedAt":"2009-08-27T16:16:34Z","isPatch":true,"sender":{"key":"drafnel@gmail.com","avatar":"https://avatars.githubusercontent.com/u/921167?v=4"},"body":"From: Brandon Casey <drafnel@gmail.com>\n\nThe variable named 'n' was initially declared to be of type int.  The name\n'n' was reused inside inner blocks as a different type.  Rename the uses\nwithin inner blocks to avoid confusion and give them a slightly more\ndescriptive name.\n\nSigned-off-by: Brandon Casey <casey@nrlssc.navy.mil>\n---\n commit.c |   10 +++++-----\n 1 files changed, 5 insertions(+), 5 deletions(-)\n\ndiff --git a/commit.c b/commit.c\nindex e2bcbe8..a6c6f70 100644\n--- a/commit.c\n+++ b/commit.c\n@@ -564,13 +564,13 @@ static struct commit_list *merge_bases_many(struct commit *one, int n, struct co\n \twhile (interesting(list)) {\n \t\tstruct commit *commit;\n \t\tstruct commit_list *parents;\n-\t\tstruct commit_list *n;\n+\t\tstruct commit_list *next;\n \t\tint flags;\n \n \t\tcommit = list->item;\n-\t\tn = list->next;\n+\t\tnext = list->next;\n \t\tfree(list);\n-\t\tlist = n;\n+\t\tlist = next;\n \n \t\tflags = commit->object.flags & (PARENT1 | PARENT2 | STALE);\n \t\tif (flags == (PARENT1 | PARENT2)) {\n@@ -598,11 +598,11 @@ static struct commit_list *merge_bases_many(struct commit *one, int n, struct co\n \tfree_commit_list(list);\n \tlist = result; result = NULL;\n \twhile (list) {\n-\t\tstruct commit_list *n = list->next;\n+\t\tstruct commit_list *next = list->next;\n \t\tif (!(list->item->object.flags & STALE))\n \t\t\tinsert_by_date(list->item, &result);\n \t\tfree(list);\n-\t\tlist = n;\n+\t\tlist = next;\n \t}\n \treturn result;\n }\n-- \n1.6.4\n"}]}