From ca9bdad88ac67d9851e45866146bf8a709981591 Mon Sep 17 00:00:00 2001 From: Markus Gans Date: Fri, 5 Oct 2018 05:35:33 +0200 Subject: [PATCH] Fix va_start format passing --- src/fstring.cpp | 2 +- src/ftermbuffer.cpp | 2 +- src/fvterm.cpp | 2 +- src/include/final/fstring.h | 2 +- src/include/final/ftermbuffer.h | 2 +- src/include/final/fvterm.h | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/fstring.cpp b/src/fstring.cpp index f7283af7..0a5f1ef6 100644 --- a/src/fstring.cpp +++ b/src/fstring.cpp @@ -566,7 +566,7 @@ uInt FString::getUTF8length() const } //---------------------------------------------------------------------- -FString& FString::sprintf (const FString& format, ...) +FString& FString::sprintf (const FString format, ...) { static const int BUFSIZE = 4096; wchar_t buffer[BUFSIZE]; diff --git a/src/ftermbuffer.cpp b/src/ftermbuffer.cpp index 12a79b07..f5336cba 100644 --- a/src/ftermbuffer.cpp +++ b/src/ftermbuffer.cpp @@ -45,7 +45,7 @@ FTermBuffer::~FTermBuffer() // destructor // public methods of FTermBuffer //---------------------------------------------------------------------- -int FTermBuffer::writef (const FString& format, ...) +int FTermBuffer::writef (const FString format, ...) { static const int BUFSIZE = 4096; wchar_t buffer[BUFSIZE]; diff --git a/src/fvterm.cpp b/src/fvterm.cpp index 239fdb49..753d153d 100644 --- a/src/fvterm.cpp +++ b/src/fvterm.cpp @@ -294,7 +294,7 @@ void FVTerm::delPreprocessingHandler (FVTerm* instance) } //---------------------------------------------------------------------- -int FVTerm::printf (const FString& format, ...) +int FVTerm::printf (const FString format, ...) { static const int BUFSIZE = 4096; wchar_t buffer[BUFSIZE]; diff --git a/src/include/final/fstring.h b/src/include/final/fstring.h index 3eeac0cb..2f563a4b 100644 --- a/src/include/final/fstring.h +++ b/src/include/final/fstring.h @@ -193,7 +193,7 @@ class FString wchar_t front() const; wchar_t back() const; - FString& sprintf (const FString&, ...); + FString& sprintf (const FString, ...); FString clear(); const wchar_t* wc_str() const; diff --git a/src/include/final/ftermbuffer.h b/src/include/final/ftermbuffer.h index d133556f..8d63fd73 100644 --- a/src/include/final/ftermbuffer.h +++ b/src/include/final/ftermbuffer.h @@ -79,7 +79,7 @@ class FTermBuffer // Methods void clear(); - int writef (const FString&, ...); + int writef (const FString, ...); int write (const FString&); int write (int); FTermBuffer& write (); diff --git a/src/include/final/fvterm.h b/src/include/final/fvterm.h index 8ab19ab0..d778d2b3 100644 --- a/src/include/final/fvterm.h +++ b/src/include/final/fvterm.h @@ -235,7 +235,7 @@ class FVTerm : public FTerm , FPreprocessingHandler ); virtual void delPreprocessingHandler (FVTerm*); - int printf (const FString&, ...); + int printf (const FString, ...); int print (const FString&); int print (term_area*, const FString&); int print (const std::vector&);