Changeset a35b458 in mainline for uspace/srv/fs/udf/udf_osta.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/srv/fs/udf/udf_osta.c (modified) (14 diffs)

uspace/srv/fs/udf/udf_osta.c

@@ -59 +59 @@
         if ((ch == 0x0000) || (ch == 0x002F))
                 return false;
-        
+
         return true;
 }
@@ -85 +85 @@
         /* Use udf_compressed to store current byte being read. */
         uint8_t comp_id = udf_compressed[0];
-        
+
         /* First check for valid compID. */
         if ((comp_id != 8) && (comp_id != 16))
                 return 0;
-        
+
         size_t unicode_idx = 0;
         size_t byte_idx = 1;
-        
+
         /* Loop through all the bytes. */
         while ((byte_idx < number_of_bytes) && (unicode_idx < unicode_max_len)) {
@@ -103 +103 @@
                 } else
                         unicode[unicode_idx] = 0;
-                
+
                 if (byte_idx < number_of_bytes) {
                         /* Then the next byte to the low bits. */
                         unicode[unicode_idx] |= udf_compressed[byte_idx++];
                 }
-                
+
                 unicode_idx++;
         }
-        
+
         return unicode_idx;
 }
@@ -136 +136 @@
         size_t new_idx = 0;
         size_t new_ext_idx = 0;
-        
+
         for (size_t idx = 0; idx < udf_len; idx++) {
                 uint16_t current = udf_name[idx];
-                
+
                 if ((!legal_check(current)) || (!ascii_check(current))) {
                         needs_crc = true;
-                        
+
                         /*
                          * Replace Illegal and non-displayable chars with
@@ -148 +148 @@
                          */
                         current = ILLEGAL_CHAR_MARK;
-                        
+
                         /*
                          * Skip any other illegal or non-displayable
@@ -158 +158 @@
                                 idx++;
                 }
-                
+
                 /* Record position of extension, if one is found. */
                 if ((current == PERIOD) && ((udf_len - idx - 1) <= EXT_SIZE)) {
@@ -170 +170 @@
                         }
                 }
-                
+
                 if (new_idx < MAXLEN)
                         new_name[new_idx++] = current;
@@ -176 +176 @@
                         needs_crc = true;
         }
-        
+
         if (needs_crc) {
                 uint16_t ext[EXT_SIZE];
                 size_t local_ext_idx = 0;
-                
+
                 if (has_ext) {
                         size_t max_filename_len;
-                        
+
                         /* Translate extension, and store it in ext. */
                         for (size_t idx = 0; (idx < EXT_SIZE) &&
                             (ext_idx + idx + 1 < udf_len); idx++) {
                                 uint16_t current = udf_name[ext_idx + idx + 1];
-                                
+
                                 if ((!legal_check(current)) || (!ascii_check(current))) {
                                         needs_crc = true;
-                                        
+
                                         /*
                                          * Replace Illegal and non-displayable
@@ -197 +197 @@
                                          */
                                         current = ILLEGAL_CHAR_MARK;
-                                        
+
                                         /*
                                          * Skip any other illegal or
@@ -207 +207 @@
                                                 idx++;
                                 }
-                                
+
                                 ext[local_ext_idx++] = current;
                         }
-                        
+
                         /*
                          * Truncate filename to leave room for extension and
@@ -224 +224 @@
                         new_idx = MAXLEN - 5;
                 }
-                
+
                 /* Add mark for CRC. */
                 new_name[new_idx++] = CRC_MARK;
-                
+
                 /* Calculate CRC from original filename. */
                 uint16_t value_crc = udf_unicode_cksum(udf_name, udf_len);
-                
+
                 /* Convert 16-bits of CRC to hex characters. */
                 const char hex_char[] = "0123456789ABCDEF";
-                
+
                 new_name[new_idx++] = hex_char[(value_crc & 0xf000) >> 12];
                 new_name[new_idx++] = hex_char[(value_crc & 0x0f00) >> 8];
                 new_name[new_idx++] = hex_char[(value_crc & 0x00f0) >> 4];
                 new_name[new_idx++] = hex_char[(value_crc & 0x000f)];
-                
+
                 /* Place a translated extension at end, if found. */
                 if (has_ext) {
                         new_name[new_idx++] = PERIOD;
-                        
+
                         for (size_t idx = 0; idx < local_ext_idx; idx++)
                                 new_name[new_idx++] = ext[idx];
                 }
         }
-        
+
         return new_idx;
 }
@@ -265 +265 @@
         const char *osta_id = "OSTA Compressed Unicode";
         size_t ucode_chars, nice_uchars;
-        
+
         uint16_t *raw_name = malloc(MAX_BUF * sizeof(uint16_t));
         uint16_t *unix_name = malloc(MAX_BUF * sizeof(uint16_t));
-        
+
         // FIXME: Check for malloc returning NULL
-        
+
         bool is_osta_typ0 = (chsp->type == 0) &&
             (str_cmp((char *) chsp->info, osta_id) == 0);
-        
+
         if (is_osta_typ0) {
                 *raw_name = 0;
                 *unix_name = 0;
-                
+
                 ucode_chars =
                     udf_uncompress_unicode(len, (uint8_t *) id, raw_name, MAX_BUF);
@@ -283 +283 @@
                 nice_uchars =
                     udf_translate_name(unix_name, raw_name, ucode_chars);
-                
+
                 /* Output UTF-8 */
                 unix_name[nice_uchars] = 0;
@@ -292 +292 @@
                     str_size((char *) (id + 1)));
         }
-        
+
         free(raw_name);
         free(unix_name);