comparison th_string.c @ 354:e96015ed35d0

Change where we bail out from th_printf_vput_int() when th_printf_vbuf_int*() fail.
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 25 Feb 2016 09:24:08 +0200
parents 2bf43a139542
children 5016bf56e5d8
comparison
equal deleted inserted replaced
353:2bf43a139542 354:e96015ed35d0
190 { 190 {
191 ret = th_printf_vbuf_int(buf, sizeof(buf), &f_len, va_arg(ap, unsigned int), 191 ret = th_printf_vbuf_int(buf, sizeof(buf), &f_len, va_arg(ap, unsigned int),
192 f_radix, f_flags, f_prec, f_unsig, &f_neg); 192 f_radix, f_flags, f_prec, f_unsig, &f_neg);
193 } 193 }
194 194
195 if (ret == EOF)
196 return ret;
197
195 f_altstr = ret != 0 && (f_flags & TH_PF_ALT) && f_alt != NULL ? f_alt(f_flags) : NULL; 198 f_altstr = ret != 0 && (f_flags & TH_PF_ALT) && f_alt != NULL ? f_alt(f_flags) : NULL;
196 if (f_flags & TH_PF_ALT) f_width = 0; 199 if (f_flags & TH_PF_ALT) f_width = 0;
197
198 if (ret == EOF)
199 return ret;
200 200
201 // Are we using a sign prefix? 201 // Are we using a sign prefix?
202 f_sign = f_unsig ? 0 : ((f_flags & TH_PF_SIGN) ? 202 f_sign = f_unsig ? 0 : ((f_flags & TH_PF_SIGN) ?
203 (f_neg ? '-' : '+') : 203 (f_neg ? '-' : '+') :
204 (f_neg ? '-' : ((f_flags & TH_PF_SPACE) ? ' ' : 0))); 204 (f_neg ? '-' : ((f_flags & TH_PF_SPACE) ? ' ' : 0)));