diff options
| author | Frank Warmerdam <warmerdam@pobox.com> | 2013-06-22 07:54:57 +0000 |
|---|---|---|
| committer | Frank Warmerdam <warmerdam@pobox.com> | 2013-06-22 07:54:57 +0000 |
| commit | 44ef2bd6b0184d334b020e401026207b38aaa064 (patch) | |
| tree | 347b721fe196a12765ad5c869cb51e77fa3a64ec /src/pj_gc_reader.c | |
| parent | 07695742d49418f87338f0ffa48a16b9fae25767 (diff) | |
| download | PROJ-44ef2bd6b0184d334b020e401026207b38aaa064.tar.gz PROJ-44ef2bd6b0184d334b020e401026207b38aaa064.zip | |
bulk of file api implementation complete and working
git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@2345 4e78687f-474d-0410-85f9-8d5e500ac6b2
Diffstat (limited to 'src/pj_gc_reader.c')
| -rw-r--r-- | src/pj_gc_reader.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/pj_gc_reader.c b/src/pj_gc_reader.c index e22aa993..f944b0f1 100644 --- a/src/pj_gc_reader.c +++ b/src/pj_gc_reader.c @@ -32,7 +32,7 @@ #include <projects.h> #include <string.h> -static int pj_gc_readentry( projCtx ctx, FILE *fp, PJ_GridCatalogEntry *entry ); +static int pj_gc_readentry(projCtx ctx, PAFile fp, PJ_GridCatalogEntry *entry); static void pj_gc_sortcatalog( projCtx ctx, PJ_GridCatalog *catalog ); /************************************************************************/ @@ -43,7 +43,7 @@ static void pj_gc_sortcatalog( projCtx ctx, PJ_GridCatalog *catalog ); PJ_GridCatalog *pj_gc_readcatalog( projCtx ctx, const char *catalog_name ) { - FILE *fp; + PAFile fp; PJ_GridCatalog *catalog; int entry_max, err; char line[302]; @@ -105,7 +105,7 @@ static void pj_gc_sortcatalog( projCtx ctx, PJ_GridCatalog *catalog ) /* token count. */ /************************************************************************/ -static int pj_gc_read_csv_line( projCtx ctx, FILE *fp, +static int pj_gc_read_csv_line( projCtx ctx, PAFile fp, char **tokens, int max_tokens ) { char line[302]; @@ -180,7 +180,7 @@ double pj_gc_parsedate( projCtx ctx, const char *date_string ) /* gridname,ll_long,ll_lat,ur_long,ur_lat,priority,date */ /************************************************************************/ -static int pj_gc_readentry( projCtx ctx, FILE *fp, PJ_GridCatalogEntry *entry ) +static int pj_gc_readentry( projCtx ctx, PAFile fp, PJ_GridCatalogEntry *entry) { #define MAX_TOKENS 30 char *tokens[MAX_TOKENS]; |