imap-send: rename 'new' variables
Rename C++ keyword in order to bring the codebase closer to being able to be compiled with a C++ compiler. Signed-off-by: Brandon Williams <bmwill@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Brandon Williams committed
Feb 14, 2018 at 10:59 UTC
592563159744ff7d06779c35dfe7ae5c775ed631
1 file changed
+7
-7
imap-send.c
+7
-7
@@ -1189,11 +1189,11 @@ bail:
1189
*/
1190
static void lf_to_crlf(struct strbuf *msg)
1191
{
1192
- char *new;
1192
+ char *new_msg;
1193
size_t i, j;
1194
char lastc;
1195
1196
- /* First pass: tally, in j, the size of the new string: */
1196
+ /* First pass: tally, in j, the size of the new_msg string: */
1197
for (i = j = 0, lastc = '\0'; i < msg->len; i++) {
1198
if (msg->buf[i] == '\n' && lastc != '\r')
1199
j++; /* a CR will need to be added here */
@@ -1201,18 +1201,18 @@ static void lf_to_crlf(struct strbuf *msg)
1201
j++;
1202
}
1203
1204
- new = xmallocz(j);
1204
+ new_msg = xmallocz(j);
1205
1206
/*
1207
- * Second pass: write the new string. Note that this loop is
1207
+ * Second pass: write the new_msg string. Note that this loop is
1208
* otherwise identical to the first pass.
1209
*/
1210
for (i = j = 0, lastc = '\0'; i < msg->len; i++) {
1211
if (msg->buf[i] == '\n' && lastc != '\r')
1212
- new[j++] = '\r';
1213
- lastc = new[j++] = msg->buf[i];
1212
+ new_msg[j++] = '\r';
1213
+ lastc = new_msg[j++] = msg->buf[i];
1214
}
1215
- strbuf_attach(msg, new, j, j + 1);
1215
+ strbuf_attach(msg, new_msg, j, j + 1);
1216
}
1217
1218
/*