Changeset 1b20da0 in mainline for tools

Timestamp:

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

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:

tools

Files:

• autogen.py (modified) (4 diffs)
• check.sh (modified) (2 diffs)
• config.py (modified) (3 diffs)
• mkext2.py (modified) (5 diffs)
• mktmpfs.py (modified) (1 diff)
• travis.sh (modified) (1 diff)
• xstruct.py (modified) (3 diffs)

tools/autogen.py

@@ -1 +1 @@
 #!/usr/bin/env python
 #
-# Copyright (c) 2014 Jakub Jermar 
+# Copyright (c) 2014 Jakub Jermar
 # All rights reserved.
 #
@@ -29 +29 @@
 
 import sys
-import yaml 
+import yaml
 import re
 
@@ -67 +67 @@
                 if 'elements' in member.keys():
                         code = code + "\t%s %s[%d];\n" % (member['type'], member['name'], member['elements'])
-                else: 
+                else:
                         code = code + "\t%s %s;\n" % (member['type'], member['name'])
         code = code + "} %s%s_t;" % (packed, struct['name'])
@@ -124 +124 @@
 def generate(struct, lines):
         code = """
-/***************************************************************************** 
+/*****************************************************************************
  * AUTO-GENERATED FILE, DO NOT EDIT!!!
  * Generated by: tools/autogen.py

tools/check.sh

@@ -2 +2 @@
 
 #
-# Copyright (c) 2010 Jakub Jermar 
+# Copyright (c) 2010 Jakub Jermar
 # All rights reserved.
 #
@@ -54 +54 @@
                 if [ `echo $H | grep "^$D\/.*"`x != "x"  ];
                 then
-                        continue 2 
+                        continue 2
                 fi
         done

tools/config.py

@@ -270 +270 @@
 # @param rules  Rules
 # @param start_index With which rule to start (initial call must specify 0 here).
-# @return True if able to find a valid configuration 
+# @return True if able to find a valid configuration
 def random_choices(config, rules, start_index):
         "Fill the configuration with random (but valid) values."
@@ -278 +278 @@
         varname, vartype, name, choices, cond = rules[start_index]
 
-        # First check that this rule would make sense   
+        # First check that this rule would make sense
         if cond:
                 if not check_condition(cond, config, rules):
@@ -654 +654 @@
                 create_output(MAKEFILE, MACROS, config, rules)
                 
-                return 0        
+                return 0
         
         screen = xtui.screen_init()

tools/mkext2.py

@@ -127 +127 @@
 """
 
-class Filesystem:       
+class Filesystem:
         def __init__(self, filename, block_groups, blocks_per_group, inodes_per_group, block_size, inode_size, reserved_inode_count):
                 "Initialize the filesystem writer"
@@ -215 +215 @@
                 gde.free_inode_count -= 1
                 if directory:
-                        gde.directory_inode_count += 1          
+                        gde.directory_inode_count += 1
         
         def seek_to_block(self, block, offset=0):
@@ -234 +234 @@
                 offset = (index % self.inodes_per_group) * self.inode_size
                 block = base_block + (offset // self.block_size)
-                self.seek_to_block(block, offset % self.block_size)     
+                self.seek_to_block(block, offset % self.block_size)
         
         def subtree_add(self, inode, parent_inode, dirpath, is_root=False):
                 "Recursively add files to the filesystem"
                 
-                dir_writer = DirWriter(inode)   
+                dir_writer = DirWriter(inode)
                 dir_writer.add(inode.as_dirent('.'))
                 dir_writer.add(parent_inode.as_dirent('..'))
@@ -454 +454 @@
         
                 # Navigate through other levels
-                while level > 0:                
+                while level > 0:
                         assert offset_in_block < self.fs.block_ids_per_block
                         
@@ -490 +490 @@
                 "Write a piece of data (arbitrarily long) as the contents of the inode"
                 
-                data_pos = 0            
+                data_pos = 0
                 while data_pos < len(data):
                         bytes_remaining_in_block = self.fs.block_size - (self.pos % self.fs.block_size)

tools/mktmpfs.py

@@ -70 +70 @@
         "Recursive directory walk"
         
-        for item in listdir_items(root):                
-                if item.is_file:                        
+        for item in listdir_items(root):
+                if item.is_file:
                         dentry = xstruct.create(DENTRY_FILE % len(item.name))
                         dentry.kind = TMPFS_FILE

tools/travis.sh

@@ -186 +186 @@
             "$HOME/helenos-harbours/hsct.sh" update || exit 1
 
-            FAILED_HARBOURS=""    
+            FAILED_HARBOURS=""
             for HARBOUR in $H_HARBOUR_LIST; do
                 "$HOME/helenos-harbours/hsct.sh" archive --no-deps "$HARBOUR" >"run-$HARBOUR.log" 2>&1

tools/xstruct.py

@@ -39 +39 @@
 
 # Ensure that 's' format for struct receives correct data type depending
-# on Python version (needed due to different way to encode into bytes) 
+# on Python version (needed due to different way to encode into bytes)
 ensure_string = \
         (lambda value: value if type(value) is str else bytes(value)) \
@@ -66 +66 @@
                                  (varname, str(type(value)), str(vartype)))
         if value < varmin or value > varmax:
-                raise ValueError('Variable "%s" value %s out of range %s..%s' % 
+                raise ValueError('Variable "%s" value %s out of range %s..%s' %
                                  (varname, repr(value), repr(varmin), repr(varmax)))
 
@@ -88 +88 @@
                                         value = ensure_string(value)
                                 check_range(variable, fmt, value)
-                                args.append(value)              
+                                args.append(value)
                 return struct.pack(self._format_, *args)