diff options
| author | Jakub Zelenka <bukka@php.net> | 2015-01-12 09:02:17 +0000 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2015-01-12 09:02:17 +0000 |
| commit | b3823f5cab4e405b767cd8dddebb54b1c29bd2a8 (patch) | |
| tree | e42fbf615d62213c1e744b8a909155e8f2cdaa87 /ext/dba/libflatfile/flatfile.c | |
| parent | e6fb493e5dbafdad37ba5334c986636342b5d9aa (diff) | |
| parent | 31817447cc06093368f022086340ad3f6f616528 (diff) | |
| download | php-git-b3823f5cab4e405b767cd8dddebb54b1c29bd2a8.tar.gz | |
Merge branch 'master' into jsond
Conflicts:
ext/json/JSON_parser.c
ext/json/JSON_parser.h
ext/json/json.c
ext/json/utf8_decode.c
Diffstat (limited to 'ext/dba/libflatfile/flatfile.c')
| -rw-r--r-- | ext/dba/libflatfile/flatfile.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ext/dba/libflatfile/flatfile.c b/ext/dba/libflatfile/flatfile.c index 361cc42519..0426e72f0c 100644 --- a/ext/dba/libflatfile/flatfile.c +++ b/ext/dba/libflatfile/flatfile.c @@ -137,7 +137,7 @@ int flatfile_delete(flatfile *dba, datum key_datum) { php_stream_seek(dba->fp, 0L, SEEK_END); efree(buf); return SUCCESS; - } + } /* read in the length of the value */ if (!php_stream_gets(dba->fp, buf, 15)) { @@ -156,7 +156,7 @@ int flatfile_delete(flatfile *dba, datum key_datum) { } efree(buf); return FAILURE; -} +} /* }}} */ /* {{{ flatfile_findkey @@ -188,7 +188,7 @@ int flatfile_findkey(flatfile *dba, datum key_datum) { ret = 1; break; } - } + } if (!php_stream_gets(dba->fp, buf, 15)) { break; } @@ -300,15 +300,15 @@ datum flatfile_nextkey(flatfile *dba) { res.dptr = NULL; res.dsize = 0; return res; -} +} /* }}} */ /* {{{ flatfile_version */ -char *flatfile_version() +char *flatfile_version() { return "1.0, $Id$"; } -/* }}} */ +/* }}} */ /* * Local variables: |