lobo/isync
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

return error strings from copy_msg_convert()

Browse Source 
... instead of reporting conversion errors directly in copy_msg_convert().
this makes it easier to autotest properly.

this reverts bc15e571 in spirit, sidestepping the problem it tried to
solve instead.
This commit is contained in:
Oswald Buddenhagen 2022-05-01 11:55:58 +02:00
parent 9b72e10320
commit 46d244533e
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/sync.c
View File

@ -133,8 +133,8 @@ copy_msg_bytes( char **out_ptr, const char *in_buf, uint *in_idx, uint in_len, i
*in_idx = idx; *in_idx = idx;
} }
static int static char *
copy_msg_convert( int in_cr, int out_cr, copy_vars_t *vars, int t ) copy_msg_convert( int in_cr, int out_cr, copy_vars_t *vars )
{ {
char *in_buf = vars->data.data; char *in_buf = vars->data.data;
uint in_len = vars->data.len; uint in_len = vars->data.len;
@ -180,10 +180,8 @@ copy_msg_convert( int in_cr, int out_cr, copy_vars_t *vars, int t )
goto nloop; goto nloop;
} }
} }
warn( "Warning: message %u from %s has incomplete header; skipping.\n",
vars->msg->uid, str_fn[t^1] );
free( in_buf ); free( in_buf );
return 0; return "has incomplete header";
oke: oke:
app_cr = out_cr && (!in_cr || hdr_crs); app_cr = out_cr && (!in_cr || hdr_crs);
extra += 8 + TUIDL + app_cr + 1; extra += 8 + TUIDL + app_cr + 1;
@ -231,10 +229,8 @@ copy_msg_convert( int in_cr, int out_cr, copy_vars_t *vars, int t )
vars->data.len = in_len + extra; vars->data.len = in_len + extra;
if (vars->data.len > INT_MAX) { if (vars->data.len > INT_MAX) {
warn( "Warning: message %u from %s is too big after conversion; skipping.\n",
vars->msg->uid, str_fn[t^1] );
free( in_buf ); free( in_buf );
return 0; return "is too big after conversion";
} }
char *out_buf = vars->data.data = nfmalloc( vars->data.len ); char *out_buf = vars->data.data = nfmalloc( vars->data.len );
idx = 0; idx = 0;
@ -275,7 +271,7 @@ copy_msg_convert( int in_cr, int out_cr, copy_vars_t *vars, int t )
memcpy( out_buf, dummy_msg_buf, dummy_msg_len ); memcpy( out_buf, dummy_msg_buf, dummy_msg_len );
free( in_buf ); free( in_buf );
return 1; return NULL;
} }
static void static void
@ -318,7 +314,9 @@ msg_fetched( int sts, void *aux )
scr = svars->can_crlf[t^1]; scr = svars->can_crlf[t^1];
tcr = svars->can_crlf[t]; tcr = svars->can_crlf[t];
if (srec || scr != tcr) { if (srec || scr != tcr) {
if (!copy_msg_convert( scr, tcr, vars, t )) { const char *err;
if ((err = copy_msg_convert( scr, tcr, vars ))) {
warn( "Warning: message %u from %s %s; skipping.\n", vars->msg->uid, str_fn[t^1], err );
vars->cb( SYNC_NOGOOD, 0, vars ); vars->cb( SYNC_NOGOOD, 0, vars );
return; return;
} }