Skip to content

Add oZFile_fwrite method #4

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
merged 3 commits into from
Jan 7, 2025
Merged

Add oZFile_fwrite method #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7daf5ae
Add oZFile_fwrite method
ahl27 Dec 20, 2024
0cf305a
adds relevant stub functions so oZFile_fwrite can be called from othe…
ahl27 Jan 7, 2025
baf52f0
small formatting fixes based on @hpages feedback
ahl27 Jan 7, 2025
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
7 changes: 7 additions & 0 deletions inst/include/XVector_interface.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,13 @@ void filexp_putc(
int c
);

size_t filexp_fwrite(
SEXP filexp,
const void *data_ptr,
size_t size,
size_t nitems
);

int delete_trailing_LF_or_CRLF(
const char *buf,
int buf_len
Expand Down
5 changes: 5 additions & 0 deletions inst/include/_XVector_stubs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,11 @@ DEFINE_NOVALUE_CCALLABLE_STUB(filexp_putc,
( filexp, c)
)

DEFINE_CCALLABLE_STUB(size_t, filexp_fwrite,
(SEXP filexp, const void *data_ptr, size_t size, size_t nitems),
( filexp, data_ptr, size, nitems)
)

DEFINE_CCALLABLE_STUB(int, delete_trailing_LF_or_CRLF,
(const char *buf, int buf_len),
( buf, buf_len)
Expand Down
1 change: 1 addition & 0 deletions src/R_init_XVector.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ void R_init_XVector(DllInfo *info)
REGISTER_CCALLABLE(_filexp_rewind);
REGISTER_CCALLABLE(_filexp_puts);
REGISTER_CCALLABLE(_filexp_putc);
REGISTER_CCALLABLE(_filexp_fwrite);
REGISTER_CCALLABLE(_delete_trailing_LF_or_CRLF);

/* Ocopy_byteblocks.c */
Expand Down
7 changes: 7 additions & 0 deletions src/XVector.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,13 @@ void _filexp_putc(
int c
);

size_t _filexp_fwrite(
SEXP filexp,
const void *data_ptr,
size_t size,
size_t nitems
);

SEXP new_input_filexp(SEXP filepath);

SEXP rewind_filexp(SEXP filexp);
Expand Down
30 changes: 30 additions & 0 deletions src/io_utils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,6 +389,31 @@ static void oZFile_putc(const ZFile *zfile, int c)
error("write error");
}

static size_t oZFile_fwrite(const ZFile *zfile, const void *data_ptr,
size_t size, size_t nitems)
{
int ztype;
size_t n = 0;
void *file;

ztype = zfile->ztype;
file = zfile->file;
switch (ztype) {
case UNCOMPRESSED:
n = fwrite(data_ptr, size, nitems, (FILE *) file);
break;
case GZ_TYPE:
n = gzfwrite(data_ptr, size, nitems, (gzFile) file);
break;
default:
error(INTERNAL_ERR_IN "oZFile_puts(): "
"invalid ztype value %d", ztype);
}
if(n == nitems) return nitems;
error("write error (attempted to write %zu elements, wrote %zu)",
nitems, n);
}

/****************************************************************************
* Initialization/close.
*/
Expand Down Expand Up @@ -540,6 +565,11 @@ void _filexp_putc(SEXP filexp, int c)
return;
}

size_t _filexp_fwrite(SEXP filexp, const void *data_ptr, size_t size, size_t nitems){
CHECK_USER_INTERRUPT(2000);
return oZFile_fwrite(R_ExternalPtrAddr(filexp), data_ptr, size, nitems);
}

static SEXP new_filexp(SEXP filepath,
const char *mode, const char *compress, int level)
{
Expand Down