More changes for CRAN.

kaneplusplus · Jan 9, 2024 · 7c09520 · 7c09520
1 parent 3064277
commit 7c09520
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 33 deletions.
diff --git a/R/bigmemory.R b/R/bigmemory.R
@@ -1667,7 +1667,8 @@ setMethod('sub.big.matrix', signature(x='big.matrix'),
            backingpath))
   })
 
-#' @rdname big.matrix.descriptor-class
+#' @title Retrieve a big.matrix "view"
+#' @rdname sub.big.matrix
 #' @param x A descriptor object
 #' @param firstRow the first row of the submatrix
 #' @param lastRow the last row of the submatrix if not NULL

diff --git a/man-roxygen/big.matrix.descriptor_class_template.R b/man-roxygen/big.matrix.descriptor_class_template.R
@@ -12,7 +12,7 @@
 #'      \item{\code{description}:}{Object of class \code{"list"}; details omitted.}
 #'   }
 #' @section Extends:
-#' Class \code{"\linkS4class{descriptor}"}, directly.
+#' Class \code{"descriptor"}, directly.
 #' @section Methods:
 #' \describe{
 #'      \item{attach.resource}{\code{signature(obj = "big.matrix.descriptor")}: ... }

diff --git a/man/big.matrix.descriptor-class.Rd b/man/big.matrix.descriptor-class.Rd
diff --git a/man/sub.big.matrix.Rd b/man/sub.big.matrix.Rd
diff --git a/src/bigmemory.cpp b/src/bigmemory.cpp
@@ -895,7 +895,7 @@ SEXP ReadMatrix(SEXP fileName, BigMatrix *pMat,
         else
         {
           string ws = string("Incorrect number of entries in row ") + ttos(j);
-          Rf_warning(ws.c_str());
+          Rf_warning("%s", ws.c_str());
         }
       }
       first = last+1;

diff --git a/src/deepcopy.cpp b/src/deepcopy.cpp
@@ -112,7 +112,7 @@ SEXP CDeepCopy(SEXP inAddr, SEXP outAddr, SEXP rowInds, SEXP colInds,
         type_names[pOutMat->matrix_type()] + string("\n") + 
         string("Hint: To remove this warning type: ") + 
         string("options(bigmemory.typecast.warning=FALSE)");
-      Rf_warning(warnMsg.c_str());
+      Rf_warning("%s", warnMsg.c_str());
     }
 
     // Not sure if there is a better way to do these function calls