Remove dead code.

CVS patchset: 7550
CVS date: 2004/11/06 21:01:03

2 files changed, 2 insertions, 105 deletions

diff --git a/rpmio/rpmdav.c b/rpmio/rpmdav.c
index 58e5d147a..7d6313110 100644
--- a/rpmio/rpmdav.c
+++ b/rpmio/rpmdav.c
@@ -422,87 +422,6 @@ fprintf(stderr, "==> %s skipping target resource.\n", path);
     newres->next = current;
 }
 
-#ifdef	DYING
-static char *format_time(time_t when)
-	/*@*/
-{
-    const char *fmt;
-    static char ret[256];
-    struct tm *local;
-    time_t current_time;
-    
-    if (when == (time_t)-1) {
-	/* Happens on lock-null resources */
-	return "  (unknown) ";
-    }
-
-    /* from GNU fileutils... this section is 
-     *  
-     */
-    current_time = time(NULL);
-    if (current_time > when + 6L * 30L * 24L * 60L * 60L	/* Old. */
-	|| current_time < when - 60L * 60L) {
-	/* The file is fairly old or in the future.  POSIX says the
-	   cutoff is 6 months old; approximate this by 6*30 days.
-	   Allow a 1 hour slop factor for what is considered "the
-	   future", to allow for NFS server/client clock disagreement.
-	   Show the year instead of the time of day.  */
-	fmt = "%b %e  %Y";
-    } else {
-	fmt = "%b %e %H:%M";
-    }
-
-    local = localtime(&when);
-    if (local != NULL) {
-	if (strftime(ret, 256, fmt, local)) {
-	    return ret;
-	}
-    }
-    return "???";
-}
-
-static void display_ls_line(struct fetch_resource_s *res)
-	/*@modifies res @*/
-{
-    const char *restype;
-    char exec_char, vcr_char, *name;
-
-    switch (res->type) {
-    case resr_normal: restype = ""; break;
-    case resr_reference: restype = _("Ref:"); break;
-    case resr_collection: restype = _("Coll:"); break;
-    default:
-	restype = "???"; break;
-    }
-    
-    if (ne_path_has_trailing_slash(res->uri)) {
-	res->uri[strlen(res->uri)-1] = '\0';
-    }
-    name = strrchr(res->uri, '/');
-    if (name != NULL && strlen(name+1) > 0) {
-	name++;
-    } else {
-	name = res->uri;
-    }
-
-    name = ne_path_unescape(name);
-
-    if (res->type == resr_error) {
-	printf(_("Error: %-30s %d %s\n"), name, res->error_status,
-	       res->error_reason?res->error_reason:_("unknown"));
-    } else {
-	exec_char = res->is_executable ? '*' : ' ';
-	/* 0: no vcr, 1: checkin, 2: checkout */
-	vcr_char = res->is_vcr==0 ? ' ' : (res->is_vcr==1? '>' : '<');
-	printf("%5s %c%c%-29s %10d  %s\n", 
-	       restype, vcr_char, exec_char, name,
-	       res->size, format_time(res->modtime));
-    }
-
-    free(name);
-}
-#endif
-
 static int davFetch(const urlinfo u, struct fetch_context_s * ctx)
 	/*@globals internalState @*/
 	/*@modifies ctx, internalState @*/
@@ -878,24 +797,8 @@ ssize_t davRead(void * cookie, /*@out@*/ char * buf, size_t count)
     FD_t fd = cookie;
     ssize_t rc;
 
-#ifdef	DYING
-#if 0
-    if (fd->bytesRemain == 0) return 0;	/* XXX simulate EOF */
-#endif
-
-    fdstat_enter(fd, FDSTAT_READ);
-/*@-boundswrite@*/
-#endif
-
     rc = ne_read_response_block(fd->req, buf, count);
 
-#ifdef	DYING
-/*@=boundswrite@*/
-    fdstat_exit(fd, FDSTAT_READ, rc);
-
-    if (fd->ndigests && rc > 0) fdUpdateDigests(fd, buf, rc);
-#endif
-
 if (_dav_debug) {
 fprintf(stderr, "*** davRead(%p,%p,0x%x) rc 0x%x\n", cookie, buf, count, (unsigned)rc);
 hexdump(buf, rc);
diff --git a/rpmio/rpmio.c b/rpmio/rpmio.c
index c01db5cbb..4c857540a 100644
--- a/rpmio/rpmio.c
+++ b/rpmio/rpmio.c
@@ -153,7 +153,7 @@ static /*@observer@*/ const char * fdbg(/*@null@*/ FD_t fd)
     if (fd == NULL)
 	return buf;
 
-#if DYING
+#ifdef DYING
     sprintf(be, "fd %p", fd);	be += strlen(be);
     if (fd->rd_timeoutsecs >= 0) {
 	sprintf(be, " secs %d", fd->rd_timeoutsecs);
@@ -1741,13 +1741,7 @@ static ssize_t ufdRead(void * cookie, /*@out@*/ char * buf, size_t count)
 	}
 
 /*@-boundswrite@*/
-#ifdef	DYING
-	/* HACK: flimsy wiring for davRead */
-	if (fd->req != NULL)
-	    rc = davRead(fd, buf + total, count - total);
-	else
-#endif
-	    rc = fdRead(fd, buf + total, count - total);
+	rc = fdRead(fd, buf + total, count - total);
 /*@=boundswrite@*/
 
 	if (rc < 0) {