Skip to content

Namespace internal stream_* functions #98

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

Open
rtobar wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Namespace internal stream_* functions #98

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
16 changes: 8 additions & 8 deletions cfileio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5111,16 +5111,16 @@ int fits_init_cfitsio(void)
NULL,
NULL,
NULL,
stream_open,
stream_create,
fits_stream_open,
fits_stream_create,
NULL, /* no stream truncate function */
stream_close,
fits_stream_close,
NULL, /* no stream remove */
stream_size,
stream_flush,
stream_seek,
stream_read,
stream_write);
fits_stream_size,
fits_stream_flush,
fits_stream_seek,
fits_stream_read,
fits_stream_write);

if (status)
{
Expand Down
16 changes: 8 additions & 8 deletions drvrfile.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1033,7 +1033,7 @@ int file_checkfile (char *urltype, char *infile, char *outfile)


/*--------------------------------------------------------------------------*/
int stream_open(char *filename, int rwmode, int *handle)
int fits_stream_open(char *filename, int rwmode, int *handle)
{
/*
read from stdin
Expand All @@ -1046,7 +1046,7 @@ int stream_open(char *filename, int rwmode, int *handle)
return(0);
}
/*--------------------------------------------------------------------------*/
int stream_create(char *filename, int *handle)
int fits_stream_create(char *filename, int *handle)
{
/*
write to stdout
Expand All @@ -1060,7 +1060,7 @@ int stream_create(char *filename, int *handle)
return(0);
}
/*--------------------------------------------------------------------------*/
int stream_size(int handle, LONGLONG *filesize)
int fits_stream_size(int handle, LONGLONG *filesize)
/*
return the size of the file in bytes
*/
Expand All @@ -1072,7 +1072,7 @@ int stream_size(int handle, LONGLONG *filesize)
return(0);
}
/*--------------------------------------------------------------------------*/
int stream_close(int handle)
int fits_stream_close(int handle)
/*
don't have to close stdin or stdout
*/
Expand All @@ -1082,7 +1082,7 @@ int stream_close(int handle)
return(0);
}
/*--------------------------------------------------------------------------*/
int stream_flush(int handle)
int fits_stream_flush(int handle)
/*
flush the file
*/
Expand All @@ -1093,7 +1093,7 @@ int stream_flush(int handle)
return(0);
}
/*--------------------------------------------------------------------------*/
int stream_seek(int handle, LONGLONG offset)
int fits_stream_seek(int handle, LONGLONG offset)
/*
seeking is not allowed in a stream
*/
Expand All @@ -1102,7 +1102,7 @@ int stream_seek(int handle, LONGLONG offset)
return(1);
}
/*--------------------------------------------------------------------------*/
int stream_read(int hdl, void *buffer, long nbytes)
int fits_stream_read(int hdl, void *buffer, long nbytes)
/*
reading from stdin stream
*/
Expand All @@ -1124,7 +1124,7 @@ int stream_read(int hdl, void *buffer, long nbytes)
return(0);
}
/*--------------------------------------------------------------------------*/
int stream_write(int hdl, void *buffer, long nbytes)
int fits_stream_write(int hdl, void *buffer, long nbytes)
/*
write bytes at the current position in the file
*/
Expand Down
16 changes: 8 additions & 8 deletions fitsio2.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1205,14 +1205,14 @@ int file_is_compressed(char *filename);

/* stream driver I/O routines */

int stream_open(char *filename, int rwmode, int *driverhandle);
int stream_create(char *filename, int *driverhandle);
int stream_size(int driverhandle, LONGLONG *filesize);
int stream_close(int driverhandle);
int stream_flush(int driverhandle);
int stream_seek(int driverhandle, LONGLONG offset);
int stream_read (int driverhandle, void *buffer, long nbytes);
int stream_write(int driverhandle, void *buffer, long nbytes);
int fits_stream_open(char *filename, int rwmode, int *driverhandle);
int fits_stream_create(char *filename, int *driverhandle);
int fits_stream_size(int driverhandle, LONGLONG *filesize);
int fits_stream_close(int driverhandle);
int fits_stream_flush(int driverhandle);
int fits_stream_seek(int driverhandle, LONGLONG offset);
int fits_stream_read (int driverhandle, void *buffer, long nbytes);
int fits_stream_write(int driverhandle, void *buffer, long nbytes);

/* memory driver I/O routines */

Expand Down