Update formatting

nlmixr2 · Jan 14, 2024 · 6cbf02d · 6cbf02d
1 parent 0b1792e
commit 6cbf02d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 16 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -1,5 +1,7 @@
 # rxode2et (development version)
 
+* Fix formatting issues identified by m1mac, as requested by CRAN
+
 # rxode2et 2.0.11
 
 * Make the stacking more flexible to help rxode2 have more types of plots

diff --git a/cran-comments.md b/cran-comments.md
@@ -1,8 +1,3 @@
 ## Updates
 
-- This is an update to support the new release of rxode2parse
-
-- This update supports StanHeaders upcoming release
-
-- This update also uses C++17
-
+- Fixes formatting that is flagged as unsafe by m1mac, as requested by CRAN
diff --git a/src/et.cpp b/src/et.cpp
@@ -223,7 +223,7 @@ RObject etUpdate(RObject obj,
               (strncmp((as<std::string>(nm[i])).c_str(), sarg.c_str(), slen)  == 0 ) &&
               (dexact != 1 || (dexact == 1 && slen == slen2))){
             if (dexact == -1){
-              Rf_warningcall(R_NilValue, _("partial match of '%s' to '%s'"),sarg.c_str(), (as<std::string>(nm[i])).c_str());
+              Rf_warningcall(R_NilValue, "partial match of '%s' to '%s'", sarg.c_str(), (as<std::string>(nm[i])).c_str());
             }
             return lst[i];
           }
@@ -526,7 +526,7 @@ List etSimulate(List curEt){
     }
   }
   if (!recalcTime){
-    Rf_warningcall(R_NilValue, _("event table was not updated (no dose/sampling windows)"));
+    Rf_warningcall(R_NilValue, "%s", _("event table was not updated (no dose/sampling windows)"));
     return curEt;
   } else {
     lst.attr("class") = cls;
@@ -1037,7 +1037,7 @@ List etImportEventTable(List inData, bool warnings = true){
       evidCol = mdvCol;
       oldEvid=asIv(inData[evidCol], "inData[evidCol]");
       if (methodCol != -1 && warnings){
-        Rf_warningcall(R_NilValue, _("using 'mdv' instead of 'method'"));
+        Rf_warningcall(R_NilValue, "%s", _("using 'mdv' instead of 'method'"));
       }
     } else if (methodCol != -1){
       oldEvid = convertMethod(inData[methodCol]);
@@ -1047,7 +1047,7 @@ List etImportEventTable(List inData, bool warnings = true){
     }
   } else {
     if (mdvCol != -1 && warnings){
-      Rf_warningcall(R_NilValue, _("using 'evid' instead of 'mdv'"));
+      Rf_warningcall(R_NilValue, "%s", _("using 'evid' instead of 'mdv'"));
     }
     oldEvid=asIv(inData[evidCol], "inData[evidCol]");
   }
@@ -2633,11 +2633,11 @@ RObject et_(List input, List et__){
             return as<RObject>(ret);
           }
         } else {
-          Rf_warningcall(R_NilValue, _("nothing done"));
+          Rf_warningcall(R_NilValue, "%s", _("nothing done"));
           return  asList(curEt, "curEt");
         }
       } else {
-        Rf_warningcall(R_NilValue, _("nothing done"));
+        Rf_warningcall(R_NilValue, "%s", _("nothing done"));
         return  asList(curEt, "curEt");
       }
     } else {
@@ -2768,7 +2768,7 @@ RObject et_(List input, List et__){
         } else if (evid[0] == 2 || evid[0] == 3) {
           if (amtIx == -1){
             if (amt[0] != 0 && NumericVector::is_na(amt[0])){
-              Rf_warningcall(R_NilValue, _("'%s' is ignored when '%s'=2 or '%s'=3"), amtChar,
+              Rf_warningcall(R_NilValue, "'%s' is ignored when '%s'=2 or '%s'=3", amtChar,
                              evidChar, evidChar);
             }
           }
@@ -3068,7 +3068,7 @@ RObject et_(List input, List et__){
           if (doUpdateObj && ii[0] == 24){
             ii[0]=0;
           } else {
-            Rf_warningcall(R_NilValue, _("'%s' requires non zero additional doses ('%s') or steady state dosing ('%s': %f, '%s': %d; '%s': %d), reset '%s' to zero."), iiChar, addlChar, iiChar, ii[0], ssChar, ss[0], addlChar, addl[0],
+            Rf_warningcall(R_NilValue, "'%s' requires non zero additional doses ('%s') or steady state dosing ('%s': %f, '%s': %d; '%s': %d), reset '%s' to zero", iiChar, addlChar, iiChar, ii[0], ssChar, ss[0], addlChar, addl[0],
                            iiChar);
             ii[0]=0;
           }
@@ -3342,7 +3342,7 @@ List etSeq_(List ets, int handleSamples=0, int waitType = 0,
             firstDoseOfEt = false;
           } else if (curEvid[j] != 0 && curEvid[j] != 2 && curEvid[j] != 3) {
             if (!rbind && i != 0 && trueLastIi == 0 && firstDoseOfEt && curTime[j] < defaultIi){
-              Rf_warningcall(R_NilValue, _("assumed a dose interval of %.1f between event tables; use 'ii' to adjust"), defaultIi);
+              Rf_warningcall(R_NilValue, "assumed a dose interval of %.1f between event tables; use 'ii' to adjust", defaultIi);
               maxTime += defaultIi;
               timeDelta += defaultIi;
             }
@@ -3371,7 +3371,7 @@ List etSeq_(List ets, int handleSamples=0, int waitType = 0,
             if (tmp > maxTime) maxTime = tmp;
           } else if (curEvid[j] != 0 && curEvid[j] != 2 && curEvid[j] != 3){
             if (!rbind && i != 0 && trueLastIi == 0 && firstDoseOfEt && curTime[j] < defaultIi){
-              Rf_warningcall(R_NilValue, ("assumed a dose interval of %.1f between event tables; use 'ii' to adjust"), defaultIi);
+              Rf_warningcall(R_NilValue, "assumed a dose interval of %.1f between event tables; use 'ii' to adjust", defaultIi);
               maxTime += defaultIi;
               timeDelta += defaultIi;
             }