undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Bernhard Reiter 2014-08-19 23:27:11 +02:00 committed by Junio C Hamano
parent f9dc5d65ca
commit 3918057164
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
imap-send.c
View File

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