commit dbffebf560a8418703ad9e1d987adbfa08fd3822
Author: Oswald Buddenhagen <[email protected]>
Date: Tue May 3 13:38:57 2022 +0200
factor out ADD_NL() inside copy_msg_convert()
src/sync_msg_cvt.c | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/sync_msg_cvt.c b/src/sync_msg_cvt.c
index 4f8403ed..93b43676 100644
--- a/src/sync_msg_cvt.c
+++ b/src/sync_msg_cvt.c
@@ -131,6 +131,13 @@ copy_msg_convert( int in_cr, int out_cr, copy_vars_t *vars
)
extra += add_subj ? strlen(dummy_subj) + app_cr + 1 :
strlen(dummy_pfx);
}
+#define ADD_NL() \
+ do { \
+ if (app_cr) \
+ *out_buf++ = '\r'; \
+ *out_buf++ = '\n'; \
+ } while (0)
+
vars->data.len = in_len + extra;
if (vars->data.len > INT_MAX) {
free( in_buf );
@@ -150,9 +157,7 @@ copy_msg_convert( int in_cr, int out_cr, copy_vars_t *vars )
out_buf += 8;
memcpy( out_buf, vars->srec->tuid, TUIDL );
out_buf += TUIDL;
- if (app_cr)
- *out_buf++ = '\r';
- *out_buf++ = '\n';
+ ADD_NL();
idx = ebreak;
if (break2 != UINT_MAX && break2 >= sbreak) {
@@ -163,9 +168,7 @@ copy_msg_convert( int in_cr, int out_cr, copy_vars_t *vars )
} else {
memcpy( out_buf, dummy_subj, strlen(dummy_subj)
);
out_buf += strlen(dummy_subj);
- if (app_cr)
- *out_buf++ = '\r';
- *out_buf++ = '\n';
+ ADD_NL();
}
}
}
_______________________________________________
isync-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/isync-devel
