# [PATCH 0/2] Two janitorial patches 3 messages from 2009-08-27 to 2009-08-27. Participants: Brandon Casey. Thread: https://gitlist.dev/t/20757 ## Brandon Casey, 2009-08-27 16:16 Subject: [PATCH 0/2] Two janitorial patches Message-ID: URL: https://gitlist.dev/e/vODpKBYr5sNtCfB7C_mUMqGkpPTwc8quzfdAUjySMC_tekZRVbEOpzkstotoeMXAS6wJ4OaF2NA%40cipher.nrlssc.navy.mil ``` Brandon Casey (2): abspath.c: move declaration of 'len' into inner block and use appropriate type commit.c: rename variable named 'n' which masks previous declaration abspath.c | 6 +++--- commit.c | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) ``` ## Brandon Casey, 2009-08-27 16:16 Subject: [PATCH 1/2] abspath.c: move declaration of 'len' into inner block and use appropriate type Message-ID: URL: https://gitlist.dev/e/vODpKBYr5sNtCfB7C_mUMmQyYO9vzbX98QMYSBId5GcwHT7q6zvrKlJpRNwoJvTTF7qKScin5PA%40cipher.nrlssc.navy.mil In-Reply-To: ``` From: Brandon Casey The 'len' variable was declared at the beginning of the make_absolute_path function and also in an inner 'if' block which masked the outer declaration. It is only used in two 'if' blocks, so remove the outer declaration and make a new declaration inside the other 'if' block that uses 'len'. Signed-off-by: Brandon Casey --- abspath.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/abspath.c b/abspath.c index 4bee0ba..b88122c 100644 --- a/abspath.c +++ b/abspath.c @@ -18,7 +18,7 @@ const char *make_absolute_path(const char *path) { static char bufs[2][PATH_MAX + 1], *buf = bufs[0], *next_buf = bufs[1]; char cwd[1024] = ""; - int buf_index = 1, len; + int buf_index = 1; int depth = MAXDEPTH; char *last_elem = NULL; @@ -50,7 +50,7 @@ const char *make_absolute_path(const char *path) die_errno ("Could not get current working directory"); if (last_elem) { - int len = strlen(buf); + size_t len = strlen(buf); if (len + strlen(last_elem) + 2 > PATH_MAX) die ("Too long path name: '%s/%s'", buf, last_elem); @@ -61,7 +61,7 @@ const char *make_absolute_path(const char *path) } if (!lstat(buf, &st) && S_ISLNK(st.st_mode)) { - len = readlink(buf, next_buf, PATH_MAX); + ssize_t len = readlink(buf, next_buf, PATH_MAX); if (len < 0) die_errno ("Invalid symlink '%s'", buf); if (PATH_MAX <= len) -- 1.6.4 ``` ## Brandon Casey, 2009-08-27 16:16 Subject: [PATCH 2/2] commit.c: rename variable named 'n' which masks previous declaration Message-ID: URL: https://gitlist.dev/e/vODpKBYr5sNtCfB7C_mUMqn8szqSz58pySpTHpAGYAe6MTvKrSPNr0gs14tbOkuPF97cDvuGi2M%40cipher.nrlssc.navy.mil In-Reply-To: ``` From: Brandon Casey The variable named 'n' was initially declared to be of type int. The name 'n' was reused inside inner blocks as a different type. Rename the uses within inner blocks to avoid confusion and give them a slightly more descriptive name. Signed-off-by: Brandon Casey --- commit.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/commit.c b/commit.c index e2bcbe8..a6c6f70 100644 --- a/commit.c +++ b/commit.c @@ -564,13 +564,13 @@ static struct commit_list *merge_bases_many(struct commit *one, int n, struct co while (interesting(list)) { struct commit *commit; struct commit_list *parents; - struct commit_list *n; + struct commit_list *next; int flags; commit = list->item; - n = list->next; + next = list->next; free(list); - list = n; + list = next; flags = commit->object.flags & (PARENT1 | PARENT2 | STALE); if (flags == (PARENT1 | PARENT2)) { @@ -598,11 +598,11 @@ static struct commit_list *merge_bases_many(struct commit *one, int n, struct co free_commit_list(list); list = result; result = NULL; while (list) { - struct commit_list *n = list->next; + struct commit_list *next = list->next; if (!(list->item->object.flags & STALE)) insert_by_date(list->item, &result); free(list); - list = n; + list = next; } return result; } -- 1.6.4 ```