svn commit: r1184896 - /httpd/mod_mbox/trunk/module-2.0/mod_mbox_file.c

[da...@apache.org]

Author: danielsh
Date: Sun Oct 16 18:15:57 2011
New Revision: 1184896

URL: http://svn.apache.org/viewvc?rev=1184896&view=rev
Log:
Use the correct file-reading API.  Also, an unrelated cleanup.

Approved by: sf

* module-2.0/mod_mbox_file.c
  (fetch_message, load_message): s/apr_file_read/apr_file_read_full/
  (load_message): Don't initialize a variable that isn't read before being assigned to.

Modified:
    httpd/mod_mbox/trunk/module-2.0/mod_mbox_file.c

Modified: httpd/mod_mbox/trunk/module-2.0/mod_mbox_file.c
URL: http://svn.apache.org/viewvc/httpd/mod_mbox/trunk/module-2.0/mod_mbox_file.c?rev=1184896&r1=1184895&r2=1184896&view=diff
==============================================================================
--- httpd/mod_mbox/trunk/module-2.0/mod_mbox_file.c (original)
+++ httpd/mod_mbox/trunk/module-2.0/mod_mbox_file.c Sun Oct 16 18:15:57 2011
@@ -53,7 +53,7 @@ Message *fetch_message(request_rec *r, a
 
     m->raw_msg = apr_palloc(r->pool, len + 1);
 
-    if (apr_file_read(f, m->raw_msg, &len) != APR_SUCCESS) {
+    if (apr_file_read_full(f, m->raw_msg, len, &len) != APR_SUCCESS) {
         return NULL;
     }
 
@@ -66,7 +66,7 @@ Message *fetch_message(request_rec *r, a
 /* Fetch a message from mailbox */
 void load_message(apr_pool_t *p, apr_file_t *f, Message *m)
 {
-    apr_size_t len = 0;
+    apr_size_t len;
 
     /* Fetch message (from msg_start to body_end) */
     if (apr_file_seek(f, APR_SET, &m->msg_start) != APR_SUCCESS) {
@@ -76,7 +76,7 @@ void load_message(apr_pool_t *p, apr_fil
     len = m->body_end - m->msg_start;
     m->raw_msg = apr_palloc(p, len + 1);
 
-    if (apr_file_read(f, m->raw_msg, &len) != APR_SUCCESS) {
+    if (apr_file_read_full(f, m->raw_msg, len, &len) != APR_SUCCESS) {
         return;
     }