Changeset 1b20da0 in mainline for uspace/srv/fs/fat

Timestamp:

2018-02-28T17:52:03Z (8 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:

3061bc1

Parents:

df6ded8

git-author:

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

git-committer:

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

Message:

style: Remove trailing whitespace on non-empty lines, in certain file types.

Command used: tools/srepl '\([^[:space:]]\)\s\+$' '\1' -- *.c *.h *.py *.sh *.s *.S *.ag

Location:

uspace/srv/fs/fat

Files:

• fat.c (modified) (1 diff)
• fat.h (modified) (1 diff)
• fat_dentry.c (modified) (5 diffs)
• fat_dentry.h (modified) (1 diff)
• fat_directory.c (modified) (8 diffs)
• fat_fat.c (modified) (2 diffs)
• fat_idx.c (modified) (8 diffs)
• fat_ops.c (modified) (2 diffs)

uspace/srv/fs/fat/fat.c

@@ -31 +31 @@
 /** @addtogroup fs
  * @{
- */ 
+ */
 
 /**

uspace/srv/fs/fat/fat.h

@@ -30 +30 @@
 /** @addtogroup fs
  * @{
- */ 
+ */
 
 #ifndef FAT_FAT_H_

uspace/srv/fs/fat/fat_dentry.c

@@ -30 +30 @@
 /** @addtogroup fs
  * @{
- */ 
+ */
 
 /**
@@ -263 +263 @@
  *
  * @param str  NULL-terminated (or not) string. The pointer comes from a packed
- *             structure and as such is expected to be unaligned. 
+ *             structure and as such is expected to be unaligned.
  * @param size Maximum number of bytes to consider.
  *
@@ -274 +274 @@
 
         while (offset < size) {
-                if (str[offset] == 0 || str[offset] == FAT_LFN_PAD) 
+                if (str[offset] == 0 || str[offset] == FAT_LFN_PAD)
                         break;
                 offset++;
@@ -294 +294 @@
         size += fat_lfn_str_nlength(FAT_LFN_PART1(d), FAT_LFN_PART1_SIZE);
         size += fat_lfn_str_nlength(FAT_LFN_PART2(d), FAT_LFN_PART2_SIZE);
-        size += fat_lfn_str_nlength(FAT_LFN_PART3(d), FAT_LFN_PART3_SIZE);      
+        size += fat_lfn_str_nlength(FAT_LFN_PART3(d), FAT_LFN_PART3_SIZE);
         
         return size;
@@ -429 +429 @@
 /**
  * @}
- */ 
+ */

uspace/srv/fs/fat/fat_dentry.h

@@ -30 +30 @@
 /** @addtogroup fs
  * @{
- */ 
+ */
 
 #ifndef FAT_FAT_DENTRY_H_

uspace/srv/fs/fat/fat_directory.c

@@ -29 +29 @@
 /** @addtogroup fs
  * @{
- */ 
+ */
 
 /**
@@ -49 +49 @@
 {
         di->b = NULL;
-        di->nodep = nodep;      
+        di->nodep = nodep;
         if (di->nodep->type != FAT_DIRECTORY)
                 return EINVAL;
@@ -183 +183 @@
                                 /* We found long entry */
                                 long_entry_count--;
-                                if ((FAT_LFN_ORDER(d) == long_entry_count) && 
+                                if ((FAT_LFN_ORDER(d) == long_entry_count) &&
                                     (checksum == FAT_LFN_CHKSUM(d))) {
                                         /* Right order! */
@@ -201 +201 @@
                                         long_entry = true;
                                         long_entry_count = FAT_LFN_COUNT(d);
-                                        lfn_size = (FAT_LFN_ENTRY_SIZE * 
+                                        lfn_size = (FAT_LFN_ENTRY_SIZE *
                                             (FAT_LFN_COUNT(d) - 1)) +
                                             fat_lfn_size(d);
@@ -212 +212 @@
                         break;
                 case FAT_DENTRY_VALID:
-                        if (long_entry && 
+                        if (long_entry &&
                             (checksum == fat_dentry_chksum(d->name))) {
                                 wname[lfn_size] = '\0';
@@ -253 +253 @@
         while (!flag && fat_directory_prev(di) == EOK) {
                 if (fat_directory_get(di, &d) == EOK &&
-                    fat_classify_dentry(d) == FAT_DENTRY_LFN && 
+                    fat_classify_dentry(d) == FAT_DENTRY_LFN &&
                     checksum == FAT_LFN_CHKSUM(d)) {
                         if (FAT_IS_LFN(d))
@@ -479 +479 @@
                                 break;
                         }
-                } while (fat_directory_next(di) == EOK);        
+                } while (fat_directory_next(di) == EOK);
         } while (fat_directory_expand(di) == EOK);
 
@@ -564 +564 @@
 /**
  * @}
- */ 
+ */

uspace/srv/fs/fat/fat_fat.c

@@ -520 +520 @@
                         return rc;
                 }
-        } else 
+        } else
                 ((uint8_t *) b->data)[(offset % BPS(bs)) + 1] = byte2;
 
@@ -966 +966 @@
                  * set to one.
                  */
-                if (!FAT_IS_FAT12(bs) && 
+                if (!FAT_IS_FAT12(bs) &&
                     ((e0 >> 8) != (FAT_MASK(bs) >> 8) || e1 != FAT_MASK(bs)))
                         return ENOTSUP;

uspace/srv/fs/fat/fat_idx.c

@@ -29 +29 @@
 /** @addtogroup fs
  * @{
- */ 
+ */
 
 /**
@@ -92 +92 @@
 
         list_foreach(unused_list, link, unused_t, u) {
-                if (u->service_id == service_id) 
+                if (u->service_id == service_id)
                         return u;
         }
@@ -108 +108 @@
  * The index structures are hashed by the service_id, parent node's first
  * cluster and index within the parent directory.
- */ 
+ */
 static hash_table_t up_hash;
 
@@ -211 +211 @@
         u = unused_find(service_id, true);
         if (!u)
-                return false;   
+                return false;
 
         if (list_empty(&u->freed_list)) {
-                if (u->remaining) { 
+                if (u->remaining) {
                         /*
                          * There are no freed indices, allocate one directly
@@ -333 +333 @@
 
         fidx = (fat_idx_t *) malloc(sizeof(fat_idx_t));
-        if (!fidx) 
+        if (!fidx)
                 return ENOMEM;
         if (!fat_index_alloc(service_id, &fidx->index)) {
@@ -469 +469 @@
 errno_t fat_idx_init(void)
 {
-        if (!hash_table_create(&up_hash, 0, 0, &uph_ops)) 
+        if (!hash_table_create(&up_hash, 0, 0, &uph_ops))
                 return ENOMEM;
         if (!hash_table_create(&ui_hash, 0, 0, &uih_ops)) {
@@ -535 +535 @@
          * Remove this instance's index structure from up_hash and ui_hash.
          * Process up_hash first and ui_hash second because the index structure
-         * is actually removed in idx_remove_callback(). 
+         * is actually removed in idx_remove_callback().
          */
         fibril_mutex_lock(&used_lock);
@@ -556 +556 @@
                 free(f);
         }
-        free(u); 
+        free(u);
 }
 
 /**
  * @}
- */ 
+ */

uspace/srv/fs/fat/fat_ops.c

@@ -312 +312 @@
         d = ((fat_dentry_t *)b->data) + (idxp->pdi % DPS(bs));
         if (FAT_IS_FAT32(bs)) {
-                nodep->firstc = uint16_t_le2host(d->firstc_lo) | 
+                nodep->firstc = uint16_t_le2host(d->firstc_lo) |
                     (uint16_t_le2host(d->firstc_hi) << 16);
         } else
@@ -535 +535 @@
         if (flags & L_DIRECTORY)
                 (void) fat_free_clusters(bs, service_id, mcl);
-        return rc;              
+        return rc;
 }