Skip to content

Commit 3654527

Browse files
AdityaGarg8gitster
authored andcommitted
imap-send: fix minor mistakes in the logs
Some minor mistakes have been found in the logs. Most of them include error messages starting with a capital letter, and ending with a period. Also, abbreviations like "IMAP" and "OK" should be in uppercase. Fix them. Signed-off-by: Aditya Garg <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent abaa69f commit 3654527

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

imap-send.c

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ static int ssl_socket_connect(struct imap_socket *sock UNUSED,
205205
const struct imap_server_conf *cfg UNUSED,
206206
int use_tls_only UNUSED)
207207
{
208-
fprintf(stderr, "SSL requested but SSL support not compiled in\n");
208+
fprintf(stderr, "SSL requested, but SSL support is not compiled in\n");
209209
return -1;
210210
}
211211

@@ -1020,7 +1020,7 @@ static int auth_cram_md5(struct imap_store *ctx, const char *prompt)
10201020
ret = socket_write(&ctx->imap->buf.sock, response, strlen(response));
10211021
if (ret != strlen(response)) {
10221022
free(response);
1023-
return error("IMAP error: sending response failed");
1023+
return error("IMAP error: sending CRAM-MD5 response failed");
10241024
}
10251025

10261026
free(response);
@@ -1160,7 +1160,7 @@ static struct imap_store *imap_open_store(struct imap_server_conf *srvc, const c
11601160
imap->buf.sock.fd[0] = tunnel.out;
11611161
imap->buf.sock.fd[1] = tunnel.in;
11621162

1163-
imap_info("ok\n");
1163+
imap_info("OK\n");
11641164
} else {
11651165
#ifndef NO_IPV6
11661166
struct addrinfo hints, *ai0, *ai;
@@ -1179,7 +1179,7 @@ static struct imap_store *imap_open_store(struct imap_server_conf *srvc, const c
11791179
fprintf(stderr, "getaddrinfo: %s\n", gai_strerror(gai));
11801180
goto bail;
11811181
}
1182-
imap_info("ok\n");
1182+
imap_info("OK\n");
11831183

11841184
for (ai0 = ai; ai; ai = ai->ai_next) {
11851185
char addr[NI_MAXHOST];
@@ -1217,7 +1217,7 @@ static struct imap_store *imap_open_store(struct imap_server_conf *srvc, const c
12171217
perror("gethostbyname");
12181218
goto bail;
12191219
}
1220-
imap_info("ok\n");
1220+
imap_info("OK\n");
12211221

12221222
addr.sin_addr.s_addr = *((int *) he->h_addr_list[0]);
12231223

@@ -1231,7 +1231,7 @@ static struct imap_store *imap_open_store(struct imap_server_conf *srvc, const c
12311231
}
12321232
#endif
12331233
if (s < 0) {
1234-
fputs("Error: unable to connect to server.\n", stderr);
1234+
fputs("error: unable to connect to server\n", stderr);
12351235
goto bail;
12361236
}
12371237

@@ -1243,7 +1243,7 @@ static struct imap_store *imap_open_store(struct imap_server_conf *srvc, const c
12431243
close(s);
12441244
goto bail;
12451245
}
1246-
imap_info("ok\n");
1246+
imap_info("OK\n");
12471247
}
12481248

12491249
/* read the greeting string */
@@ -1296,12 +1296,12 @@ static struct imap_store *imap_open_store(struct imap_server_conf *srvc, const c
12961296
if (try_auth_method(srvc, ctx, imap, "XOAUTH2", AUTH_XOAUTH2, auth_xoauth2))
12971297
goto bail;
12981298
} else {
1299-
fprintf(stderr, "Unknown authentication method:%s\n", srvc->host);
1299+
fprintf(stderr, "unknown authentication method:%s\n", srvc->host);
13001300
goto bail;
13011301
}
13021302
} else {
13031303
if (CAP(NOLOGIN)) {
1304-
fprintf(stderr, "Skipping account %s@%s, server forbids LOGIN\n",
1304+
fprintf(stderr, "skipping account %s@%s, server forbids LOGIN\n",
13051305
srvc->user, srvc->host);
13061306
goto bail;
13071307
}
@@ -1557,7 +1557,7 @@ static int append_msgs_to_imap(struct imap_server_conf *server,
15571557
}
15581558
ctx->name = server->folder;
15591559

1560-
fprintf(stderr, "sending %d message%s\n", total, (total != 1) ? "s" : "");
1560+
fprintf(stderr, "Sending %d message%s\n", total, (total != 1) ? "s" : "");
15611561
while (1) {
15621562
unsigned percent = n * 100 / total;
15631563

@@ -1671,7 +1671,7 @@ static int curl_append_msgs_to_imap(struct imap_server_conf *server,
16711671
curl = setup_curl(server, &cred);
16721672
curl_easy_setopt(curl, CURLOPT_READDATA, &msgbuf);
16731673

1674-
fprintf(stderr, "sending %d message%s\n", total, (total != 1) ? "s" : "");
1674+
fprintf(stderr, "Sending %d message%s\n", total, (total != 1) ? "s" : "");
16751675
while (1) {
16761676
unsigned percent = n * 100 / total;
16771677
int prev_len;
@@ -1755,13 +1755,13 @@ int cmd_main(int argc, const char **argv)
17551755
server.port = server.use_ssl ? 993 : 143;
17561756

17571757
if (!server.folder) {
1758-
fprintf(stderr, "no imap store specified\n");
1758+
fprintf(stderr, "no IMAP store specified\n");
17591759
ret = 1;
17601760
goto out;
17611761
}
17621762
if (!server.host) {
17631763
if (!server.tunnel) {
1764-
fprintf(stderr, "no imap host specified\n");
1764+
fprintf(stderr, "no IMAP host specified\n");
17651765
ret = 1;
17661766
goto out;
17671767
}
@@ -1783,7 +1783,7 @@ int cmd_main(int argc, const char **argv)
17831783

17841784
total = count_messages(&all_msgs);
17851785
if (!total) {
1786-
fprintf(stderr, "no messages to send\n");
1786+
fprintf(stderr, "no messages found to send\n");
17871787
ret = 1;
17881788
goto out;
17891789
}

0 commit comments

Comments
 (0)