{"thread":{"id":"37380","subject":"[PATCH] imap-send.c: imap_folder -> imap_server_conf.folder","startedAt":"2014-08-19T21:27:11Z","lastAt":"2014-08-20T19:16:34Z","messageCount":2,"participants":["Bernhard Reiter","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"247968","messageId":"53F3C12F.3020606@raz.or.at","threadId":"37380","inReplyTo":null,"subject":"[PATCH] imap-send.c: imap_folder -> imap_server_conf.folder","fromName":"Bernhard Reiter","fromEmail":"ockham@raz.or.at","sentAt":"2014-08-19T21:27:11Z","receivedAt":"2014-08-19T21:27:11Z","isPatch":true,"sender":{"key":"ockham@raz.or.at","avatar":"https://avatars.githubusercontent.com/u/96308?v=4"},"body":"Rename the imap_folder variable to folder and make it a member\nof struct imap_server_conf.\n\nSigned-off-by: Bernhard Reiter <ockham@raz.or.at>\n---\nAs discussed in\nhttp://www.mail-archive.com/git@vger.kernel.org/msg57019.html\n\nBernhard\n\n imap-send.c | 10 +++++-----\n 1 file changed, 5 insertions(+), 5 deletions(-)\n\ndiff --git a/imap-send.c b/imap-send.c\nindex fb01a9c..05a02b5 100644\n--- a/imap-send.c\n+++ b/imap-send.c\n@@ -69,6 +69,7 @@ struct imap_server_conf {\n \tchar *tunnel;\n \tchar *host;\n \tint port;\n+\tchar *folder;\n \tchar *user;\n \tchar *pass;\n \tint use_ssl;\n@@ -82,6 +83,7 @@ static struct imap_server_conf server = {\n \tNULL,\t/* tunnel */\n \tNULL,\t/* host */\n \t0,\t/* port */\n+\tNULL,\t/* folder */\n \tNULL,\t/* user */\n \tNULL,\t/* pass */\n \t0,   \t/* use_ssl */\n@@ -1323,8 +1325,6 @@ static int split_msg(struct strbuf *all_msgs,\nstruct strbuf *msg, int *ofs)\n \treturn 1;\n }\n -static char *imap_folder;\n-\n static int git_imap_config(const char *key, const char *val, void *cb)\n {\n \tif (!skip_prefix(key, \"imap.\", &key))\n@@ -1339,7 +1339,7 @@ static int git_imap_config(const char *key, const\nchar *val, void *cb)\n \t\treturn config_error_nonbool(key);\n  \tif (!strcmp(\"folder\", key)) {\n-\t\timap_folder = xstrdup(val);\n+\t\tserver.folder = xstrdup(val);\n \t} else if (!strcmp(\"host\", key)) {\n \t\tif (starts_with(val, \"imap:\"))\n \t\t\tval += 5;\n@@ -1387,7 +1387,7 @@ int main(int argc, char **argv)\n \tif (!server.port)\n \t\tserver.port = server.use_ssl ? 993 : 143;\n -\tif (!imap_folder) {\n+\tif (!server.folder) {\n \t\tfprintf(stderr, \"no imap store specified\\n\");\n \t\treturn 1;\n \t}\n@@ -1424,7 +1424,7 @@ int main(int argc, char **argv)\n \t}\n  \tfprintf(stderr, \"sending %d message%s\\n\", total, (total != 1) ? \"s\" :\n\"\");\n-\tctx->name = imap_folder;\n+\tctx->name = server.folder;\n \twhile (1) {\n \t\tunsigned percent = n * 100 / total;\n -- 2.1.0.3.g63c96dd\n"},{"id":"248027","messageId":"xmqqvbpnt1il.fsf@gitster.dls.corp.google.com","threadId":"37380","inReplyTo":"53F3C12F.3020606@raz.or.at","subject":"Re: [PATCH] imap-send.c: imap_folder -> imap_server_conf.folder","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2014-08-20T19:16:34Z","receivedAt":"2014-08-20T19:16:34Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Bernhard Reiter <ockham@raz.or.at> writes:\n\n> Rename the imap_folder variable to folder and make it a member\n> of struct imap_server_conf.\n>\n> Signed-off-by: Bernhard Reiter <ockham@raz.or.at>\n> ---\n> As discussed in\n> http://www.mail-archive.com/git@vger.kernel.org/msg57019.html\n>\n> Bernhard\n>\n>  imap-send.c | 10 +++++-----\n>  1 file changed, 5 insertions(+), 5 deletions(-)\n>\n> diff --git a/imap-send.c b/imap-send.c\n> index fb01a9c..05a02b5 100644\n> --- a/imap-send.c\n> +++ b/imap-send.c\n> @@ -69,6 +69,7 @@ struct imap_server_conf {\n>  \tchar *tunnel;\n>  \tchar *host;\n>  \tint port;\n> +\tchar *folder;\n>  \tchar *user;\n>  \tchar *pass;\n>  \tint use_ssl;\n> @@ -82,6 +83,7 @@ static struct imap_server_conf server = {\n>  \tNULL,\t/* tunnel */\n>  \tNULL,\t/* host */\n>  \t0,\t/* port */\n> +\tNULL,\t/* folder */\n>  \tNULL,\t/* user */\n>  \tNULL,\t/* pass */\n>  \t0,   \t/* use_ssl */\n> @@ -1323,8 +1325,6 @@ static int split_msg(struct strbuf *all_msgs,\n> struct strbuf *msg, int *ofs)\n>  \treturn 1;\n>  }\n>  -static char *imap_folder;\n> -\n>  static int git_imap_config(const char *key, const char *val, void *cb)\n>  {\n>  \tif (!skip_prefix(key, \"imap.\", &key))\n\nThe patch is corrupt; even though it claims to be text/plain, it\nsmells like some sort of text/flawed, but it is even worse.  Even\nthe line counts on @@ lines do not match what is in the patch text.\n\nI wiggled it in so there is no need to resend, but please double\ncheck your outgoing mail toolchain (sending the patch first to\nyourself in exactly the same way as you would later send it to the\nlist and checking what comes out would be one good way to check).\n\nThanks.\n\n> @@ -1339,7 +1339,7 @@ static int git_imap_config(const char *key, const\n> char *val, void *cb)\n>  \t\treturn config_error_nonbool(key);\n>   \tif (!strcmp(\"folder\", key)) {\n> -\t\timap_folder = xstrdup(val);\n> +\t\tserver.folder = xstrdup(val);\n>  \t} else if (!strcmp(\"host\", key)) {\n>  \t\tif (starts_with(val, \"imap:\"))\n>  \t\t\tval += 5;\n> @@ -1387,7 +1387,7 @@ int main(int argc, char **argv)\n>  \tif (!server.port)\n>  \t\tserver.port = server.use_ssl ? 993 : 143;\n>  -\tif (!imap_folder) {\n> +\tif (!server.folder) {\n>  \t\tfprintf(stderr, \"no imap store specified\\n\");\n>  \t\treturn 1;\n>  \t}\n> @@ -1424,7 +1424,7 @@ int main(int argc, char **argv)\n>  \t}\n>   \tfprintf(stderr, \"sending %d message%s\\n\", total, (total != 1) ? \"s\" :\n> \"\");\n> -\tctx->name = imap_folder;\n> +\tctx->name = server.folder;\n>  \twhile (1) {\n>  \t\tunsigned percent = n * 100 / total;\n>  -- 2.1.0.3.g63c96dd\n"}]}