aboutsummaryrefslogtreecommitdiff
path: root/src/pj_open_lib.c
diff options
context:
space:
mode:
authorFrank Warmerdam <warmerdam@pobox.com>2013-06-22 07:54:57 +0000
committerFrank Warmerdam <warmerdam@pobox.com>2013-06-22 07:54:57 +0000
commit44ef2bd6b0184d334b020e401026207b38aaa064 (patch)
tree347b721fe196a12765ad5c869cb51e77fa3a64ec /src/pj_open_lib.c
parent07695742d49418f87338f0ffa48a16b9fae25767 (diff)
downloadPROJ-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_open_lib.c')
-rw-r--r--src/pj_open_lib.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/pj_open_lib.c b/src/pj_open_lib.c
index bc8c98ac..0a11dab4 100644
--- a/src/pj_open_lib.c
+++ b/src/pj_open_lib.c
@@ -98,11 +98,11 @@ void pj_set_searchpath ( int count, const char **path )
/* pj_open_lib() */
/************************************************************************/
-FILE *
+PAFile
pj_open_lib(projCtx ctx, char *name, char *mode) {
char fname[MAX_PATH_FILENAME+1];
const char *sysname;
- FILE *fid;
+ PAFile fid;
int n = 0;
int i;
#ifdef WIN32
@@ -145,7 +145,7 @@ pj_open_lib(projCtx ctx, char *name, char *mode) {
} else /* just try it bare bones */
sysname = name;
- if ((fid = fopen(sysname, mode)) != NULL)
+ if ((fid = pj_ctx_fopen(ctx, sysname, mode)) != NULL)
errno = 0;
/* If none of those work and we have a search path, try it */
@@ -155,7 +155,7 @@ pj_open_lib(projCtx ctx, char *name, char *mode) {
{
sprintf(fname, "%s%c%s", search_path[i], DIR_CHAR, name);
sysname = fname;
- fid = fopen (sysname, mode);
+ fid = pj_ctx_fopen(ctx, sysname, mode);
}
if (fid)
errno = 0;