correct calls to Rf_warning (closes #776)

eddelbuettel · eddelbuettel · commit 699fc0aa5f8c · 2017-11-25T09:29:50.000-06:00
diff --git a/ChangeLog b/ChangeLog
@@ -1,7 +1,15 @@
+2017-11-25  Dirk Eddelbuettel  <edd@debian.org>
+
+        * DESCRIPTION (Version, Date): Roll minor version
+
+        * inst/include/Rcpp/exceptions/cpp11/exceptions.h: Ensure Rf_format gets
+        a format string
+        * inst/include/Rcpp/exceptions/cpp98/exceptions.h (Rcpp): Ditto
+
 2017-11-18  Dirk Eddelbuettel  <edd@debian.org>
 
         * DESCRIPTION (Version, Date): Roll minor version
-        
+
         * vignettes/Rcpp-FAQ.Rmd: Use Rcpp::Rcpp.plugin.maker(), not ':::'
 
 2017-11-17  Dirk Eddelbuettel  <edd@debian.org>
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: Rcpp
 Title: Seamless R and C++ Integration
-Version: 0.12.14.1
-Date: 2017-11-18
+Version: 0.12.14.2
+Date: 2017-11-25
 Author: Dirk Eddelbuettel, Romain Francois, JJ Allaire, Kevin Ushey, Qiang Kou,
  Nathan Russell, Douglas Bates and John Chambers
 Maintainer: Dirk Eddelbuettel <edd@debian.org>
diff --git a/inst/include/Rcpp/exceptions/cpp11/exceptions.h b/inst/include/Rcpp/exceptions/cpp11/exceptions.h
@@ -44,7 +44,7 @@ class __CLASS__ : public std::exception {
 
 template <typename... Args>
 inline void warning(const char* fmt, Args&&... args ) {
-    Rf_warning( tfm::format(fmt, std::forward<Args>(args)... ).c_str() );
+    Rf_warning("%s", tfm::format(fmt, std::forward<Args>(args)... ).c_str());
 }
 
 template <typename... Args>
diff --git a/inst/include/Rcpp/exceptions/cpp98/exceptions.h b/inst/include/Rcpp/exceptions/cpp98/exceptions.h
@@ -70,52 +70,52 @@ class __CLASS__ : public std::exception{
 
 template <typename T1>
 inline void warning(const char* fmt, const T1& arg1) {
-    Rf_warning( tfm::format(fmt, arg1 ).c_str() );
+    Rf_warning("%s", tfm::format(fmt, arg1).c_str());
 }
 
 template <typename T1, typename T2>
 inline void warning(const char* fmt, const T1& arg1, const T2& arg2) {
-    Rf_warning( tfm::format(fmt, arg1, arg2 ).c_str() );
+    Rf_warning("%s", tfm::format(fmt, arg1, arg2).c_str());
 }
 
 template <typename T1, typename T2, typename T3>
 inline void warning(const char* fmt, const T1& arg1, const T2& arg2, const T3& arg3) {
-    Rf_warning( tfm::format(fmt, arg1, arg2, arg3).c_str() );
+    Rf_warning("%s", tfm::format(fmt, arg1, arg2, arg3).c_str());
 }
 
 template <typename T1, typename T2, typename T3, typename T4>
 inline void warning(const char* fmt, const T1& arg1, const T2& arg2, const T3& arg3, const T4& arg4) {
-    Rf_warning( tfm::format(fmt, arg1, arg2, arg3, arg4).c_str() );
+    Rf_warning("%s", tfm::format(fmt, arg1, arg2, arg3, arg4).c_str());
 }
 
 template <typename T1, typename T2, typename T3, typename T4, typename T5>
 inline void warning(const char* fmt, const T1& arg1, const T2& arg2, const T3& arg3, const T4& arg4, const T5& arg5) {
-    Rf_warning( tfm::format(fmt, arg1, arg2, arg3, arg4, arg5).c_str() );
+    Rf_warning("%s", tfm::format(fmt, arg1, arg2, arg3, arg4, arg5).c_str());
 }
 
 template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6>
 inline void warning(const char* fmt, const T1& arg1, const T2& arg2, const T3& arg3, const T4& arg4, const T5& arg5, const T6& arg6) {
-    Rf_warning( tfm::format(fmt, arg1, arg2, arg3, arg4, arg5, arg6).c_str() );
+    Rf_warning("%s", tfm::format(fmt, arg1, arg2, arg3, arg4, arg5, arg6).c_str());
 }
 
 template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7>
 inline void warning(const char* fmt, const T1& arg1, const T2& arg2, const T3& arg3, const T4& arg4, const T5& arg5, const T6& arg6, const T7& arg7) {
-    Rf_warning( tfm::format(fmt, arg1, arg2, arg3, arg4, arg5, arg6, arg7).c_str() );
+    Rf_warning("%s", tfm::format(fmt, arg1, arg2, arg3, arg4, arg5, arg6, arg7).c_str());
 }
 
 template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8>
 inline void warning(const char* fmt, const T1& arg1, const T2& arg2, const T3& arg3, const T4& arg4, const T5& arg5, const T6& arg6, const T7& arg7, const T8& arg8) {
-    Rf_warning( tfm::format(fmt, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8).c_str() );
+    Rf_warning("%s", tfm::format(fmt, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8).c_str());
 }
 
 template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8, typename T9>
 inline void warning(const char* fmt, const T1& arg1, const T2& arg2, const T3& arg3, const T4& arg4, const T5& arg5, const T6& arg6, const T7& arg7, const T8& arg8, const T9& arg9) {
-    Rf_warning( tfm::format(fmt, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9).c_str() );
+    Rf_warning("%s", tfm::format(fmt, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9).c_str());
 }
 
 template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8, typename T9, typename T10>
 inline void warning(const char* fmt, const T1& arg1, const T2& arg2, const T3& arg3, const T4& arg4, const T5& arg5, const T6& arg6, const T7& arg7, const T8& arg8, const T9& arg9, const T10& arg10) {
-    Rf_warning( tfm::format(fmt, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10).c_str() );
+    Rf_warning("%s", tfm::format(fmt, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10).c_str());
 }
 
 // -- End Rcpp::warning declaration
@@ -124,52 +124,52 @@ inline void warning(const char* fmt, const T1& arg1, const T2& arg2, const T3& a
 
 template <typename T1>
 inline void NORET stop(const char* fmt, const T1& arg1) {
-    throw Rcpp::exception( tfm::format(fmt, arg1 ).c_str() );
+    throw Rcpp::exception(tfm::format(fmt, arg1).c_str());
 }
 
 template <typename T1, typename T2>
 inline void NORET stop(const char* fmt, const T1& arg1, const T2& arg2) {
-    throw Rcpp::exception( tfm::format(fmt, arg1, arg2 ).c_str() );
+    throw Rcpp::exception(tfm::format(fmt, arg1, arg2).c_str());
 }
 
 template <typename T1, typename T2, typename T3>
 inline void NORET stop(const char* fmt, const T1& arg1, const T2& arg2, const T3& arg3) {
-    throw Rcpp::exception( tfm::format(fmt, arg1, arg2, arg3).c_str() );
+    throw Rcpp::exception(tfm::format(fmt, arg1, arg2, arg3).c_str());
 }
 
 template <typename T1, typename T2, typename T3, typename T4>
 inline void NORET stop(const char* fmt, const T1& arg1, const T2& arg2, const T3& arg3, const T4& arg4) {
-    throw Rcpp::exception( tfm::format(fmt, arg1, arg2, arg3, arg4).c_str() );
+    throw Rcpp::exception(tfm::format(fmt, arg1, arg2, arg3, arg4).c_str());
 }
 
 template <typename T1, typename T2, typename T3, typename T4, typename T5>
 inline void NORET stop(const char* fmt, const T1& arg1, const T2& arg2, const T3& arg3, const T4& arg4, const T5& arg5) {
-    throw Rcpp::exception( tfm::format(fmt, arg1, arg2, arg3, arg4, arg5).c_str() );
+    throw Rcpp::exception(tfm::format(fmt, arg1, arg2, arg3, arg4, arg5).c_str());
 }
 
 template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6>
 inline void NORET stop(const char* fmt, const T1& arg1, const T2& arg2, const T3& arg3, const T4& arg4, const T5& arg5, const T6& arg6) {
-    throw Rcpp::exception( tfm::format(fmt, arg1, arg2, arg3, arg4, arg5, arg6).c_str() );
+    throw Rcpp::exception(tfm::format(fmt, arg1, arg2, arg3, arg4, arg5, arg6).c_str());
 }
 
 template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7>
 inline void NORET stop(const char* fmt, const T1& arg1, const T2& arg2, const T3& arg3, const T4& arg4, const T5& arg5, const T6& arg6, const T7& arg7) {
-    throw Rcpp::exception( tfm::format(fmt, arg1, arg2, arg3, arg4, arg5, arg6, arg7).c_str() );
+    throw Rcpp::exception(tfm::format(fmt, arg1, arg2, arg3, arg4, arg5, arg6, arg7).c_str());
 }
 
 template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8>
 inline void NORET stop(const char* fmt, const T1& arg1, const T2& arg2, const T3& arg3, const T4& arg4, const T5& arg5, const T6& arg6, const T7& arg7, const T8& arg8) {
-    throw Rcpp::exception( tfm::format(fmt, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8).c_str() );
+    throw Rcpp::exception(tfm::format(fmt, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8).c_str());
 }
 
 template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8, typename T9>
 inline void NORET stop(const char* fmt, const T1& arg1, const T2& arg2, const T3& arg3, const T4& arg4, const T5& arg5, const T6& arg6, const T7& arg7, const T8& arg8, const T9& arg9) {
-    throw Rcpp::exception( tfm::format(fmt, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9).c_str() );
+    throw Rcpp::exception(tfm::format(fmt, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9).c_str());
 }
 
 template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8, typename T9, typename T10>
 inline void NORET stop(const char* fmt, const T1& arg1, const T2& arg2, const T3& arg3, const T4& arg4, const T5& arg5, const T6& arg6, const T7& arg7, const T8& arg8, const T9& arg9, const T10& arg10) {
-    throw Rcpp::exception( tfm::format(fmt, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10).c_str() );
+    throw Rcpp::exception(tfm::format(fmt, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10).c_str());
 }
 
 // -- End Rcpp::stop declaration

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ class __CLASS__ : public std::exception {`
`44`	`44`
`45`	`45`	`template <typename... Args>`
`46`	`46`	`inline void warning(const char* fmt, Args&&... args ) {`
`47`		`- Rf_warning( tfm::format(fmt, std::forward<Args>(args)... ).c_str() );`
	`47`	`+ Rf_warning("%s", tfm::format(fmt, std::forward<Args>(args)... ).c_str());`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`template <typename... Args>`
Original file line number	Diff line number	Diff line change
`@@ -70,52 +70,52 @@ class __CLASS__ : public std::exception{`
`70`	`70`
`71`	`71`	`template <typename T1>`
`72`	`72`	`inline void warning(const char* fmt, const T1& arg1) {`
`73`		`- Rf_warning( tfm::format(fmt, arg1 ).c_str() );`
	`73`	`+ Rf_warning("%s", tfm::format(fmt, arg1).c_str());`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`template <typename T1, typename T2>`
`77`	`77`	`inline void warning(const char* fmt, const T1& arg1, const T2& arg2) {`
`78`		`- Rf_warning( tfm::format(fmt, arg1, arg2 ).c_str() );`
	`78`	`+ Rf_warning("%s", tfm::format(fmt, arg1, arg2).c_str());`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`template <typename T1, typename T2, typename T3>`
`82`	`82`	`inline void warning(const char* fmt, const T1& arg1, const T2& arg2, const T3& arg3) {`
`83`		`- Rf_warning( tfm::format(fmt, arg1, arg2, arg3).c_str() );`
	`83`	`+ Rf_warning("%s", tfm::format(fmt, arg1, arg2, arg3).c_str());`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`template <typename T1, typename T2, typename T3, typename T4>`
`87`	`87`	`inline void warning(const char* fmt, const T1& arg1, const T2& arg2, const T3& arg3, const T4& arg4) {`
`88`		`- Rf_warning( tfm::format(fmt, arg1, arg2, arg3, arg4).c_str() );`
	`88`	`+ Rf_warning("%s", tfm::format(fmt, arg1, arg2, arg3, arg4).c_str());`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`template <typename T1, typename T2, typename T3, typename T4, typename T5>`
`92`	`92`	`inline void warning(const char* fmt, const T1& arg1, const T2& arg2, const T3& arg3, const T4& arg4, const T5& arg5) {`
`93`		`- Rf_warning( tfm::format(fmt, arg1, arg2, arg3, arg4, arg5).c_str() );`
	`93`	`+ Rf_warning("%s", tfm::format(fmt, arg1, arg2, arg3, arg4, arg5).c_str());`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6>`
`97`	`97`	`inline void warning(const char* fmt, const T1& arg1, const T2& arg2, const T3& arg3, const T4& arg4, const T5& arg5, const T6& arg6) {`
`98`		`- Rf_warning( tfm::format(fmt, arg1, arg2, arg3, arg4, arg5, arg6).c_str() );`
	`98`	`+ Rf_warning("%s", tfm::format(fmt, arg1, arg2, arg3, arg4, arg5, arg6).c_str());`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7>`
`102`	`102`	`inline void warning(const char* fmt, const T1& arg1, const T2& arg2, const T3& arg3, const T4& arg4, const T5& arg5, const T6& arg6, const T7& arg7) {`
`103`		`- Rf_warning( tfm::format(fmt, arg1, arg2, arg3, arg4, arg5, arg6, arg7).c_str() );`
	`103`	`+ Rf_warning("%s", tfm::format(fmt, arg1, arg2, arg3, arg4, arg5, arg6, arg7).c_str());`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8>`
`107`	`107`	`inline void warning(const char* fmt, const T1& arg1, const T2& arg2, const T3& arg3, const T4& arg4, const T5& arg5, const T6& arg6, const T7& arg7, const T8& arg8) {`
`108`		`- Rf_warning( tfm::format(fmt, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8).c_str() );`
	`108`	`+ Rf_warning("%s", tfm::format(fmt, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8).c_str());`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8, typename T9>`
`112`	`112`	`inline void warning(const char* fmt, const T1& arg1, const T2& arg2, const T3& arg3, const T4& arg4, const T5& arg5, const T6& arg6, const T7& arg7, const T8& arg8, const T9& arg9) {`
`113`		`- Rf_warning( tfm::format(fmt, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9).c_str() );`
	`113`	`+ Rf_warning("%s", tfm::format(fmt, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9).c_str());`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8, typename T9, typename T10>`
`117`	`117`	`inline void warning(const char* fmt, const T1& arg1, const T2& arg2, const T3& arg3, const T4& arg4, const T5& arg5, const T6& arg6, const T7& arg7, const T8& arg8, const T9& arg9, const T10& arg10) {`
`118`		`- Rf_warning( tfm::format(fmt, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10).c_str() );`
	`118`	`+ Rf_warning("%s", tfm::format(fmt, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10).c_str());`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`// -- End Rcpp::warning declaration`
`@@ -124,52 +124,52 @@ inline void warning(const char* fmt, const T1& arg1, const T2& arg2, const T3& a`
`124`	`124`
`125`	`125`	`template <typename T1>`
`126`	`126`	`inline void NORET stop(const char* fmt, const T1& arg1) {`
`127`		`- throw Rcpp::exception( tfm::format(fmt, arg1 ).c_str() );`
	`127`	`+ throw Rcpp::exception(tfm::format(fmt, arg1).c_str());`
`128`	`128`	`}`
`129`	`129`
`130`	`130`	`template <typename T1, typename T2>`
`131`	`131`	`inline void NORET stop(const char* fmt, const T1& arg1, const T2& arg2) {`
`132`		`- throw Rcpp::exception( tfm::format(fmt, arg1, arg2 ).c_str() );`
	`132`	`+ throw Rcpp::exception(tfm::format(fmt, arg1, arg2).c_str());`
`133`	`133`	`}`
`134`	`134`
`135`	`135`	`template <typename T1, typename T2, typename T3>`
`136`	`136`	`inline void NORET stop(const char* fmt, const T1& arg1, const T2& arg2, const T3& arg3) {`
`137`		`- throw Rcpp::exception( tfm::format(fmt, arg1, arg2, arg3).c_str() );`
	`137`	`+ throw Rcpp::exception(tfm::format(fmt, arg1, arg2, arg3).c_str());`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`template <typename T1, typename T2, typename T3, typename T4>`
`141`	`141`	`inline void NORET stop(const char* fmt, const T1& arg1, const T2& arg2, const T3& arg3, const T4& arg4) {`
`142`		`- throw Rcpp::exception( tfm::format(fmt, arg1, arg2, arg3, arg4).c_str() );`
	`142`	`+ throw Rcpp::exception(tfm::format(fmt, arg1, arg2, arg3, arg4).c_str());`
`143`	`143`	`}`
`144`	`144`
`145`	`145`	`template <typename T1, typename T2, typename T3, typename T4, typename T5>`
`146`	`146`	`inline void NORET stop(const char* fmt, const T1& arg1, const T2& arg2, const T3& arg3, const T4& arg4, const T5& arg5) {`
`147`		`- throw Rcpp::exception( tfm::format(fmt, arg1, arg2, arg3, arg4, arg5).c_str() );`
	`147`	`+ throw Rcpp::exception(tfm::format(fmt, arg1, arg2, arg3, arg4, arg5).c_str());`
`148`	`148`	`}`
`149`	`149`
`150`	`150`	`template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6>`
`151`	`151`	`inline void NORET stop(const char* fmt, const T1& arg1, const T2& arg2, const T3& arg3, const T4& arg4, const T5& arg5, const T6& arg6) {`
`152`		`- throw Rcpp::exception( tfm::format(fmt, arg1, arg2, arg3, arg4, arg5, arg6).c_str() );`
	`152`	`+ throw Rcpp::exception(tfm::format(fmt, arg1, arg2, arg3, arg4, arg5, arg6).c_str());`
`153`	`153`	`}`
`154`	`154`
`155`	`155`	`template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7>`
`156`	`156`	`inline void NORET stop(const char* fmt, const T1& arg1, const T2& arg2, const T3& arg3, const T4& arg4, const T5& arg5, const T6& arg6, const T7& arg7) {`
`157`		`- throw Rcpp::exception( tfm::format(fmt, arg1, arg2, arg3, arg4, arg5, arg6, arg7).c_str() );`
	`157`	`+ throw Rcpp::exception(tfm::format(fmt, arg1, arg2, arg3, arg4, arg5, arg6, arg7).c_str());`
`158`	`158`	`}`
`159`	`159`
`160`	`160`	`template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8>`
`161`	`161`	`inline void NORET stop(const char* fmt, const T1& arg1, const T2& arg2, const T3& arg3, const T4& arg4, const T5& arg5, const T6& arg6, const T7& arg7, const T8& arg8) {`
`162`		`- throw Rcpp::exception( tfm::format(fmt, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8).c_str() );`
	`162`	`+ throw Rcpp::exception(tfm::format(fmt, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8).c_str());`
`163`	`163`	`}`
`164`	`164`
`165`	`165`	`template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8, typename T9>`
`166`	`166`	`inline void NORET stop(const char* fmt, const T1& arg1, const T2& arg2, const T3& arg3, const T4& arg4, const T5& arg5, const T6& arg6, const T7& arg7, const T8& arg8, const T9& arg9) {`
`167`		`- throw Rcpp::exception( tfm::format(fmt, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9).c_str() );`
	`167`	`+ throw Rcpp::exception(tfm::format(fmt, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9).c_str());`
`168`	`168`	`}`
`169`	`169`
`170`	`170`	`template <typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8, typename T9, typename T10>`
`171`	`171`	`inline void NORET stop(const char* fmt, const T1& arg1, const T2& arg2, const T3& arg3, const T4& arg4, const T5& arg5, const T6& arg6, const T7& arg7, const T8& arg8, const T9& arg9, const T10& arg10) {`
`172`		`- throw Rcpp::exception( tfm::format(fmt, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10).c_str() );`
	`172`	`+ throw Rcpp::exception(tfm::format(fmt, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10).c_str());`
`173`	`173`	`}`
`174`	`174`
`175`	`175`	`// -- End Rcpp::stop declaration`