[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnuastro-commits] master 3e9ec27 3/4: Corrected type of minmapsize in t
From: |
Mohammad Akhlaghi |
Subject: |
[gnuastro-commits] master 3e9ec27 3/4: Corrected type of minmapsize in table reading functions |
Date: |
Sat, 28 Apr 2018 20:40:21 -0400 (EDT) |
branch: master
commit 3e9ec27d4fdf49131e5e7ed551deb529237a858b
Author: Mohammad Akhlaghi <address@hidden>
Commit: Mohammad Akhlaghi <address@hidden>
Corrected type of minmapsize in table reading functions
The type of `minmapsize' was (strangely!) an `int' in the arguments of some
of the table reading functions. With this commit they are corrected to
`size_t'.
---
doc/gnuastro.texi | 4 ++--
lib/fits.c | 2 +-
lib/gnuastro/fits.h | 2 +-
lib/gnuastro/table.h | 2 +-
lib/table.c | 2 +-
lib/txt.c | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/doc/gnuastro.texi b/doc/gnuastro.texi
index 9f84bc4..ac4cc2c 100644
--- a/doc/gnuastro.texi
+++ b/doc/gnuastro.texi
@@ -22456,7 +22456,7 @@ $ asttable --info table.fits
@end example
@end deftypefun
address@hidden {gal_data_t *} gal_table_read (char @code{*filename}, char
@code{*hdu}, gal_list_str_t @code{*cols}, int @code{searchin}, int
@code{ignorecase}, int @code{minmapsize}, size_t @code{colmatch})
address@hidden {gal_data_t *} gal_table_read (char @code{*filename}, char
@code{*hdu}, gal_list_str_t @code{*cols}, int @code{searchin}, int
@code{ignorecase}, size_t @code{minmapsize}, size_t @code{colmatch})
Read the specified columns in a text file (named @code{filename}) into a
linked list of data structures. If the file is FITS, then @code{hdu} will
also be used, otherwise, @code{hdu} is ignored.
@@ -23075,7 +23075,7 @@ reading tables in FITS format. To be generic, it is
recommended to use
of table formats based on the filename (see @ref{Table input output}).
@end deftypefun
address@hidden {gal_data_t *} gal_fits_tab_read (char @code{*filename}, char
@code{*hdu}, size_t @code{numrows}, gal_data_t @code{*colinfo},
gal_list_sizet_t @code{*indexll}, int @code{minmapsize})
address@hidden {gal_data_t *} gal_fits_tab_read (char @code{*filename}, char
@code{*hdu}, size_t @code{numrows}, gal_data_t @code{*colinfo},
gal_list_sizet_t @code{*indexll}, size_t @code{minmapsize})
Read the columns given in the list @code{indexll} from a FITS table into a
linked list of data structures, see @ref{List of size_t} and @ref{List of
gal_data_t}. If the necessary space for each column is larger than
diff --git a/lib/fits.c b/lib/fits.c
index 8ef4c7e..4e5021a 100644
--- a/lib/fits.c
+++ b/lib/fits.c
@@ -2350,7 +2350,7 @@ gal_fits_tab_info(char *filename, char *hdu, size_t
*numcols,
gal_data_t *
gal_fits_tab_read(char *filename, char *hdu, size_t numrows,
gal_data_t *allcols, gal_list_sizet_t *indexll,
- int minmapsize)
+ size_t minmapsize)
{
size_t i=0;
void *blank;
diff --git a/lib/gnuastro/fits.h b/lib/gnuastro/fits.h
index 370355f..2960378 100644
--- a/lib/gnuastro/fits.h
+++ b/lib/gnuastro/fits.h
@@ -257,7 +257,7 @@ gal_fits_tab_info(char *filename, char *hdu, size_t
*numcols,
gal_data_t *
gal_fits_tab_read(char *filename, char *hdu, size_t numrows,
gal_data_t *colinfo, gal_list_sizet_t *indexll,
- int minmapsize);
+ size_t minmapsize);
void
gal_fits_tab_write(gal_data_t *cols, gal_list_str_t *comments,
diff --git a/lib/gnuastro/table.h b/lib/gnuastro/table.h
index 69ace6f..456380e 100644
--- a/lib/gnuastro/table.h
+++ b/lib/gnuastro/table.h
@@ -138,7 +138,7 @@ gal_table_print_info(gal_data_t *allcols, size_t numcols,
size_t numrows);
/************************************************************************/
gal_data_t *
gal_table_read(char *filename, char *hdu, gal_list_str_t *cols,
- int searchin, int ignorecase, int minmapsize,
+ int searchin, int ignorecase, size_t minmapsize,
size_t *colmatch);
diff --git a/lib/table.c b/lib/table.c
index e22fb4b..ec174e9 100644
--- a/lib/table.c
+++ b/lib/table.c
@@ -404,7 +404,7 @@ make_list_of_indexs(gal_list_str_t *cols, gal_data_t
*allcols,
on. */
gal_data_t *
gal_table_read(char *filename, char *hdu, gal_list_str_t *cols,
- int searchin, int ignorecase, int minmapsize,
+ int searchin, int ignorecase, size_t minmapsize,
size_t *colmatch)
{
int tableformat;
diff --git a/lib/txt.c b/lib/txt.c
index f329232..5ea795e 100644
--- a/lib/txt.c
+++ b/lib/txt.c
@@ -856,7 +856,7 @@ txt_fill(char *line, char **tokens, size_t maxcolnum,
gal_data_t *info,
static gal_data_t *
gal_txt_read(char *filename, size_t *dsize, gal_data_t *info,
- gal_list_sizet_t *indexll, int minmapsize, int format)
+ gal_list_sizet_t *indexll, size_t minmapsize, int format)
{
FILE *fp;
char *line;