{"thread":{"id":"36420","subject":"[PATCH 2/6] compat/regex/regex_internal.c: reduce scope of variables","startedAt":"2014-04-16T09:33:26Z","lastAt":"2014-04-16T16:49:30Z","messageCount":10,"participants":["Elia Pinto","Erik Faye-Lund","Jonathan Nieder"],"isPatch":true,"patchVersion":1,"patchTotal":6},"messages":[{"id":"238922","messageId":"1397640811-17719-1-git-send-email-gitter.spiros@gmail.com","threadId":"36420","inReplyTo":null,"subject":"[PATCH 1/6] compat/regex/regcomp.c: reduce scope of variables","fromName":"Elia Pinto","fromEmail":"gitter.spiros@gmail.com","sentAt":"2014-04-16T09:33:26Z","receivedAt":"2014-04-16T09:33:26Z","isPatch":true,"sender":{"key":"gitter.spiros@gmail.com","avatar":"https://avatars.githubusercontent.com/u/158490?v=4"},"body":"Signed-off-by: Elia Pinto \n---\n compat/regex/regcomp.c | 17 ++++++++++++-----\n 1 file changed, 12 insertions(+), 5 deletions(-)\n\ndiff --git a/compat/regex/regcomp.c b/compat/regex/regcomp.c\nindex 06f3088..c7da378 100644\n--- a/compat/regex/regcomp.c\n+++ b/compat/regex/regcomp.c\n@@ -368,7 +368,6 @@ re_compile_fastmap_iter (regex_t *bufp, const re_dfastate_t *init_state,\n else if (type == COMPLEX_BRACKET)\n \t{\n \t re_charset_t *cset = dfa->nodes[node].opr.mbcset;\n-\t int i;\n \n # ifdef _LIBC\n \t /* See if we have to try all bytes which start multiple collation\n@@ -380,6 +379,7 @@ re_compile_fastmap_iter (regex_t *bufp, const re_dfastate_t *init_state,\n \t if (_NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_NRULES) != 0\n \t\t && (cset->ncoll_syms || cset->nranges))\n \t\t{\n+\t\t int i;\n \t\t const int32_t *table = (const int32_t *)\n \t\t _NL_CURRENT (LC_COLLATE, _NL_COLLATE_TABLEMB);\n \t\t for (i = 0; i < SBC_MAX; ++i)\n@@ -598,7 +598,7 @@ static bitset_t utf8_sb_map;\n static void\n free_dfa_content (re_dfa_t *dfa)\n {\n- int i, j;\n+ int i;\n \n if (dfa->nodes)\n for (i = 0; i < dfa->nodes_len; ++i)\n@@ -621,6 +621,7 @@ free_dfa_content (re_dfa_t *dfa)\n if (dfa->state_table)\n for (i = 0; i <= dfa->state_hash_mask; ++i)\n {\n+\tint j;\n \tstruct re_state_table_entry *entry = dfa->state_table + i;\n \tfor (j = 0; j < entry->num; ++j)\n \t {\n@@ -994,7 +995,7 @@ free_workarea_compile (regex_t *preg)\n static reg_errcode_t\n create_initial_state (re_dfa_t *dfa)\n {\n- int first, i;\n+ int first;\n reg_errcode_t err;\n re_node_set init_nodes;\n \n@@ -1011,6 +1012,8 @@ create_initial_state (re_dfa_t *dfa)\n Then we add epsilon closures of the nodes which are the next nodes of\n the back-references. */\n if (dfa->nbackref > 0)\n+ {\n+ int i;\n for (i = 0; i < init_nodes.nelem; ++i)\n {\n \tint node_idx = init_nodes.elems[i];\n@@ -1044,6 +1047,7 @@ create_initial_state (re_dfa_t *dfa)\n \t }\n \t }\n }\n+ }\n \n /* It must be the first time to invoke acquire_state. */\n dfa->init_state = re_acquire_state_context (&err, dfa, &init_nodes, 0);\n@@ -1682,7 +1686,6 @@ static reg_errcode_t\n calc_eclosure_iter (re_node_set *new_set, re_dfa_t *dfa, int node, int root)\n {\n reg_errcode_t err;\n- int i;\n re_node_set eclosure;\n int ret;\n int incomplete = 0;\n@@ -1708,6 +1711,8 @@ calc_eclosure_iter (re_node_set *new_set, re_dfa_t *dfa, int node, int root)\n \n /* Expand each epsilon destination nodes. */\n if (IS_EPSILON_NODE(dfa->nodes[node].type))\n+ {\n+ int i;\n for (i = 0; i < dfa->edests[node].nelem; ++i)\n {\n \tre_node_set eclosure_elem;\n@@ -1741,6 +1746,7 @@ calc_eclosure_iter (re_node_set *new_set, re_dfa_t *dfa, int node, int root)\n \t re_node_set_free (&eclosure_elem);\n \t }\n }\n+ }\n \n /* An epsilon closure includes itself. */\n ret = re_node_set_insert (&eclosure, node);\n@@ -2630,7 +2636,6 @@ build_range_exp (bitset_t sbcset, bracket_elem_t *start_elem,\n \t\t bracket_elem_t *end_elem)\n # endif /* not RE_ENABLE_I18N */\n {\n- unsigned int start_ch, end_ch;\n /* Equivalence Classes and Character Classes can't be a range start/end. */\n if (BE (start_elem->type == EQUIV_CLASS || start_elem->type == CHAR_CLASS\n \t || end_elem->type == EQUIV_CLASS || end_elem->type == CHAR_CLASS,\n@@ -2647,6 +2652,7 @@ build_range_exp (bitset_t sbcset, bracket_elem_t *start_elem,\n \n # ifdef RE_ENABLE_I18N\n {\n+ unsigned int start_ch, end_ch;\n wchar_t wc;\n wint_t start_wc;\n wint_t end_wc;\n@@ -2728,6 +2734,7 @@ build_range_exp (bitset_t sbcset, bracket_elem_t *start_elem,\n # else /* not RE_ENABLE_I18N */\n {\n unsigned int ch;\n+ unsigned int start_ch, end_ch;\n start_ch = ((start_elem->type == SB_CHAR ) ? start_elem->opr.ch\n \t\t: ((start_elem->type == COLL_SYM) ? start_elem->opr.name[0]\n \t\t : 0));\n-- \n1.7.10.4\n"},{"id":"238920","messageId":"1397640811-17719-2-git-send-email-gitter.spiros@gmail.com","threadId":"36420","inReplyTo":"1397640811-17719-1-git-send-email-gitter.spiros@gmail.com","subject":"[PATCH 2/6] compat/regex/regex_internal.c: reduce scope of variables","fromName":"Elia Pinto","fromEmail":"gitter.spiros@gmail.com","sentAt":"2014-04-16T09:33:27Z","receivedAt":"2014-04-16T09:33:27Z","isPatch":true,"sender":{"key":"gitter.spiros@gmail.com","avatar":"https://avatars.githubusercontent.com/u/158490?v=4"},"body":"Signed-off-by: Elia Pinto \n---\n compat/regex/regex_internal.c | 6 +++---\n 1 file changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/compat/regex/regex_internal.c b/compat/regex/regex_internal.c\nindex d4121f2..a7a71ec 100644\n--- a/compat/regex/regex_internal.c\n+++ b/compat/regex/regex_internal.c\n@@ -707,7 +707,6 @@ re_string_reconstruct (re_string_t *pstr, int idx, int eflags)\n #ifdef RE_ENABLE_I18N\n \t if (pstr->mb_cur_max > 1)\n \t {\n-\t int wcs_idx;\n \t wint_t wc = WEOF;\n \n \t if (pstr->is_utf8)\n@@ -738,11 +737,11 @@ re_string_reconstruct (re_string_t *pstr, int idx, int eflags)\n \t\t\t mbstate_t cur_state;\n \t\t\t wchar_t wc2;\n \t\t\t int mlen = raw + pstr->len - p;\n-\t\t\t unsigned char buf[6];\n \t\t\t size_t mbclen;\n \n \t\t\t if (BE (pstr->trans != NULL, 0))\n \t\t\t {\n+ unsigned char buf[6];\n \t\t\t int i = mlen < 6 ? mlen : 6;\n \t\t\t while (--i >= 0)\n \t\t\t\tbuf[i] = pstr->trans[p[i]];\n@@ -778,6 +777,7 @@ re_string_reconstruct (re_string_t *pstr, int idx, int eflags)\n \t\t\t\t\t? CONTEXT_NEWLINE : 0));\n \t if (BE (pstr->valid_len, 0))\n \t\t{\n+ int wcs_idx;\n \t\t for (wcs_idx = 0; wcs_idx < pstr->valid_len; ++wcs_idx)\n \t\t pstr->wcs[wcs_idx] = WEOF;\n \t\t if (pstr->mbs_allocated)\n@@ -925,7 +925,6 @@ static unsigned int\n internal_function\n re_string_context_at (const re_string_t *input, int idx, int eflags)\n {\n- int c;\n if (BE (idx < 0, 0))\n /* In this case, we use the value stored in input->tip_context,\n since we can't know the character in input->mbs[-1] here. */\n@@ -957,6 +956,7 @@ re_string_context_at (const re_string_t *input, int idx, int eflags)\n else\n #endif\n {\n+ int c;\n c = re_string_byte_at (input, idx);\n if (bitset_contain (input->word_char, c))\n \treturn CONTEXT_WORD;\n-- \n1.7.10.4\n"},{"id":"238925","messageId":"1397640811-17719-3-git-send-email-gitter.spiros@gmail.com","threadId":"36420","inReplyTo":"1397640811-17719-1-git-send-email-gitter.spiros@gmail.com","subject":"[PATCH 3/6] compat/regex/regexec.c: reduce scope of variables","fromName":"Elia Pinto","fromEmail":"gitter.spiros@gmail.com","sentAt":"2014-04-16T09:33:28Z","receivedAt":"2014-04-16T09:33:28Z","isPatch":true,"sender":{"key":"gitter.spiros@gmail.com","avatar":"https://avatars.githubusercontent.com/u/158490?v=4"},"body":"Signed-off-by: Elia Pinto \n---\n compat/regex/regexec.c | 15 ++++++++-------\n 1 file changed, 8 insertions(+), 7 deletions(-)\n\ndiff --git a/compat/regex/regexec.c b/compat/regex/regexec.c\nindex eb5e1d4..f86dbeb 100644\n--- a/compat/regex/regexec.c\n+++ b/compat/regex/regexec.c\n@@ -1254,12 +1254,12 @@ proceed_next_node (const re_match_context_t *mctx, int nregs, regmatch_t *regs,\n \t\t struct re_fail_stack_t *fs)\n {\n const re_dfa_t *const dfa = mctx->dfa;\n- int i, err;\n+ int err;\n if (IS_EPSILON_NODE (dfa->nodes[node].type))\n {\n re_node_set *cur_nodes = &mctx->state_log[*pidx]->nodes;\n re_node_set *edests = &dfa->edests[node];\n- int dest_node;\n+ int dest_node, i;\n err = re_node_set_insert (eps_via_nodes, node);\n if (BE (err < 0, 0))\n \treturn -2;\n@@ -1446,9 +1446,9 @@ set_regs (const regex_t *preg, const re_match_context_t *mctx, size_t nmatch,\n \n if (idx == pmatch[0].rm_eo && cur_node == mctx->last_node)\n \t{\n-\t int reg_idx;\n \t if (fs)\n \t {\n+\t int reg_idx;\n \t for (reg_idx = 0; reg_idx < nmatch; ++reg_idx)\n \t\tif (pmatch[reg_idx].rm_so > -1 && pmatch[reg_idx].rm_eo == -1)\n \t\t break;\n@@ -1818,7 +1818,6 @@ add_epsilon_src_nodes (const re_dfa_t *dfa, re_node_set *dest_nodes,\n \t\t const re_node_set *candidates)\n {\n reg_errcode_t err = REG_NOERROR;\n- int i;\n \n re_dfastate_t *state = re_acquire_state (&err, dfa, dest_nodes);\n if (BE (err != REG_NOERROR, 0))\n@@ -1826,6 +1825,7 @@ add_epsilon_src_nodes (const re_dfa_t *dfa, re_node_set *dest_nodes,\n \n if (!state->inveclosure.alloc)\n {\n+ int i;\n err = re_node_set_alloc (&state->inveclosure, dest_nodes->nelem);\n if (BE (err != REG_NOERROR, 0))\n \treturn REG_ESPACE;\n@@ -3824,7 +3824,6 @@ check_node_accept_bytes (const re_dfa_t *dfa, int node_idx,\n # ifdef _LIBC\n const unsigned char *pin\n \t= ((const unsigned char *) re_string_get_buffer (input) + str_idx);\n- int j;\n uint32_t nrules;\n # endif /* _LIBC */\n int match_len = 0;\n@@ -3867,6 +3866,7 @@ check_node_accept_bytes (const re_dfa_t *dfa, int node_idx,\n \t for (i = 0; i < cset->ncoll_syms; ++i)\n \t {\n \t const unsigned char *coll_sym = extra + cset->coll_syms[i];\n+ int j;\n \t /* Compare the length of input collating element and\n \t\t the length of current collating element. */\n \t if (*coll_sym != elem_len)\n@@ -4004,13 +4004,14 @@ find_collation_sequence_value (const unsigned char *mbs, size_t mbs_len)\n \n for (idx = 0; idx < extrasize;)\n \t{\n-\t int mbs_cnt, found = 0;\n+\t int found = 0;\n \t int32_t elem_mbs_len;\n \t /* Skip the name of collating element name. */\n \t idx = idx + extra[idx] + 1;\n \t elem_mbs_len = extra[idx++];\n \t if (mbs_len == elem_mbs_len)\n-\t {\n+\t { \n+ init mbs_cnt;\n \t for (mbs_cnt = 0; mbs_cnt < elem_mbs_len; ++mbs_cnt)\n \t\tif (extra[idx + mbs_cnt] != mbs[mbs_cnt])\n \t\t break;\n-- \n1.7.10.4\n"},{"id":"238923","messageId":"1397640811-17719-4-git-send-email-gitter.spiros@gmail.com","threadId":"36420","inReplyTo":"1397640811-17719-1-git-send-email-gitter.spiros@gmail.com","subject":"[PATCH 4/6] contrib/credential/osxkeychain/git-credential-osxkeychain.c: reduce scope of variables","fromName":"Elia Pinto","fromEmail":"gitter.spiros@gmail.com","sentAt":"2014-04-16T09:33:29Z","receivedAt":"2014-04-16T09:33:29Z","isPatch":true,"sender":{"key":"gitter.spiros@gmail.com","avatar":"https://avatars.githubusercontent.com/u/158490?v=4"},"body":"Signed-off-by: Elia Pinto \n---\n contrib/credential/osxkeychain/git-credential-osxkeychain.c | 8 ++++----\n 1 file changed, 4 insertions(+), 4 deletions(-)\n\ndiff --git a/contrib/credential/osxkeychain/git-credential-osxkeychain.c b/contrib/credential/osxkeychain/git-credential-osxkeychain.c\nindex bcd3f57..5ae09f6 100644\n--- a/contrib/credential/osxkeychain/git-credential-osxkeychain.c\n+++ b/contrib/credential/osxkeychain/git-credential-osxkeychain.c\n@@ -163,12 +163,12 @@ static void read_credential(void)\n \n int main(int argc, const char **argv)\n {\n-\tconst char *usage =\n-\t\t\"usage: git credential-osxkeychain \";\n-\n \tif (!argv[1])\n+\t {\n+\t const char *usage =\n+\t\t\t\"usage: git credential-osxkeychain \";\n \t\tdie(usage);\n-\n+\t }\n \tread_credential();\n \n \tif (!strcmp(argv[1], \"get\"))\n-- \n1.7.10.4\n"},{"id":"238921","messageId":"1397640811-17719-5-git-send-email-gitter.spiros@gmail.com","threadId":"36420","inReplyTo":"1397640811-17719-1-git-send-email-gitter.spiros@gmail.com","subject":"[PATCH 5/6] contrib/credential/wincred/git-credential-wincred.c: reduce scope of variables","fromName":"Elia Pinto","fromEmail":"gitter.spiros@gmail.com","sentAt":"2014-04-16T09:33:30Z","receivedAt":"2014-04-16T09:33:30Z","isPatch":true,"sender":{"key":"gitter.spiros@gmail.com","avatar":"https://avatars.githubusercontent.com/u/158490?v=4"},"body":"Signed-off-by: Elia Pinto \n---\n contrib/credential/wincred/git-credential-wincred.c | 6 ++++--\n 1 file changed, 4 insertions(+), 2 deletions(-)\n\ndiff --git a/contrib/credential/wincred/git-credential-wincred.c b/contrib/credential/wincred/git-credential-wincred.c\nindex a1d38f0..edff71c 100644\n--- a/contrib/credential/wincred/git-credential-wincred.c\n+++ b/contrib/credential/wincred/git-credential-wincred.c\n@@ -258,11 +258,13 @@ static void read_credential(void)\n \n int main(int argc, char *argv[])\n {\n-\tconst char *usage =\n-\t \"usage: git credential-wincred \\n\";\n \n \tif (!argv[1])\n+ {\n+\t const char *usage =\n+\t \"usage: git credential-wincred \\n\";\n \t\tdie(usage);\n+ }\n \n \t/* git use binary pipes to avoid CRLF-issues */\n \t_setmode(_fileno(stdin), _O_BINARY);\n-- \n1.7.10.4\n"},{"id":"238924","messageId":"1397640811-17719-6-git-send-email-gitter.spiros@gmail.com","threadId":"36420","inReplyTo":"1397640811-17719-1-git-send-email-gitter.spiros@gmail.com","subject":"[PATCH 6/6] xdiff/xprepare.c: reduce scope of variables","fromName":"Elia Pinto","fromEmail":"gitter.spiros@gmail.com","sentAt":"2014-04-16T09:33:31Z","receivedAt":"2014-04-16T09:33:31Z","isPatch":true,"sender":{"key":"gitter.spiros@gmail.com","avatar":"https://avatars.githubusercontent.com/u/158490?v=4"},"body":"Signed-off-by: Elia Pinto \n---\n xdiff/xprepare.c | 5 +++--\n 1 file changed, 3 insertions(+), 2 deletions(-)\n\ndiff --git a/xdiff/xprepare.c b/xdiff/xprepare.c\nindex 63a22c6..e0b6987 100644\n--- a/xdiff/xprepare.c\n+++ b/xdiff/xprepare.c\n@@ -161,8 +161,7 @@ static int xdl_prepare_ctx(unsigned int pass, mmfile_t *mf, long narec, xpparam_\n \t\t\t xdlclassifier_t *cf, xdfile_t *xdf) {\n \tunsigned int hbits;\n \tlong nrec, hsize, bsize;\n-\tunsigned long hav;\n-\tchar const *blk, *cur, *top, *prev;\n+\tchar const *blk, *cur, *prev;\n \txrecord_t *crec;\n \txrecord_t **recs, **rrecs;\n \txrecord_t **rhash;\n@@ -193,7 +192,9 @@ static int xdl_prepare_ctx(unsigned int pass, mmfile_t *mf, long narec, xpparam_\n \n \tnrec = 0;\n \tif ((cur = blk = xdl_mmfile_first(mf, &bsize)) != NULL) {\n+ char const *top;\n \t\tfor (top = blk + bsize; cur < top; ) {\n+ unsigned long hav;\n \t\t\tprev = cur;\n \t\t\thav = xdl_hash_record(&cur, top, xpp->flags);\n \t\t\tif (nrec >= narec) {\n-- \n1.7.10.4\n"},{"id":"238926","messageId":"CABPQNSZDZEhb4o5zvUtYQiMzEdrrs0QDCF6OH0wvtpLjNsNQSQ@mail.gmail.com","threadId":"36420","inReplyTo":"1397640811-17719-5-git-send-email-gitter.spiros@gmail.com","subject":"Re: [PATCH 5/6] contrib/credential/wincred/git-credential-wincred.c: reduce scope of variables","fromName":"Erik Faye-Lund","fromEmail":"kusmabite@gmail.com","sentAt":"2014-04-16T09:54:06Z","receivedAt":"2014-04-16T09:54:06Z","isPatch":true,"sender":{"key":"kusmabite@gmail.com","avatar":"https://avatars.githubusercontent.com/u/47073?v=4"},"body":"On Wed, Apr 16, 2014 at 11:33 AM, Elia Pinto wrote:\n> Signed-off-by: Elia Pinto \n> ---\n> contrib/credential/wincred/git-credential-wincred.c | 6 ++++--\n> 1 file changed, 4 insertions(+), 2 deletions(-)\n>\n> diff --git a/contrib/credential/wincred/git-credential-wincred.c b/contrib/credential/wincred/git-credential-wincred.c\n> index a1d38f0..edff71c 100644\n> --- a/contrib/credential/wincred/git-credential-wincred.c\n> +++ b/contrib/credential/wincred/git-credential-wincred.c\n> @@ -258,11 +258,13 @@ static void read_credential(void)\n>\n> int main(int argc, char *argv[])\n> {\n> - const char *usage =\n> - \"usage: git credential-wincred \\n\";\n>\n> if (!argv[1])\n> + {\n> + const char *usage =\n> + \"usage: git credential-wincred \\n\";\n> die(usage);\n> + }\n>\n\nThis is not the indentation/bracket-style we use in this source-file.\n"},{"id":"238927","messageId":"CABPQNSa2dqzkKcaMycHQ9SUNL9tLvJGXPF4wPxv23NmFEnvrTQ@mail.gmail.com","threadId":"36420","inReplyTo":"1397640811-17719-4-git-send-email-gitter.spiros@gmail.com","subject":"Re: [PATCH 4/6] contrib/credential/osxkeychain/git-credential-osxkeychain.c: reduce scope of variables","fromName":"Erik Faye-Lund","fromEmail":"kusmabite@gmail.com","sentAt":"2014-04-16T09:55:03Z","receivedAt":"2014-04-16T09:55:03Z","isPatch":true,"sender":{"key":"kusmabite@gmail.com","avatar":"https://avatars.githubusercontent.com/u/47073?v=4"},"body":"On Wed, Apr 16, 2014 at 11:33 AM, Elia Pinto wrote:\n> Signed-off-by: Elia Pinto \n> ---\n> contrib/credential/osxkeychain/git-credential-osxkeychain.c | 8 ++++----\n> 1 file changed, 4 insertions(+), 4 deletions(-)\n>\n> diff --git a/contrib/credential/osxkeychain/git-credential-osxkeychain.c b/contrib/credential/osxkeychain/git-credential-osxkeychain.c\n> index bcd3f57..5ae09f6 100644\n> --- a/contrib/credential/osxkeychain/git-credential-osxkeychain.c\n> +++ b/contrib/credential/osxkeychain/git-credential-osxkeychain.c\n> @@ -163,12 +163,12 @@ static void read_credential(void)\n>\n> int main(int argc, const char **argv)\n> {\n> - const char *usage =\n> - \"usage: git credential-osxkeychain \";\n> -\n> if (!argv[1])\n> + {\n> + const char *usage =\n> + \"usage: git credential-osxkeychain \";\n> die(usage);\n> -\n> + }\n\nAgain, not our code-style.\n"},{"id":"238928","messageId":"CABPQNSajC5vj78U7nk+656_V+poCZ1GNDBFRn_KWKwR-1QYg0Q@mail.gmail.com","threadId":"36420","inReplyTo":"1397640811-17719-6-git-send-email-gitter.spiros@gmail.com","subject":"Re: [PATCH 6/6] xdiff/xprepare.c: reduce scope of variables","fromName":"Erik Faye-Lund","fromEmail":"kusmabite@gmail.com","sentAt":"2014-04-16T09:55:49Z","receivedAt":"2014-04-16T09:55:49Z","isPatch":true,"sender":{"key":"kusmabite@gmail.com","avatar":"https://avatars.githubusercontent.com/u/47073?v=4"},"body":"On Wed, Apr 16, 2014 at 11:33 AM, Elia Pinto wrote:\n> Signed-off-by: Elia Pinto \n> ---\n> xdiff/xprepare.c | 5 +++--\n> 1 file changed, 3 insertions(+), 2 deletions(-)\n>\n> diff --git a/xdiff/xprepare.c b/xdiff/xprepare.c\n> index 63a22c6..e0b6987 100644\n> --- a/xdiff/xprepare.c\n> +++ b/xdiff/xprepare.c\n> @@ -161,8 +161,7 @@ static int xdl_prepare_ctx(unsigned int pass, mmfile_t *mf, long narec, xpparam_\n> xdlclassifier_t *cf, xdfile_t *xdf) {\n> unsigned int hbits;\n> long nrec, hsize, bsize;\n> - unsigned long hav;\n> - char const *blk, *cur, *top, *prev;\n> + char const *blk, *cur, *prev;\n> xrecord_t *crec;\n> xrecord_t **recs, **rrecs;\n> xrecord_t **rhash;\n> @@ -193,7 +192,9 @@ static int xdl_prepare_ctx(unsigned int pass, mmfile_t *mf, long narec, xpparam_\n>\n> nrec = 0;\n> if ((cur = blk = xdl_mmfile_first(mf, &bsize)) != NULL) {\n> + char const *top;\n> for (top = blk + bsize; cur < top; ) {\n> + unsigned long hav;\n> prev = cur;\n\nWe do not indent with spaces.\n"},{"id":"238942","messageId":"20140416164930.GP3912@google.com","threadId":"36420","inReplyTo":"1397640811-17719-1-git-send-email-gitter.spiros@gmail.com","subject":"Re: [PATCH 1/6] compat/regex/regcomp.c: reduce scope of variables","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2014-04-16T16:49:30Z","receivedAt":"2014-04-16T16:49:30Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Hi,\n\nElia Pinto wrote:\n\n> [Subject: compat/regex/regcomp.c: reduce scope of variables]\n\ngnulib regex is still maintained upstream and available under the\nLGPL 2.1+. Shouldn't we make the change there and reimport to\nmake it easier to pull in later changes?\n\nThanks,\nJonathan\n"}]}