RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 15-Sep-2014 23:53:54
Branch: rpm-5_4 Handle: 2014091521535201
Modified files: (Branch: rpm-5_4)
rpm/rpmio rpmdav.c rpmio.c
Log:
- rpmio: revert to status quo ante minimal necessary change with
NE_REDIRECT.
Summary:
Revision Changes Path
2.119.2.9 +3 -5 rpm/rpmio/rpmdav.c
1.230.2.21 +8 -12 rpm/rpmio/rpmio.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmdav.c
============================================================================
$ cvs diff -u -r2.119.2.8 -r2.119.2.9 rpmdav.c
--- rpm/rpmio/rpmdav.c 15 Sep 2014 07:54:25 -0000 2.119.2.8
+++ rpm/rpmio/rpmdav.c 15 Sep 2014 21:53:53 -0000 2.119.2.9
@@ -131,7 +131,7 @@
if (u->sess != NULL)
ne_close_connection((ne_session *)u->sess);
#endif
-#endif
+#endif /* NOTYET */
}
DAVDEBUG(-1, (stderr, "<-- %s(%p) active %d\n", __FUNCTION__, u, rc));
rc = 0; /* XXX return active state? */
@@ -1234,7 +1234,6 @@
davAllow(u->ctrl, ne_get_response_header(req, "Allow")); /* XXX
needed? */
davLocation(u->ctrl,ne_get_response_header(req, "Location"));
davETag(u->ctrl, ne_get_response_header(req, "ETag"));
-#endif
/* XXX Content-Length: is returned only for files. */
htag = "Content-Length";
@@ -1275,7 +1274,7 @@
if (_dav_debug && printing)
fprintf(stderr, "\n");
-#endif
+#endif /* HAVE_NEON_NE_GET_RESPONSE_HEADER */
exit:
ne_request_destroy(req);
@@ -2019,10 +2018,9 @@
if (fd->req != (void *)-1) {
rc = davCheck(fd->req, "ne_end_request",
ne_end_request((ne_request *)fd->req));
-
ne_request_destroy((ne_request *)fd->req);
- fd->req = (void *)-1; /* XXX see davReq assert failure */
}
+ fd->req = (void *)NULL;
DAVDEBUG(-1, (stderr, "<-- %s(%p) rc %d\n", __FUNCTION__, fd, rc));
return rc;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmio.c
============================================================================
$ cvs diff -u -r1.230.2.20 -r1.230.2.21 rpmio.c
--- rpm/rpmio/rpmio.c 15 Sep 2014 07:54:25 -0000 1.230.2.20
+++ rpm/rpmio/rpmio.c 15 Sep 2014 21:53:52 -0000 1.230.2.21
@@ -166,7 +166,11 @@
/**
*/
/*@unchecked@*/
-int noLibio = _USE_LIBIO;
+#if _USE_LIBIO /* XXX FIXME: inverted logic */
+int noLibio = 0;
+#else
+int noLibio = 1;
+#endif
#define TIMEOUT_SECS 60
@@ -527,13 +531,13 @@
fdstat_enter(fd, FDSTAT_CLOSE);
/* HACK: flimsy wiring for davClose */
- if (fd->req != NULL)
+ if (fd->req != NULL) {
#ifdef WITH_NEON
rc = davClose(fd);
#else
rc = -1;
#endif
- else
+ } else
rc = ((fdno >= 0) ? close(fdno) : -2);
fdstat_exit(fd, FDSTAT_CLOSE, rc);
@@ -1977,15 +1981,7 @@
bytesRead = 0;
/* Is there data to read? */
- if (fd->bytesRemain == 0) { /* XXX simulate EOF */
-#ifdef WITH_NEON
- if (fd->req && fd->req != (void *)-1) {
- (void) davClose(fd);
- fd = fdFree(fd, "open data (davReq)");
- }
-#endif
- return (ssize_t) total; /* XXX simulate EOF */
- }
+ if (fd->bytesRemain == 0) return (ssize_t) total; /* XXX simulate EOF */
rc = fdReadable(fd, fd->rd_timeoutsecs);
switch (rc) {
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
