@@ -982,15 +982,7 @@ int npf_vpprintf(npf_putc pc, void *pc_ctx, char const *format, va_list args) {
982
982
#undef NPF_EXTRACT
983
983
#undef NPF_WRITEBACK
984
984
985
- int _printf_c (char const * format , ...) {
986
- va_list va ;
987
- va_start (va , format );
988
- int const rv = vprintf (format , va );
989
- va_end (va );
990
- return rv ;
991
- }
992
-
993
- int _vsnprintf_c (char * buffer , size_t bufsz , char const * format , va_list vlist ) {
985
+ int _vsnprintf_c (char * __restrict buffer , size_t bufsz , char const * __restrict format , va_list vlist ) {
994
986
npf_bufputc_ctx_t bufputc_ctx ;
995
987
bufputc_ctx .dst = buffer ;
996
988
bufputc_ctx .len = bufsz ;
@@ -1009,36 +1001,31 @@ int _vsnprintf_c(char *buffer, size_t bufsz, char const *format, va_list vlist)
1009
1001
return n ;
1010
1002
}
1011
1003
1012
- int _snprintf_c (char * buffer , size_t bufsz , const char * format , ...) {
1004
+ int _snprintf_c (char * __restrict buffer , size_t bufsz , const char * __restrict format , ...) {
1013
1005
va_list va ;
1014
1006
va_start (va , format );
1015
- int const rv = vsnprintf (buffer , bufsz , format , va );
1007
+ int const rv = _vsnprintf_c (buffer , bufsz , format , va );
1016
1008
va_end (va );
1017
1009
return rv ;
1018
1010
}
1019
1011
1020
- int _vsprintf_c (char * buffer , const char * format , va_list vlist )
1012
+ int _vsprintf_c (char * __restrict buffer , const char * __restrict format , va_list vlist )
1021
1013
{
1022
- return vsnprintf (buffer , (size_t )INT_MAX , format , vlist );
1023
- }
1024
-
1025
- int _vprintf_c (const char * format , va_list vlist )
1026
- {
1027
- return npf_vpprintf (npf_putc_std , NULL , format , vlist );
1014
+ return _vsnprintf_c (buffer , (size_t )INT_MAX , format , vlist );
1028
1015
}
1029
1016
1030
- int _sprintf_c (char * buffer , const char * format , ...)
1017
+ int _sprintf_c (char * __restrict buffer , const char * __restrict format , ...)
1031
1018
{
1032
1019
va_list va ;
1033
1020
va_start (va , format );
1034
- const int ret = vsnprintf (buffer , (size_t )INT_MAX , format , va );
1021
+ const int ret = _vsnprintf_c (buffer , (size_t )INT_MAX , format , va );
1035
1022
va_end (va );
1036
1023
return ret ;
1037
1024
}
1038
1025
1039
1026
int _vasprintf_c (char * * __restrict p_str , const char * __restrict format , va_list vlist ) {
1040
1027
* p_str = NULL ;
1041
- int str_len = vsnprintf (NULL , 0 , format , vlist );
1028
+ int str_len = _vsnprintf_c (NULL , 0 , format , vlist );
1042
1029
if (str_len <= 0 ) {
1043
1030
return str_len ;
1044
1031
}
@@ -1048,7 +1035,7 @@ int _vasprintf_c(char **__restrict p_str, const char *__restrict format, va_list
1048
1035
// malloc failure
1049
1036
return -1 ;
1050
1037
}
1051
- int ret = vsnprintf (buf , buf_len , format , vlist );
1038
+ int ret = _vsnprintf_c (buf , buf_len , format , vlist );
1052
1039
if (ret <= 0 ) {
1053
1040
free (buf );
1054
1041
return ret ;
@@ -1060,11 +1047,12 @@ int _vasprintf_c(char **__restrict p_str, const char *__restrict format, va_list
1060
1047
int _asprintf_c (char * * __restrict p_str , const char * __restrict format , ...) {
1061
1048
va_list va ;
1062
1049
va_start (va , format );
1063
- const int ret = vasprintf (p_str , format , va );
1050
+ const int ret = _vasprintf_c (p_str , format , va );
1064
1051
va_end (va );
1065
1052
return ret ;
1066
1053
}
1067
1054
1055
+ __attribute__((__always_inline__ ))
1068
1056
int _vfprintf_c (FILE * __restrict stream , const char * __restrict format , va_list vlist )
1069
1057
{
1070
1058
return npf_vpprintf (npf_fputc_std , (void * )stream , format , vlist );
@@ -1074,11 +1062,25 @@ int _fprintf_c(FILE* __restrict stream, const char* __restrict format, ...)
1074
1062
{
1075
1063
va_list va ;
1076
1064
va_start (va , format );
1077
- const int ret = vfprintf (stream , format , va );
1065
+ const int ret = _vfprintf_c (stream , format , va );
1078
1066
va_end (va );
1079
1067
return ret ;
1080
1068
}
1081
1069
1070
+ __attribute__((__always_inline__ ))
1071
+ int _vprintf_c (const char * __restrict format , va_list vlist )
1072
+ {
1073
+ return npf_vpprintf (npf_putc_std , NULL , format , vlist );
1074
+ }
1075
+
1076
+ int _printf_c (char const * __restrict format , ...) {
1077
+ va_list va ;
1078
+ va_start (va , format );
1079
+ int const rv = _vprintf_c (format , va );
1080
+ va_end (va );
1081
+ return rv ;
1082
+ }
1083
+
1082
1084
#if NANOPRINTF_HAVE_GCC_WARNING_PRAGMAS
1083
1085
#pragma GCC diagnostic pop
1084
1086
#endif
0 commit comments