4450622 Remove some dead code — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Remove some dead code

Baptiste Daroussin committed 11 years ago

commit 44506227f66b3b991cc95ee98d20e7f323d7a301
parent f2e3a11

3 files changed +0 -11

modified libpkg/fetch.c

@@ -132,7 +132,6 @@ ssh_read(void *data, char *buf, int len)

 	struct timeval now, timeout, delta;
 	struct pollfd pfd;
 	ssize_t rlen;
 	int deltams;
 	pkg_debug(2, "ssh: start reading");

@@ -141,7 +140,6 @@ ssh_read(void *data, char *buf, int len)

 		timeout.tv_sec += fetchTimeout;
 	}
 	deltams = -1;
 	memset(&pfd, 0, sizeof pfd);
 	pfd.fd = repo->sshio.in;
 	pfd.events = POLLIN;

@@ -168,8 +166,6 @@ ssh_read(void *data, char *buf, int len)

 				return (-1);
 			}
 			timersub(&timeout, &now, &delta);
 			deltams = delta.tv_sec * 1000 +
 				delta.tv_usec / 1000;
 		}
 	}

@@ -403,7 +399,6 @@ pkg_fetch_file_to_fd(struct pkg_repo *repo, const char *url, int dest, time_t *t

 	int64_t		 max_retry, retry;
 	int64_t		 fetch_timeout;
 	time_t		 begin_dl;
 	time_t		 last = 0;
 	char		 buf[10240];
 	char		*doc = NULL;

@@ -545,7 +540,6 @@ pkg_fetch_file_to_fd(struct pkg_repo *repo, const char *url, int dest, time_t *t

 	pkg_emit_fetch_begin(url);
 	pkg_emit_progress_start(NULL);
 	begin_dl = time(NULL);
 	while (done < sz) {
 		time_t	now;

modified libpkg/pkg_repo_create.c

@@ -99,7 +99,6 @@ pkg_repo_write_conflicts (struct pkg_conflict_bulk *bulk, FILE *out)

 {
 	struct pkg_conflict_bulk	*pkg_bulk = NULL, *cur, *tmp, *s;
 	struct pkg_conflict	*c1, *c1tmp, *c2, *c2tmp, *ctmp;
 	bool new;
 	/*
 	 * Here we reorder bulk hash from hash by file

@@ -123,7 +122,6 @@ pkg_repo_write_conflicts (struct pkg_conflict_bulk *bulk, FILE *out)

 			}
 			/* Now add all new entries from this file to this conflict structure */
 			HASH_ITER (hh, cur->conflicts, c2, c2tmp) {
 				new = true;
 				if (strcmp(sbuf_get(c1->uniqueid), sbuf_get(c2->uniqueid)) == 0)
 					continue;

modified src/main.c

@@ -645,7 +645,6 @@ main(int argc, char **argv)

 	const char	 *conffile = NULL;
 	const char	 *reposdir = NULL;
 	char		**save_argv;
 	int		  newargvl;
 	int		  j;
 	struct option longopts[] = {

@@ -666,8 +665,6 @@ main(int argc, char **argv)

 	/* Set stdout unbuffered */
 	setvbuf(stdout, NULL, _IONBF, 0);
 	newargvl = 0;
 	if (argc < 2)
 		usage(NULL, NULL, stderr, PKG_USAGE_INVALID_ARGUMENTS, "not enough arguments");