Changeset a35b458 in mainline for tools/imgutil.py

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:

• tools/imgutil.py (modified) (3 diffs)

tools/imgutil.py

@@ -40 +40 @@
 def align_up(size, alignment):
         "Return size aligned up to alignment"
-        
+
         if (size % alignment == 0):
                 return size
-        
+
         return ((size // alignment) + 1) * alignment
 
 def count_up(size, alignment):
         "Return units necessary to fit the size"
-        
+
         if (size % alignment == 0):
                 return (size // alignment)
-        
+
         return ((size // alignment) + 1)
 
 def num_of_trailing_bin_zeros(num):
         "Return number of trailing zeros in binary representation"
-        
+
         i = 0
         if (num == 0): raise ValueError()
@@ -66 +66 @@
 def get_bit(number, n):
         "Return True if n-th least-significant bit is set in the given number"
-        
+
         return bool((number >> n) & 1)
 
 def set_bit(number, n):
         "Return the number with n-th least-significant bit set"
-        
+
         return number | (1 << n)
 
 class ItemToPack:
         "Stores information about one directory item to be added to the image"
-        
+
         def __init__(self, parent, name):
                 self.parent = parent
@@ -88 +88 @@
 def listdir_items(path):
         "Return a list of items to be packed inside a fs image"
-        
+
         for name in os.listdir(path):
                 if name in exclude_names:
                         continue
-                
+
                 item = ItemToPack(path, name)
-                
+
                 if not (item.is_dir or item.is_file):
                         continue
-                
+
                 yield item
 
 def chunks(item, chunk_size):
         "Iterate contents of a file in chunks of a given size"
-        
+
         inf = open(item.path, 'rb')
         rd = 0
-        
+
         while (rd < item.size):
                 data = bytes(inf.read(chunk_size))
                 yield data
                 rd += len(data)
-        
+
         inf.close()