You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by gs...@apache.org on 2001/02/12 05:37:03 UTC
cvs commit: apr-util/dbm/sdbm sdbm.c
gstein 01/02/11 20:37:03
Modified: include apr_file_io.h
file_io/unix fullrw.c
dbm/sdbm sdbm.c
Log:
Fix a bad rename: apr_file_read_file should be apr_file_read_full
(was originally apr_full_read)
Revision Changes Path
1.95 +2 -2 apr/include/apr_file_io.h
Index: apr_file_io.h
===================================================================
RCS file: /home/cvs/apr/include/apr_file_io.h,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -u -r1.94 -r1.95
--- apr_file_io.h 2001/02/08 07:44:45 1.94
+++ apr_file_io.h 2001/02/12 04:37:02 1.95
@@ -284,9 +284,9 @@
* error to be returned.
*
* APR_EINTR is never returned.
- * @deffunc apr_status_t apr_file_read_file(apr_file_t *thefile, void *buf, apr_size_t nbytes, apr_size_t *bytes_read)
+ * @deffunc apr_status_t apr_file_read_full(apr_file_t *thefile, void *buf, apr_size_t nbytes, apr_size_t *bytes_read)
*/
-APR_DECLARE(apr_status_t) apr_file_read_file(apr_file_t *thefile, void *buf,
+APR_DECLARE(apr_status_t) apr_file_read_full(apr_file_t *thefile, void *buf,
apr_size_t nbytes,
apr_size_t *bytes_read);
1.7 +7 -6 apr/file_io/unix/fullrw.c
Index: fullrw.c
===================================================================
RCS file: /home/cvs/apr/file_io/unix/fullrw.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -u -r1.6 -r1.7
--- fullrw.c 2001/02/08 07:44:38 1.6
+++ fullrw.c 2001/02/12 04:37:02 1.7
@@ -55,9 +55,9 @@
#include "apr_file_io.h"
-APR_DECLARE(apr_status_t) apr_file_read_file(apr_file_t *thefile, void *buf,
- apr_size_t nbytes,
- apr_size_t *bytes_read)
+APR_DECLARE(apr_status_t) apr_file_read_full(apr_file_t *thefile, void *buf,
+ apr_size_t nbytes,
+ apr_size_t *bytes_read)
{
apr_status_t status;
apr_size_t total_read = 0;
@@ -77,9 +77,10 @@
return status;
}
-APR_DECLARE(apr_status_t) apr_file_write_full(apr_file_t *thefile, const void *buf,
- apr_size_t nbytes,
- apr_size_t *bytes_written)
+APR_DECLARE(apr_status_t) apr_file_write_full(apr_file_t *thefile,
+ const void *buf,
+ apr_size_t nbytes,
+ apr_size_t *bytes_written)
{
apr_status_t status;
apr_size_t total_written = 0;
1.9 +2 -2 apr-util/dbm/sdbm/sdbm.c
Index: sdbm.c
===================================================================
RCS file: /home/cvs/apr-util/dbm/sdbm/sdbm.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -u -r1.8 -r1.9
--- sdbm.c 2001/02/08 07:45:27 1.8
+++ sdbm.c 2001/02/12 04:37:02 1.9
@@ -414,7 +414,7 @@
apr_status_t status;
if ((status = apr_file_seek(f, APR_SET, &off)) != APR_SUCCESS ||
- ((status = apr_file_read_file(f, buf, len, NULL)) != APR_SUCCESS)) {
+ ((status = apr_file_read_full(f, buf, len, NULL)) != APR_SUCCESS)) {
/* if EOF is reached, pretend we read all zero's */
if (status == APR_EOF) {
memset(buf, 0, len);
@@ -588,7 +588,7 @@
db->pagbno = db->blkptr;
/* ### EOF acceptable here too? */
- if (apr_file_read_file(db->pagf, db->pagbuf, PBLKSIZ, NULL) != APR_SUCCESS)
+ if (apr_file_read_full(db->pagf, db->pagbuf, PBLKSIZ, NULL) != APR_SUCCESS)
break;
if (!chkpage(db->pagbuf))
break;