Changeset a35b458 in mainline for uspace/lib/compress/gzip.c

Timestamp:

2018-03-02T20:10:49Z (7 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

f1380b7

Parents:

3061bc1

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-02-28 17:38:31)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-02 20:10:49)

Message:

style: Remove trailing whitespace on _all_ lines, including empty ones, for particular file types.

Command used: tools/srepl '\s\+$' '' -- *.c *.h *.py *.sh *.s *.S *.ag

Currently, whitespace on empty lines is very inconsistent.
There are two basic choices: Either remove the whitespace, or keep empty lines
indented to the level of surrounding code. The former is AFAICT more common,
and also much easier to do automatically.

Alternatively, we could write script for automatic indentation, and use that
instead. However, if such a script exists, it's possible to use the indented
style locally, by having the editor apply relevant conversions on load/save,
without affecting remote repository. IMO, it makes more sense to adopt
the simpler rule.

File:

• uspace/lib/compress/gzip.c (modified) (3 diffs)

uspace/lib/compress/gzip.c

@@ -89 +89 @@
         gzip_header_t header;
         gzip_footer_t footer;
-        
+
         if ((srclen < sizeof(header)) || (srclen < sizeof(footer)))
                 return EINVAL;
-        
+
         /* Decode header and footer */
-        
+
         memcpy(&header, src, sizeof(header));
         memcpy(&footer, src + srclen - sizeof(footer), sizeof(footer));
-        
+
         if ((header.id1 != GZIP_ID1) ||
             (header.id2 != GZIP_ID2) ||
@@ -103 +103 @@
             ((header.flags & (~GZIP_FLAGS_MASK)) != 0))
                 return EINVAL;
-        
+
         *destlen = uint32_t_le2host(footer.size);
-        
+
         /* Ignore extra metadata */
-        
+
         void *stream = src + sizeof(header);
         size_t stream_length = srclen - sizeof(header) - sizeof(footer);
-        
+
         if ((header.flags & GZIP_FLAG_FEXTRA) != 0) {
                 uint16_t extra_length;
-                
+
                 if (stream_length < sizeof(extra_length))
                         return EINVAL;
-                
+
                 memcpy(&extra_length, stream, sizeof(extra_length));
                 stream += sizeof(extra_length);
                 stream_length -= sizeof(extra_length);
-                
+
                 if (stream_length < extra_length)
                         return EINVAL;
-                
+
                 stream += extra_length;
                 stream_length -= extra_length;
         }
-        
+
         if ((header.flags & GZIP_FLAG_FNAME) != 0) {
                 while (*((uint8_t *) stream) != 0) {
                         if (stream_length == 0)
                                 return EINVAL;
-                        
+
                         stream++;
                         stream_length--;
                 }
-                
+
                 if (stream_length == 0)
                         return EINVAL;
-                
+
                 stream++;
                 stream_length--;
         }
-        
+
         if ((header.flags & GZIP_FLAG_FCOMMENT) != 0) {
                 while (*((uint8_t *) stream) != 0) {
                         if (stream_length == 0)
                                 return EINVAL;
-                        
+
                         stream++;
                         stream_length--;
                 }
-                
+
                 if (stream_length == 0)
                         return EINVAL;
-                
+
                 stream++;
                 stream_length--;
         }
-        
+
         if ((header.flags & GZIP_FLAG_FHCRC) != 0) {
                 if (stream_length < 2)
                         return EINVAL;
-                
+
                 stream += 2;
                 stream_length -= 2;
         }
-        
+
         /* Allocate output buffer and inflate the data */
-        
+
         *dest = malloc(*destlen);
         if (*dest == NULL)
                 return ENOMEM;
-        
+
         errno_t ret = inflate(stream, stream_length, *dest, *destlen);
         if (ret != EOK) {
@@ -179 +179 @@
                 return ret;
         }
-        
+
         return EOK;
 }