Skip to content

Replace GetOption with GetOption1 #6849

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MichaelChirico merged 1 commit into from
Mar 4, 2025
Merged

Replace GetOption with GetOption1 #6849

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/forder.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1616,7 +1616,7 @@ void putIndex(SEXP x, SEXP cols, SEXP o) {

// isTRUE(getOption("datatable.use.index"))
bool GetUseIndex(void) {
SEXP opt = GetOption(install("datatable.use.index"), R_NilValue);
SEXP opt = GetOption1(install("datatable.use.index"));
if (!IS_TRUE_OR_FALSE(opt))
error(_("'datatable.use.index' option must be TRUE or FALSE")); // # nocov
return LOGICAL(opt)[0];
Expand All @@ -1627,7 +1627,7 @@ bool GetAutoIndex(void) {
// for now temporarily 'forder.auto.index' not 'auto.index' to disabled it by default
// because it writes attr on .SD which is re-used by all groups leading to incorrect results
// DT[, .(uN=uniqueN(.SD)), by=A]
SEXP opt = GetOption(install("datatable.forder.auto.index"), R_NilValue);
SEXP opt = GetOption1(install("datatable.forder.auto.index"));
if (isNull(opt))
return false;
if (!IS_TRUE_OR_FALSE(opt))
Expand Down
2 changes: 1 addition & 1 deletion src/freadR.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ SEXP freadR(
args.logical01 = LOGICAL(logical01Arg)[0];
args.logicalYN = LOGICAL(logicalYNArg)[0];
{
SEXP tt = PROTECT(GetOption(sym_old_fread_datetime_character, R_NilValue));
SEXP tt = PROTECT(GetOption1(sym_old_fread_datetime_character));
args.oldNoDateTime = oldNoDateTime = isLogical(tt) && LENGTH(tt)==1 && LOGICAL(tt)[0]==TRUE;
UNPROTECT(1);
}
Expand Down
2 changes: 1 addition & 1 deletion src/init.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ inline double LLtoD(long long x) {

int GetVerbose(void) {
// don't call repetitively; save first in that case
SEXP opt = GetOption(sym_verbose, R_NilValue);
SEXP opt = GetOption1(sym_verbose);
if ((!isLogical(opt) && !isInteger(opt)) || LENGTH(opt)!=1 || INTEGER(opt)[0]==NA_INTEGER)
error(_("verbose option must be length 1 non-NA logical or integer"));
return INTEGER(opt)[0];
Expand Down
2 changes: 1 addition & 1 deletion src/rbindlist.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ SEXP rbindlist(SEXP l, SEXP usenamesArg, SEXP fillArg, SEXP idcolArg, SEXP ignor
}
}
if (buff[0]) {
SEXP opt = GetOption(install("datatable.rbindlist.check"), R_NilValue);
SEXP opt = GetOption1(install("datatable.rbindlist.check"));
if (!isNull(opt) && !(isString(opt) && length(opt)==1)) {
warning(_("options()$datatable.rbindlist.check is set but is not a single string. See news item 5 in v1.12.2."));
opt = R_NilValue;
Expand Down
2 changes: 1 addition & 1 deletion src/subset.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ SEXP subsetDT(SEXP x, SEXP rows, SEXP cols) { // API change needs update NEWS.md
if (this<1 || this>LENGTH(x)) error(_("Item %d of cols is %d which is outside the range [1,ncol(x)=%d]"), i+1, this, LENGTH(x));
}

int overAlloc = checkOverAlloc(GetOption(install("datatable.alloccol"), R_NilValue));
int overAlloc = checkOverAlloc(GetOption1(install("datatable.alloccol")));
SEXP ans = PROTECT(allocVector(VECSXP, LENGTH(cols)+overAlloc)); nprotect++; // doing alloc.col directly here; eventually alloc.col can be deprecated.

// user-defined and superclass attributes get copied as from v1.12.0
Expand Down
Loading