Mercurial > hg > th-libs

comparison th_string.c @ 341:1040f51bf770

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cosmetics.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 23 Feb 2016 21:59:45 +0200
parents 5d3601778dff
children 14aaa9bf4ea5
comparison
equal deleted inserted replaced
340:cde5415c4201 341:1040f51bf770
183 //#define TH_PFUNC_NAME th_printf_vput_size_t 183 //#define TH_PFUNC_NAME th_printf_vput_size_t
184 //#define TH_PFUNC_TYPE_U size_t 184 //#define TH_PFUNC_TYPE_U size_t
185 //#include "th_printf1.c" 185 //#include "th_printf1.c"
186 186
187 187
188 static int th_printf_vput_int(th_printf_ctx *ctx, th_printf_vputch vputch, va_list ap, 188 static int th_printf_vput_int(th_printf_ctx *ctx, th_printf_vputch vputch,
189 const int f_radix, int f_flags, int f_width, int f_prec, 189 va_list ap, const int f_radix, int f_flags, int f_width, int f_prec,
190 const BOOL f_unsig, char *(f_alt)(const int flags)) 190 const BOOL f_unsig, char *(f_alt)(const int flags))
191 { 191 {
192 char buf[64]; 192 char buf[64];
193 int f_len = 0, ret = 0, nwidth; 193 int f_len = 0, ret = 0, nwidth;
194 char f_sign, *f_altstr; 194 char f_sign, *f_altstr;
195 BOOL f_neg = FALSE; 195 BOOL f_neg = FALSE;
196 196
197
198 if (f_flags & TH_PF_LONGLONG) 197 if (f_flags & TH_PF_LONGLONG)
199 { 198 {
200 ret = th_printf_vbuf_int64(buf, sizeof(buf), &f_len, va_arg(ap, int64_t), 199 ret = th_printf_vbuf_int64(buf, sizeof(buf), &f_len, va_arg(ap, int64_t),
201 f_radix, f_flags, f_prec, f_unsig, &f_neg); 200 f_radix, f_flags, f_prec, f_unsig, &f_neg);
202 } 201 }
211 210
212 if (ret == EOF) 211 if (ret == EOF)
213 return ret; 212 return ret;
214 213
215 // Are we using a sign prefix? 214 // Are we using a sign prefix?
216 f_sign = f_unsig ? 0 : ((f_flags & TH_PF_SIGN) ? (f_neg ? '-' : '+') : (f_neg ? '-' : ((f_flags & TH_PF_SPACE) ? ' ' : 0))); 215 f_sign = f_unsig ? 0 : ((f_flags & TH_PF_SIGN) ?
216 (f_neg ? '-' : '+') :
217 (f_neg ? '-' : ((f_flags & TH_PF_SPACE) ? ' ' : 0)));
217 218
218 // Calculate necessary padding, etc 219 // Calculate necessary padding, etc
219 f_prec = (f_prec > f_len) ? f_prec - f_len : 0; 220 f_prec = (f_prec > f_len) ? f_prec - f_len : 0;
220 nwidth = f_width - f_len - f_prec - (f_sign ? 1 : 0) - (f_altstr ? strlen(f_altstr) : 0); 221 nwidth = f_width - f_len - f_prec - (f_sign ? 1 : 0) - (f_altstr ? strlen(f_altstr) : 0);
221 222