From f2bdbe3d7df24e874bb9713354a5bad4a7b7c349 Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Mon, 9 Jun 2008 15:38:28 +0300 Subject: [PATCH] Lose bunch of unused fields from FD_t - leftovers from times of internal http/dav etc transports.. --- rpmio/rpmio.c | 7 ------- rpmio/rpmio_internal.h | 4 ---- 2 files changed, 11 deletions(-) diff --git a/rpmio/rpmio.c b/rpmio/rpmio.c index 69637f1..8e01260 100644 --- a/rpmio/rpmio.c +++ b/rpmio/rpmio.c @@ -121,10 +121,6 @@ static const char * fdbg(FD_t fd) sprintf(be, " clen %d", (int)fd->bytesRemain); be += strlen(be); } - if (fd->wr_chunked) { - strcpy(be, " chunked"); - be += strlen(be); - } *be++ = '\t'; for (i = fd->nfps; i >= 0; i--) { FDSTACK_t * fps = &fd->fps[i]; @@ -289,7 +285,6 @@ FD_t fdNew(const char * msg) fd->rd_timeoutsecs = 1; /* XXX default value used to be -1 */ fd->contentLength = fd->bytesRemain = -1; - fd->wr_chunked = 0; fd->syserrno = 0; fd->errcookie = NULL; fd->stats = xcalloc(1, sizeof(*fd->stats)); @@ -297,8 +292,6 @@ FD_t fdNew(const char * msg) fd->ndigests = 0; memset(fd->digests, 0, sizeof(fd->digests)); - fd->firstFree = 0; - fd->fileSize = 0; fd->fd_cpioPos = 0; return fdLink(fd, msg); diff --git a/rpmio/rpmio_internal.h b/rpmio/rpmio_internal.h index 6bf658c..524221a 100644 --- a/rpmio/rpmio_internal.h +++ b/rpmio/rpmio_internal.h @@ -52,8 +52,6 @@ struct _FD_s { int rd_timeoutsecs; /* ufdRead: per FD_t timer */ ssize_t bytesRemain; /* ufdio: */ ssize_t contentLength; /* ufdio: */ - int persist; /* ufdio: */ - int wr_chunked; /* ufdio: */ int syserrno; /* last system errno encountered */ const void *errcookie; /* gzdio/bzdio/ufdio: */ @@ -64,8 +62,6 @@ struct _FD_s { #define FDDIGEST_MAX 4 struct _FDDIGEST_s digests[FDDIGEST_MAX]; - unsigned int firstFree; /* fadio: */ - rpm_off_t fileSize; /* fadio: */ rpm_loff_t fd_cpioPos; /* cpio: */ }; -- 2.7.4