[PATCH] imap-send.c: imap_folder -> imap_server_conf.folder

Bernhard Reiter· Aug 19, 2014, 21:27 UTC · lore

Rename the imap_folder variable to folder and make it a member of struct imap_server_conf.

Signed-off-by: Bernhard Reiter <ockham@raz.or.at>
---
As discussed in
http://www.mail-archive.com/git@vger.kernel.org/msg57019.html

Bernhard

 imap-send.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Show changes to imap-send.c +5 −3

diff --git a/imap-send.c b/imap-send.c
index fb01a9c..05a02b5 100644
--- a/imap-send.c
+++ b/imap-send.c
@@ -69,6 +69,7 @@ struct imap_server_conf {
 	char *tunnel;
 	char *host;
 	int port;
+	char *folder;
 	char *user;
 	char *pass;
 	int use_ssl;
@@ -82,6 +83,7 @@ static struct imap_server_conf server = {
 	NULL,	/* tunnel */
 	NULL,	/* host */
 	0,	/* port */
+	NULL,	/* folder */
 	NULL,	/* user */
 	NULL,	/* pass */
 	0,   	/* use_ssl */
@@ -1323,8 +1325,6 @@ static int split_msg(struct strbuf *all_msgs,
struct strbuf *msg, int *ofs)
 	return 1;
 }
 -static char *imap_folder;
-
 static int git_imap_config(const char *key, const char *val, void *cb)
 {
 	if (!skip_prefix(key, "imap.", &key))
@@ -1339,7 +1339,7 @@ static int git_imap_config(const char *key, const
char *val, void *cb)
 		return config_error_nonbool(key);
  	if (!strcmp("folder", key)) {
-		imap_folder = xstrdup(val);
+		server.folder = xstrdup(val);
 	} else if (!strcmp("host", key)) {
 		if (starts_with(val, "imap:"))
 			val += 5;
@@ -1387,7 +1387,7 @@ int main(int argc, char **argv)
 	if (!server.port)
 		server.port = server.use_ssl ? 993 : 143;
 -	if (!imap_folder) {
+	if (!server.folder) {
 		fprintf(stderr, "no imap store specified\n");
 		return 1;
 	}
@@ -1424,7 +1424,7 @@ int main(int argc, char **argv)
 	}
  	fprintf(stderr, "sending %d message%s\n", total, (total != 1) ? "s" :
"");
-	ctx->name = imap_folder;
+	ctx->name = server.folder;
 	while (1) {
 		unsigned percent = n * 100 / total;
 -- 2.1.0.3.g63c96dd

Junio C Hamano· Aug 20, 2014, 19:16 UTC · re: Bernhard Reiter · lore

Re: [PATCH] imap-send.c: imap_folder -> imap_server_conf.folder

Bernhard Reiter <ockham@raz.or.at> writes:

Show 42 quoted lines

> Rename the imap_folder variable to folder and make it a member
> of struct imap_server_conf.
>
> Signed-off-by: Bernhard Reiter <ockham@raz.or.at>
> ---
> As discussed in
> http://www.mail-archive.com/git@vger.kernel.org/msg57019.html
>
> Bernhard
>
>  imap-send.c | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/imap-send.c b/imap-send.c
> index fb01a9c..05a02b5 100644
> --- a/imap-send.c
> +++ b/imap-send.c
> @@ -69,6 +69,7 @@ struct imap_server_conf {
>  	char *tunnel;
>  	char *host;
>  	int port;
> +	char *folder;
>  	char *user;
>  	char *pass;
>  	int use_ssl;
> @@ -82,6 +83,7 @@ static struct imap_server_conf server = {
>  	NULL,	/* tunnel */
>  	NULL,	/* host */
>  	0,	/* port */
> +	NULL,	/* folder */
>  	NULL,	/* user */
>  	NULL,	/* pass */
>  	0,   	/* use_ssl */
> @@ -1323,8 +1325,6 @@ static int split_msg(struct strbuf *all_msgs,
> struct strbuf *msg, int *ofs)
>  	return 1;
>  }
>  -static char *imap_folder;
> -
>  static int git_imap_config(const char *key, const char *val, void *cb)
>  {
>  	if (!skip_prefix(key, "imap.", &key))

The patch is corrupt; even though it claims to be text/plain, it smells like some sort of text/flawed, but it is even worse. Even the line counts on @@ lines do not match what is in the patch text.

I wiggled it in so there is no need to resend, but please double check your outgoing mail toolchain (sending the patch first to yourself in exactly the same way as you would later send it to the list and checking what comes out would be one good way to check).

Thanks.

Show 26 quoted lines

> @@ -1339,7 +1339,7 @@ static int git_imap_config(const char *key, const
> char *val, void *cb)
>  		return config_error_nonbool(key);
>   	if (!strcmp("folder", key)) {
> -		imap_folder = xstrdup(val);
> +		server.folder = xstrdup(val);
>  	} else if (!strcmp("host", key)) {
>  		if (starts_with(val, "imap:"))
>  			val += 5;
> @@ -1387,7 +1387,7 @@ int main(int argc, char **argv)
>  	if (!server.port)
>  		server.port = server.use_ssl ? 993 : 143;
>  -	if (!imap_folder) {
> +	if (!server.folder) {
>  		fprintf(stderr, "no imap store specified\n");
>  		return 1;
>  	}
> @@ -1424,7 +1424,7 @@ int main(int argc, char **argv)
>  	}
>   	fprintf(stderr, "sending %d message%s\n", total, (total != 1) ? "s" :
> "");
> -	ctx->name = imap_folder;
> +	ctx->name = server.folder;
>  	while (1) {
>  		unsigned percent = n * 100 / total;
>  -- 2.1.0.3.g63c96dd

patchimap-send.c: imap_folder -> imap_server_conf.folder