@@ -11,37 +11,31 @@ void ffFormatAppendFormatArg(FFstrbuf* buffer, const FFformatarg* formatarg)
11
11
switch (formatarg -> type )
12
12
{
13
13
case FF_FORMAT_ARG_TYPE_INT :
14
- ffStrbufAppendF (buffer , "%" PRIi32 , * (int32_t * )formatarg -> value );
14
+ ffStrbufAppendSInt (buffer , * (int32_t * )formatarg -> value );
15
15
break ;
16
16
case FF_FORMAT_ARG_TYPE_UINT :
17
- ffStrbufAppendF (buffer , "%" PRIu32 , * (uint32_t * )formatarg -> value );
17
+ ffStrbufAppendUInt (buffer , * (uint32_t * )formatarg -> value );
18
18
break ;
19
19
case FF_FORMAT_ARG_TYPE_UINT64 :
20
- ffStrbufAppendF (buffer , "%" PRIu64 , * (uint64_t * )formatarg -> value );
20
+ ffStrbufAppendUInt (buffer , * (uint64_t * )formatarg -> value );
21
21
break ;
22
22
case FF_FORMAT_ARG_TYPE_UINT16 :
23
- ffStrbufAppendF (buffer , "%" PRIu16 , * (uint16_t * )formatarg -> value );
23
+ ffStrbufAppendUInt (buffer , * (uint16_t * )formatarg -> value );
24
24
break ;
25
25
case FF_FORMAT_ARG_TYPE_UINT8 :
26
- ffStrbufAppendF (buffer , "%" PRIu8 , * (uint8_t * )formatarg -> value );
26
+ ffStrbufAppendUInt (buffer , * (uint8_t * )formatarg -> value );
27
27
break ;
28
28
case FF_FORMAT_ARG_TYPE_STRING :
29
29
ffStrbufAppendS (buffer , (const char * )formatarg -> value );
30
30
break ;
31
31
case FF_FORMAT_ARG_TYPE_STRBUF :
32
- ffStrbufAppend (buffer , (FFstrbuf * )formatarg -> value );
32
+ ffStrbufAppend (buffer , (const FFstrbuf * )formatarg -> value );
33
33
break ;
34
34
case FF_FORMAT_ARG_TYPE_FLOAT :
35
- if (instance .config .display .fractionNdigits >= 0 )
36
- ffStrbufAppendF (buffer , "%.*f" , instance .config .display .fractionNdigits , * (float * )formatarg -> value );
37
- else
38
- ffStrbufAppendF (buffer , "%g" , * (float * )formatarg -> value );
35
+ ffStrbufAppendDouble (buffer , * (float * )formatarg -> value , instance .config .display .fractionNdigits );
39
36
break ;
40
37
case FF_FORMAT_ARG_TYPE_DOUBLE :
41
- if (instance .config .display .fractionNdigits >= 0 )
42
- ffStrbufAppendF (buffer , "%.*f" , instance .config .display .fractionNdigits , * (double * )formatarg -> value );
43
- else
44
- ffStrbufAppendF (buffer , "%g" , * (double * )formatarg -> value );
38
+ ffStrbufAppendDouble (buffer , * (double * )formatarg -> value , instance .config .display .fractionNdigits );
45
39
break ;
46
40
case FF_FORMAT_ARG_TYPE_BOOL :
47
41
ffStrbufAppendS (buffer , * (bool * )formatarg -> value ? "true" : "false" );
0 commit comments