diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2015-06-28 18:29:23 +0200 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2015-06-28 18:29:23 +0200 |
| commit | 02232fd5fe58783a40a8cf124170d9ad4629b1ce (patch) | |
| tree | d2bfb849bd3ad4d952bc8e5db0e859b8cef8d0d7 /src/pj_fileapi.c | |
| parent | f89810c45ab97baf2847855eb6cd57619a806279 (diff) | |
| parent | 6073f5f3d33d401a7140611b8f3570caf5d17a3b (diff) | |
| download | PROJ-02232fd5fe58783a40a8cf124170d9ad4629b1ce.tar.gz PROJ-02232fd5fe58783a40a8cf124170d9ad4629b1ce.zip | |
Merge branch '4-warning-fixes' of github.com:QuLogic/proj.4
Diffstat (limited to 'src/pj_fileapi.c')
| -rw-r--r-- | src/pj_fileapi.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/pj_fileapi.c b/src/pj_fileapi.c index c0b33693..fa35f30a 100644 --- a/src/pj_fileapi.c +++ b/src/pj_fileapi.c @@ -1,6 +1,4 @@ /****************************************************************************** - * $Id$ - * * Project: PROJ.4 * Purpose: Implementation of the pj_ctx_* file api, and the default stdio * based implementation. @@ -31,8 +29,6 @@ #include <projects.h> #include <string.h> -PJ_CVSID("$Id$"); - static PAFile pj_stdio_fopen(projCtx ctx, const char *filename, const char *access); static size_t pj_stdio_fread(void *buffer, size_t size, size_t nmemb, @@ -185,7 +181,7 @@ char *pj_ctx_fgets(projCtx ctx, char *line, int size, PAFile file) bytes_read = pj_ctx_fread(ctx, line, 1, size-1, file); if(bytes_read == 0) return NULL; - if(bytes_read < size) + if(bytes_read < (size_t)size) { line[bytes_read] = '\0'; } |