From: Michihiro NAKAJIMA <ggcueroad@gmail.com>
Date: Tue, 9 Oct 2012 20:48:42 +0000 (+0900)
Subject: Fix style and Make source files be somewhat readable.
X-Git-Tag: v3.1.0~40^2~62
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d37f94a25ca0ebd2a3c4f9dfdf290bb2da7b2624;p=thirdparty%2Flibarchive.git

Fix style and Make source files be somewhat readable.
---

diff --git a/libarchive/archive_read.c b/libarchive/archive_read.c
index edd9ab57c..766315345 100644
--- a/libarchive/archive_read.c
+++ b/libarchive/archive_read.c
@@ -194,8 +194,8 @@ client_skip_proxy(struct archive_read_filter *self, int64_t request)
 			int64_t get, ask = request;
 			if (ask > skip_limit)
 				ask = skip_limit;
-			get = (self->archive->client.skipper)(&self->archive->archive,
-			    self->data, ask);
+			get = (self->archive->client.skipper)
+				(&self->archive->archive, self->data, ask);
 			if (get == 0)
 				return (total);
 			request -= get;
@@ -215,8 +215,8 @@ client_skip_proxy(struct archive_read_filter *self, int64_t request)
 		 * only do this for skips of over 64k.
 		 */
 		int64_t before = self->position;
-		int64_t after = (self->archive->client.seeker)(&self->archive->archive,
-		    self->data, request, SEEK_CUR);
+		int64_t after = (self->archive->client.seeker)
+		    (&self->archive->archive, self->data, request, SEEK_CUR);
 		if (after != before + request)
 			return ARCHIVE_FATAL;
 		return after - before;
@@ -262,8 +262,8 @@ client_open_proxy(struct archive_read_filter *self)
 {
   int r = ARCHIVE_OK;
 	if (self->archive->client.opener != NULL)
-		r = (self->archive->client.opener)((struct archive *)self->archive,
-		    self->data);
+		r = (self->archive->client.opener)(
+		    (struct archive *)self->archive, self->data);
 	return (r);
 }
 
@@ -381,8 +381,8 @@ archive_read_set_callback_data2(struct archive *_a, void *client_data,
 
 	if (a->client.nodes == 0)
 	{
-		a->client.dataset =
-			(struct archive_read_data_node *)calloc(1, sizeof(*a->client.dataset));
+		a->client.dataset = (struct archive_read_data_node *)
+		    calloc(1, sizeof(*a->client.dataset));
 		if (a->client.dataset == NULL)
 		{
 			archive_set_error(&a->archive, ENOMEM,
@@ -414,8 +414,7 @@ archive_read_add_callback_data(struct archive *_a, void *client_data,
 
 	archive_check_magic(_a, ARCHIVE_READ_MAGIC, ARCHIVE_STATE_NEW,
 	    "archive_read_add_callback_data");
-	if (iindex > a->client.nodes)
-	{
+	if (iindex > a->client.nodes) {
 		archive_set_error(&a->archive, EINVAL,
 			"Invalid index specified.");
 		return ARCHIVE_FATAL;
@@ -428,8 +427,7 @@ archive_read_add_callback_data(struct archive *_a, void *client_data,
 		return ARCHIVE_FATAL;
 	}
 	a->client.dataset = (struct archive_read_data_node *)p;
-	for (i = a->client.nodes - 1; i > iindex && i > 0; i--)
-	{
+	for (i = a->client.nodes - 1; i > iindex && i > 0; i--) {
 		a->client.dataset[i].data = a->client.dataset[i-1].data;
 		a->client.dataset[i].begin_position = -1;
 		a->client.dataset[i].total_size = -1;
@@ -477,10 +475,10 @@ archive_read_open1(struct archive *_a)
 		e =(a->client.opener)(&a->archive, a->client.dataset[0].data);
 		if (e != 0) {
 			/* If the open failed, call the closer to clean up. */
-			if (a->client.closer)
-			{
+			if (a->client.closer) {
 				for (i = 0; i < a->client.nodes; i++)
-					(a->client.closer)(&a->archive, a->client.dataset[i].data);
+					(a->client.closer)(&a->archive,
+					    a->client.dataset[i].data);
 			}
 			return (e);
 		}
@@ -1025,7 +1023,8 @@ get_filter(struct archive *_a, int n)
 {
 	struct archive_read *a = (struct archive_read *)_a;
 	struct archive_read_filter *f = a->filter;
-	/* We use n == -1 for 'the last filter', which is always the client proxy. */
+	/* We use n == -1 for 'the last filter', which is always the
+	 * client proxy. */
 	if (n == -1 && f != NULL) {
 		struct archive_read_filter *last = f;
 		f = f->upstream;
@@ -1245,7 +1244,8 @@ __archive_read_filter_ahead(struct archive_read_filter *filter,
 		if (filter->next > filter->buffer &&
 		    filter->next + min > filter->buffer + filter->buffer_size) {
 			if (filter->avail > 0)
-				memmove(filter->buffer, filter->next, filter->avail);
+				memmove(filter->buffer, filter->next,
+				    filter->avail);
 			filter->next = filter->buffer;
 		}
 
@@ -1260,7 +1260,8 @@ __archive_read_filter_ahead(struct archive_read_filter *filter,
 			    &filter->client_buff);
 			if (bytes_read < 0) {		/* Read error. */
 				filter->client_total = filter->client_avail = 0;
-				filter->client_next = filter->client_buff = NULL;
+				filter->client_next =
+				    filter->client_buff = NULL;
 				filter->fatal = 1;
 				if (avail != NULL)
 					*avail = ARCHIVE_FATAL;
@@ -1268,15 +1269,17 @@ __archive_read_filter_ahead(struct archive_read_filter *filter,
 			}
 			if (bytes_read == 0) {
 				/* Check for another client object first */
-				if (filter->archive->client.cursor != filter->archive->client.nodes - 1)
-				{
+				if (filter->archive->client.cursor !=
+				      filter->archive->client.nodes - 1) {
 					if (client_switch_proxy(filter,
-						filter->archive->client.cursor + 1) == (ARCHIVE_OK))
+					    filter->archive->client.cursor + 1)
+					    == ARCHIVE_OK)
 						continue;
 				}
 				/* Premature end-of-file. */
 				filter->client_total = filter->client_avail = 0;
-				filter->client_next = filter->client_buff = NULL;
+				filter->client_next =
+				    filter->client_buff = NULL;
 				filter->end_of_file = 1;
 				/* Return whatever we do have. */
 				if (avail != NULL)
@@ -1286,9 +1289,7 @@ __archive_read_filter_ahead(struct archive_read_filter *filter,
 			filter->client_total = bytes_read;
 			filter->client_avail = filter->client_total;
 			filter->client_next = filter->client_buff;
-		}
-		else
-		{
+		} else {
 			/*
 			 * We can't satisfy the request from the copy
 			 * buffer or the existing client data, so we
@@ -1309,9 +1310,10 @@ __archive_read_filter_ahead(struct archive_read_filter *filter,
 					t *= 2;
 					if (t <= s) { /* Integer overflow! */
 						archive_set_error(
-							&filter->archive->archive,
-							ENOMEM,
-						    "Unable to allocate copy buffer");
+						    &filter->archive->archive,
+						    ENOMEM,
+						    "Unable to allocate copy"
+						    " buffer");
 						filter->fatal = 1;
 						if (avail != NULL)
 							*avail = ARCHIVE_FATAL;
@@ -1350,8 +1352,8 @@ __archive_read_filter_ahead(struct archive_read_filter *filter,
 			if (tocopy > filter->client_avail)
 				tocopy = filter->client_avail;
 
-			memcpy(filter->next + filter->avail, filter->client_next,
-			    tocopy);
+			memcpy(filter->next + filter->avail,
+			    filter->client_next, tocopy);
 			/* Remove this data from client buffer. */
 			filter->client_next += tocopy;
 			filter->client_avail -= tocopy;
@@ -1454,10 +1456,11 @@ advance_file_pointer(struct archive_read_filter *filter, int64_t request)
 		}
 
 		if (bytes_read == 0) {
-			if (filter->archive->client.cursor != filter->archive->client.nodes - 1)
-			{
+			if (filter->archive->client.cursor !=
+			      filter->archive->client.nodes - 1) {
 				if (client_switch_proxy(filter,
-					filter->archive->client.cursor + 1) == (ARCHIVE_OK))
+				    filter->archive->client.cursor + 1)
+				    == ARCHIVE_OK)
 					continue;
 			}
 			filter->client_buff = NULL;
@@ -1491,8 +1494,10 @@ __archive_read_seek(struct archive_read *a, int64_t offset, int whence)
 }
 
 int64_t
-__archive_read_filter_seek(struct archive_read_filter *filter, int64_t offset, int whence)
+__archive_read_filter_seek(struct archive_read_filter *filter, int64_t offset,
+    int whence)
 {
+	struct archive_read_client *client;
 	int64_t r;
 	unsigned int cursor;
 
@@ -1501,6 +1506,7 @@ __archive_read_filter_seek(struct archive_read_filter *filter, int64_t offset, i
 	if (filter->seek == NULL)
 		return (ARCHIVE_FAILED);
 
+	client = &(filter->archive->client);
 	switch (whence) {
 	case SEEK_CUR:
 		/* Adjust the offset and use SEEK_SET instead */
@@ -1509,89 +1515,87 @@ __archive_read_filter_seek(struct archive_read_filter *filter, int64_t offset, i
 		cursor = 0;
 		while (1)
 		{
-			if (filter->archive->client.dataset[cursor].begin_position < 0 ||
-				filter->archive->client.dataset[cursor].total_size < 0 ||
-				filter->archive->client.dataset[cursor].begin_position +
-				filter->archive->client.dataset[cursor].total_size - 1 > offset ||
-				cursor + 1 >= filter->archive->client.nodes)
+			if (client->dataset[cursor].begin_position < 0 ||
+			    client->dataset[cursor].total_size < 0 ||
+			    client->dataset[cursor].begin_position +
+			      client->dataset[cursor].total_size - 1 > offset ||
+			    cursor + 1 >= client->nodes)
 				break;
-			r = filter->archive->client.dataset[cursor].begin_position +
-				filter->archive->client.dataset[cursor].total_size;
-			filter->archive->client.dataset[++cursor].begin_position = r;
+			r = client->dataset[cursor].begin_position +
+				client->dataset[cursor].total_size;
+			client->dataset[++cursor].begin_position = r;
 		}
-		while (1)
-		{
-			if ((r = client_switch_proxy(filter, cursor)) != (ARCHIVE_OK))
+		while (1) {
+			r = client_switch_proxy(filter, cursor);
+			if (r != ARCHIVE_OK)
 				return r;
 			if ((r = client_seek_proxy(filter, 0, SEEK_END)) < 0)
 				return r;
-			filter->archive->client.dataset[cursor].total_size = r;
-			if (filter->archive->client.dataset[cursor].begin_position +
-				filter->archive->client.dataset[cursor].total_size - 1 > offset ||
-				cursor + 1 >= filter->archive->client.nodes)
+			client->dataset[cursor].total_size = r;
+			if (client->dataset[cursor].begin_position +
+			    client->dataset[cursor].total_size - 1 > offset ||
+			    cursor + 1 >= client->nodes)
 				break;
-			r = filter->archive->client.dataset[cursor].begin_position +
-				filter->archive->client.dataset[cursor].total_size;
-			filter->archive->client.dataset[++cursor].begin_position = r;
+			r = client->dataset[cursor].begin_position +
+				client->dataset[cursor].total_size;
+			client->dataset[++cursor].begin_position = r;
 		}
-		offset -= filter->archive->client.dataset[cursor].begin_position;
+		offset -= client->dataset[cursor].begin_position;
 		if (offset < 0)
 			offset = 0;
-		else if (offset > filter->archive->client.dataset[cursor].total_size - 1)
-			offset = filter->archive->client.dataset[cursor].total_size - 1;
+		else if (offset > client->dataset[cursor].total_size - 1)
+			offset = client->dataset[cursor].total_size - 1;
 		if ((r = client_seek_proxy(filter, offset, SEEK_SET)) < 0)
 			return r;
 		break;
 
 	case SEEK_END:
 		cursor = 0;
-		while (1)
-		{
-			if (filter->archive->client.dataset[cursor].begin_position < 0 ||
-				filter->archive->client.dataset[cursor].total_size < 0 ||
-				cursor + 1 >= filter->archive->client.nodes)
+		while (1) {
+			if (client->dataset[cursor].begin_position < 0 ||
+			    client->dataset[cursor].total_size < 0 ||
+			    cursor + 1 >= client->nodes)
 				break;
-			r = filter->archive->client.dataset[cursor].begin_position +
-				filter->archive->client.dataset[cursor].total_size;
-			filter->archive->client.dataset[++cursor].begin_position = r;
+			r = client->dataset[cursor].begin_position +
+				client->dataset[cursor].total_size;
+			client->dataset[++cursor].begin_position = r;
 		}
-		while (1)
-		{
-			if ((r = client_switch_proxy(filter, cursor)) != (ARCHIVE_OK))
+		while (1) {
+			r = client_switch_proxy(filter, cursor);
+			if (r != ARCHIVE_OK)
 				return r;
 			if ((r = client_seek_proxy(filter, 0, SEEK_END)) < 0)
 				return r;
-			filter->archive->client.dataset[cursor].total_size = r;
-			r = filter->archive->client.dataset[cursor].begin_position +
-				filter->archive->client.dataset[cursor].total_size;
-			if (cursor + 1 >= filter->archive->client.nodes)
+			client->dataset[cursor].total_size = r;
+			r = client->dataset[cursor].begin_position +
+				client->dataset[cursor].total_size;
+			if (cursor + 1 >= client->nodes)
 				break;
-			filter->archive->client.dataset[++cursor].begin_position = r;
+			client->dataset[++cursor].begin_position = r;
 		}
-		while (1)
-		{
+		while (1) {
 			if (r + offset >=
-				filter->archive->client.dataset[cursor].begin_position)
+			    client->dataset[cursor].begin_position)
 				break;
-			offset += filter->archive->client.dataset[cursor].total_size;
+			offset += client->dataset[cursor].total_size;
 			if (cursor == 0)
 				break;
 			cursor--;
-			r = filter->archive->client.dataset[cursor].begin_position +
-				filter->archive->client.dataset[cursor].total_size;
+			r = client->dataset[cursor].begin_position +
+				client->dataset[cursor].total_size;
 		}
-		offset = (r + offset) -
-			filter->archive->client.dataset[cursor].begin_position;
-		if ((r = client_switch_proxy(filter, cursor)) != (ARCHIVE_OK))
+		offset = (r + offset) - client->dataset[cursor].begin_position;
+		if ((r = client_switch_proxy(filter, cursor)) != ARCHIVE_OK)
 			return r;
-		if ((r = client_seek_proxy(filter, offset, SEEK_SET)) < (ARCHIVE_OK))
+		r = client_seek_proxy(filter, offset, SEEK_SET);
+		if (r < ARCHIVE_OK)
 			return r;
 		break;
 
 	default:
 		return (ARCHIVE_FATAL);
 	}
-	r += filter->archive->client.dataset[cursor].begin_position;
+	r += client->dataset[cursor].begin_position;
 
 	if (r >= 0) {
 		/*
diff --git a/libarchive/archive_read_open_fd.c b/libarchive/archive_read_open_fd.c
index 797284197..e0f95bf41 100644
--- a/libarchive/archive_read_open_fd.c
+++ b/libarchive/archive_read_open_fd.c
@@ -119,7 +119,8 @@ file_read(struct archive *a, void *client_data, const void **buff)
 		if (bytes_read < 0) {
 			if (errno == EINTR)
 				continue;
-			archive_set_error(a, errno, "Error reading fd %d", mine->fd);
+			archive_set_error(a, errno, "Error reading fd %d",
+			    mine->fd);
 		}
 		return (bytes_read);
 	}