[core] rm C99 workaround for snprintf

README/ReleaseNotes/v642/index.md

@@ -10,8 +10,6 @@ For more information, see:
 
 [http://root.cern](http://root.cern)
 
-The following people have contributed to this new version:
-
 The following people have contributed to this new version:
 
  Bertrand Bellenot, CERN/EP-SFT,\
@@ -67,11 +65,12 @@ Users are encouraged to export their models to ONNX and use the retained ONNX pa
 * The **RooStats::DebuggingSampler** and **RooStats::DebuggingTestStat** classes are removed. They were mock implementations of the `TestStatSampler` and `TestStatistic` interfaces that returned uniform random numbers independent of the data, only meant for debugging the RooStats framework itself during its initial development.
 * The `RooTrace` class is deprecated and will be removed in ROOT 6.44. It was a RooFit-specific memory tracer whose instrumentation hooks are compiled out by default, so it has been inert and untested for years. For memory debugging, please use general-purpose tools such as AddressSanitizer or Valgrind instead.
 * Support for the AIX operating system has been removed from the codebase. This support has not been tested since the late v5 releases and the LLVM JIT is not yet supporting AIX.
+* The `ROOT::Math::ParamFunctionBase`, `ROOT::Math::ParamFunctorHandler` and `ROOT::Math::ParamMemFunHandler` classes in `Math/ParamFunctor.h` are removed, together with the `ParamFunctor::GetImpl()` and `ParamFunctor::SetFunction()` methods that exposed them. They implemented the type erasure that `ParamFunctor` now gets from `std::function`, mirroring what was already done for `ROOT::Math::Functor`. Constructing and calling a `ParamFunctor` is unchanged, except that the constructor from an object and one of its member functions now takes a plain pointer to the object instead of anything dereferenceable, so smart pointers are no longer accepted there.
+* The header `Rpair.h` is deprecated and will be removed after ROOT 6.44.
 * The headers `Htypes.h` and `Gtypes.h` that were deprecated in ROOT 6.20 will now emit warnings and will be fully removed in ROOT 6.44. Use instead `Rtypes.h`.
 * The header `GLConstants.h` is no longer part of ROOT installed headers.
 * The header `RStringView.h` deprecated in ROOT 6.14  will now emit warnings and will be fully removed after ROOT 6.44. Use `ROOT/RStringView.hxx` instead.
-* The `ROOT::Math::ParamFunctionBase`, `ROOT::Math::ParamFunctorHandler` and `ROOT::Math::ParamMemFunHandler` classes in `Math/ParamFunctor.h` are removed, together with the `ParamFunctor::GetImpl()` and `ParamFunctor::SetFunction()` methods that exposed them. They implemented the type erasure that `ParamFunctor` now gets from `std::function`, mirroring what was already done for `ROOT::Math::Functor`. Constructing and calling a `ParamFunctor` is unchanged, except that the constructor from an object and one of its member functions now takes a plain pointer to the object instead of anything dereferenceable, so smart pointers are no longer accepted there.
-* The header `Rpair.h` is deprecated and will be removed after ROOT 6.44.
+* The header `snprintf.h` is deprecated (will emit warnings) and will be removed in ROOT 6.44. Use instead `<cstdio>`.
 
 ## Build System
 

cmake/modules/RootMacros.cmake

@@ -858,7 +858,7 @@ function (ROOT_CXXMODULES_APPEND_TO_MODULEMAP library library_headers)
                         DllImport.h ESTLType.h Varargs.h
                         ThreadLocalStorage.h
                         TBranchProxyTemplate.h
-                        snprintf.h strlcpy.h)
+                        strlcpy.h)
 
    # Deprecated header files.
   set (excluded_headers "${excluded_headers}")

cmake/unix/module.modulemap

@@ -3,7 +3,6 @@
 module ROOT_Foundation_C  {
   module "ThreadLocalStorage.h" { header "ThreadLocalStorage.h" export * }
   module "strlcpy.h" { header "strlcpy.h" export * }
-  module "snprintf.h" { header "snprintf.h" export * }
 
   export *
 }

core/base/inc/Rtypes.h

@@ -27,7 +27,6 @@
 #include <cstdio>
 #include "strtok.h"     // provides R__STRTOK_R with <cstring> include
 #include "strlcpy.h"    // part of string.h on systems that have it
-#include "snprintf.h"   // part of stdio.h on systems that have it
 #include <type_traits>
 #endif
 

core/base/inc/TString.h

@@ -27,7 +27,6 @@
 
 #include <string_view>
 #include "ROOT/TypeTraits.hxx"
-#include "snprintf.h"
 
 #include <iosfwd>
 #include <cstdarg>

core/base/src/TColor.cxx

@@ -19,10 +19,10 @@
 #include "TMathBase.h"
 #include "TApplication.h"
 #include "TColorGradient.h"
-#include "snprintf.h"
 
 #include <algorithm>
 #include <cmath>
+#include <cstdio>
 #include <fstream>
 #include <iostream>
 #include <sstream>

core/base/src/TDatime.cxx

@@ -35,13 +35,12 @@ required, use TTimeStamp.
 
 #include "TBuffer.h"
 #include "Strlen.h"
-#include "snprintf.h"
 #include "TDatime.h"
 #include "TError.h"
 #include "Bytes.h"
 #include "TString.h"
 
-
+#include <cstdio>
 
 ////////////////////////////////////////////////////////////////////////////////
 /// Create a TDatime and set it to the current time.

core/base/src/TObject.cxx

@@ -36,20 +36,7 @@ class hierarchies (watch out for overlaps).
    that the object was allocated on the heap).
 */
 
-#include <cstring>
-#if !defined(WIN32) && !defined(__MWERKS__) && !defined(R__SOLARIS)
-#include <strings.h>
-#endif
-#include <cstdlib>
-#include <cstdio>
-#include <sstream>
-#include <fstream>
-#include <iostream>
-#include <iomanip>
-#include <limits>
-
 #include "Varargs.h"
-#include "snprintf.h"
 #include "TObject.h"
 #include "TBuffer.h"
 #include "TClass.h"
@@ -64,6 +51,18 @@ class hierarchies (watch out for overlaps).
 #include "TRefTable.h"
 #include "TProcessID.h"
 
+#include <cstring>
+#if !defined(WIN32) && !defined(__MWERKS__) && !defined(R__SOLARIS)
+#include <strings.h>
+#endif
+#include <cstdlib>
+#include <cstdio>
+#include <sstream>
+#include <fstream>
+#include <iostream>
+#include <iomanip>
+#include <limits>
+
 Longptr_t TObject::fgDtorOnly   = 0;
 Bool_t    TObject::fgObjectStat = kTRUE;
 

core/base/src/TProcessID.cxx

@@ -50,7 +50,8 @@ of TUUIDs.
 #include "TExMap.h"
 #include "TVirtualMutex.h"
 #include "TError.h"
-#include "snprintf.h"
+
+#include <cstdio>
 
 TObjArray  *TProcessID::fgPIDs   = nullptr; //pointer to the list of TProcessID
 TProcessID *TProcessID::fgPID    = nullptr; //pointer to the TProcessID of the current session

core/clib/CMakeLists.txt

@@ -10,7 +10,6 @@
 
 set_property(TARGET Core APPEND PROPERTY DICT_HEADERS
   strlcpy.h
-  snprintf.h
   strtok.h
 )
 
@@ -26,7 +25,6 @@ ROOT_OBJECT_LIBRARY(Clib
   src/mmcheck.c
   src/mrealloc.c
   src/sbrksup.c
-  src/snprintf.c
   src/strlcat.c
   src/strlcpy.c
 )

core/clib/inc/snprintf.h

@@ -10,34 +10,12 @@
 #ifndef ROOT_snprintf
 #define ROOT_snprintf
 
+#warning "This header is deprecated and will be removed in ROOT 6.44, use instead <cstdio>"
+
 #include <ROOT/RConfig.hxx>
 #include <stdio.h>
 #ifdef NEED_SNPRINTF
-
-#include <stdarg.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef WIN32
-#pragma warning( push )
-#pragma warning (disable: 4273)
-#endif
-
-#ifndef DONTNEED_VSNPRINTF
-int vsnprintf(char *string, size_t length, const char *format, va_list args);
-#endif
-int snprintf(char *string, size_t length, const char *format, ...);
-
-#ifdef WIN32
-#pragma warning( pop )
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
+#error "ROOT no longer provides fallback implementation for snprintf. NEED_SNPRINTF should not be defined."
 #endif /* NEED_SNPRINTF */
 
 #endif /* ROOT_snprintf */