Tweak indent.

diff --git a/libarchive/archive_read.c b/libarchive/archive_read.c
index 118c10b64daf73844739707fdc810bbf0b9cda7f..bfd0bdbf7fadf9df4644daf4b478170a16f98b62 100644 (file)
--- a/libarchive/archive_read.c
+++ b/libarchive/archive_read.c
@@ -1501,96 +1501,95 @@ __archive_read_filter_seek(struct archive_read_filter *filter, int64_t offset, i
        if (filter->seek == NULL)
                return (ARCHIVE_FAILED);
 
-       switch (whence)
-       {
-               case SEEK_CUR:
-                       /* Adjust the offset and use SEEK_SET instead */
-                       offset += filter->position;                     
-               case SEEK_SET:
-                       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)
-                                       break;
-                               r = filter->archive->client.dataset[cursor].begin_position +
-                                       filter->archive->client.dataset[cursor].total_size;
-                               filter->archive->client.dataset[++cursor].begin_position = r;
-                       }
-                       while (1)
-                       {
-                               if ((r = client_switch_proxy(filter, cursor)) != (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)
-                                       break;
-                               r = filter->archive->client.dataset[cursor].begin_position +
-                                       filter->archive->client.dataset[cursor].total_size;
-                               filter->archive->client.dataset[++cursor].begin_position = r;
-                       }
-                       offset -= filter->archive->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;
-                       if ((r = client_seek_proxy(filter, offset, SEEK_SET)) < 0)
+       switch (whence) {
+       case SEEK_CUR:
+               /* Adjust the offset and use SEEK_SET instead */
+               offset += filter->position;                     
+       case SEEK_SET:
+               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)
+                               break;
+                       r = filter->archive->client.dataset[cursor].begin_position +
+                               filter->archive->client.dataset[cursor].total_size;
+                       filter->archive->client.dataset[++cursor].begin_position = r;
+               }
+               while (1)
+               {
+                       if ((r = client_switch_proxy(filter, cursor)) != (ARCHIVE_OK))
                                return r;
-                       break;
+                       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)
+                               break;
+                       r = filter->archive->client.dataset[cursor].begin_position +
+                               filter->archive->client.dataset[cursor].total_size;
+                       filter->archive->client.dataset[++cursor].begin_position = r;
+               }
+               offset -= filter->archive->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;
+               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)
-                                       break;
-                               r = filter->archive->client.dataset[cursor].begin_position +
-                                       filter->archive->client.dataset[cursor].total_size;
-                               filter->archive->client.dataset[++cursor].begin_position = r;
-                       }
-                       while (1)
-                       {
-                               if ((r = client_switch_proxy(filter, cursor)) != (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)
-                                       break;
-                               filter->archive->client.dataset[++cursor].begin_position = r;
-                       }
-                       while (1)
-                       {
-                               if (r + offset >=
-                                       filter->archive->client.dataset[cursor].begin_position)
-                                       break;
-                               offset += filter->archive->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;
-                       }
-                       offset = (r + offset) -
-                               filter->archive->client.dataset[cursor].begin_position;
+       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)
+                               break;
+                       r = filter->archive->client.dataset[cursor].begin_position +
+                               filter->archive->client.dataset[cursor].total_size;
+                       filter->archive->client.dataset[++cursor].begin_position = r;
+               }
+               while (1)
+               {
                        if ((r = client_switch_proxy(filter, cursor)) != (ARCHIVE_OK))
                                return r;
-                       if ((r = client_seek_proxy(filter, offset, SEEK_SET)) < (ARCHIVE_OK))
+                       if ((r = client_seek_proxy(filter, 0, SEEK_END)) < 0)
                                return r;
-                       break;
+                       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)
+                               break;
+                       filter->archive->client.dataset[++cursor].begin_position = r;
+               }
+               while (1)
+               {
+                       if (r + offset >=
+                               filter->archive->client.dataset[cursor].begin_position)
+                               break;
+                       offset += filter->archive->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;
+               }
+               offset = (r + offset) -
+                       filter->archive->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))
+                       return r;
+               break;
 
-               default:
-                       return (ARCHIVE_FATAL);
+       default:
+               return (ARCHIVE_FATAL);
        }
        r += filter->archive->client.dataset[cursor].begin_position;
 

diff --git a/libarchive/archive_read_support_filter_all.c b/libarchive/archive_read_support_filter_all.c
index 141895d1a94f782b52c595bb7a357a744aa3e689..a059df8ef71ecacd670e8f2a9fac9a361f363ac3 100644 (file)
--- a/libarchive/archive_read_support_filter_all.c
+++ b/libarchive/archive_read_support_filter_all.c
@@ -64,7 +64,7 @@ archive_read_support_filter_all(struct archive *a)
        /* The decode code doesn't use an outside library. */
        archive_read_support_filter_rpm(a);
        /* The decode code doesn't use an outside library. */
-  archive_read_support_filter_lrzip(a);
+       archive_read_support_filter_lrzip(a);
 
        /* Note: We always return ARCHIVE_OK here, even if some of the
         * above return ARCHIVE_WARN.  The intent here is to enable