format-patch: introduce helper function last_line_length()
Currently, an open-coded loop to calculate the length of the last line of a string buffer is used in multiple places. Move that code into a function of its own. Signed-off-by: Jan H. Schönherr <schnhrr@cs.tu-berlin.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jan H. Schönherr committed
Oct 18, 2012 at 16:43 UTC
f9b7204b6d10a1429271fde8cbcdee56beb0e035
1 file changed
+13
-12
pretty.c
+13
-12
@@ -240,6 +240,17 @@ static int has_rfc822_specials(const char *s, int len)
240
return 0;
241
}
242
243
+static int last_line_length(struct strbuf *sb)
244
+{
245
+ int i;
246
+
247
+ /* How many bytes are already used on the last line? */
248
+ for (i = sb->len - 1; i >= 0; i--)
249
+ if (sb->buf[i] == '\n')
250
+ break;
251
+ return sb->len - (i + 1);
252
+}
253
+
254
static void add_rfc822_quoted(struct strbuf *out, const char *s, int len)
255
{
256
int i;
@@ -275,13 +286,7 @@ static void add_rfc2047(struct strbuf *sb, const char *line, int len,
286
static const int max_length = 78; /* per rfc2822 */
287
static const int max_encoded_length = 76; /* per rfc2047 */
288
int i;
278
- int line_len;
279
-
280
- /* How many bytes are already used on the current line? */
281
- for (i = sb->len - 1; i >= 0; i--)
282
- if (sb->buf[i] == '\n')
283
- break;
284
- line_len = sb->len - (i+1);
289
+ int line_len = last_line_length(sb);
290
291
for (i = 0; i < len; i++) {
292
int ch = line[i];
@@ -346,7 +351,6 @@ void pp_user_info(const struct pretty_print_context *pp,
351
if (pp->fmt == CMIT_FMT_EMAIL) {
352
char *name_tail = strchr(line, '<');
353
int display_name_length;
349
- int final_line;
354
if (!name_tail)
355
return;
356
while (line < name_tail && isspace(name_tail[-1]))
@@ -361,10 +365,7 @@ void pp_user_info(const struct pretty_print_context *pp,
365
add_rfc2047(sb, quoted.buf, quoted.len, encoding);
366
strbuf_release("ed);
367
}
364
- for (final_line = 0; final_line < sb->len; final_line++)
365
- if (sb->buf[sb->len - final_line - 1] == '\n')
366
- break;
367
- if (namelen - display_name_length + final_line > 78) {
368
+ if (namelen - display_name_length + last_line_length(sb) > 78) {
369
strbuf_addch(sb, '\n');
370
if (!isspace(name_tail[0]))
371
strbuf_addch(sb, ' ');