svn commit: r1594700 - in /apr/apr/branches/1.6.x: ./ poll/unix/epoll.c test/testpipe.c

[sf...@apache.org]

Author: sf
Date: Wed May 14 20:15:47 2014
New Revision: 1594700

URL: http://svn.apache.org/r1594700
Log:
Merge r1438959 from trunk:

    Minor fixes to quiet valgrind warnings

Modified:
    apr/apr/branches/1.6.x/   (props changed)
    apr/apr/branches/1.6.x/poll/unix/epoll.c
    apr/apr/branches/1.6.x/test/testpipe.c

Propchange: apr/apr/branches/1.6.x/
------------------------------------------------------------------------------
  Merged /apr/apr/trunk:r1438959

Modified: apr/apr/branches/1.6.x/poll/unix/epoll.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.6.x/poll/unix/epoll.c?rev=1594700&r1=1594699&r2=1594700&view=diff
==============================================================================
--- apr/apr/branches/1.6.x/poll/unix/epoll.c (original)
+++ apr/apr/branches/1.6.x/poll/unix/epoll.c Wed May 14 20:15:47 2014
@@ -366,7 +366,7 @@ static apr_status_t impl_pollcb_create(a
 static apr_status_t impl_pollcb_add(apr_pollcb_t *pollcb,
                                     apr_pollfd_t *descriptor)
 {
-    struct epoll_event ev;
+    struct epoll_event ev = { 0 };
     int ret;
     
     ev.events = get_epoll_event(descriptor->reqevents);

Modified: apr/apr/branches/1.6.x/test/testpipe.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.6.x/test/testpipe.c?rev=1594700&r1=1594699&r2=1594700&view=diff
==============================================================================
--- apr/apr/branches/1.6.x/test/testpipe.c (original)
+++ apr/apr/branches/1.6.x/test/testpipe.c Wed May 14 20:15:47 2014
@@ -129,7 +129,7 @@ static void test_pipe_writefull(abts_cas
     int iterations = 1000;
     int i;
     int bytes_per_iteration = 8000;
-    char *buf = (char *)malloc(bytes_per_iteration);
+    char *buf = (char *)calloc(bytes_per_iteration, 1);
     char responsebuf[128];
     apr_size_t nbytes;
     int bytes_processed;