Adds '#'s to the beginning of each output line when running with -d

tools/linux/dump-static-initializers.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Dump functions called by static intializers in a Linux Release binary.
 
 Usage example:
   tools/linux/dump-static-intializers.py out/Release/chrome
 
@@ skipping 129 matching lines @@
         continue
       refs.add(ref)
 
   return sorted(refs)
 
 def main():
   parser = optparse.OptionParser(usage='%prog [option] filename')
   parser.add_option('-d', '--diffable', dest='diffable',
                     action='store_true', default=False,
                     help='Prints the filename on each line, for more easily '
-                         'diff-able output.')
+                         'diff-able output. (Used by sizes.py)')
   opts, args = parser.parse_args()
   if len(args) != 1:
     parser.error('missing filename argument')
     return 1
   binary = args[0]
 
   demangler = Demangler()
   file_count = 0
   initializer_count = 0
 
@@ skipping 15 matching lines @@
 
       ref = demangler.Demangle(ref)
       if qualified_filename == filename:
         qualified_filename = QualifyFilename(filename, ref)
       if ref in NOTES:
         ref_output.append('  %s [%s]' % (ref, NOTES[ref]))
       else:
         ref_output.append('  ' + ref)
 
     if opts.diffable:
-      print '\n'.join(qualified_filename + r for r in ref_output)
+      print '\n'.join('# ' + qualified_filename + r for r in ref_output)
     else:
       print '%s (initializer offset 0x%x size 0x%x)' % (qualified_filename,
                                                         addr, size)
       print '\n'.join(ref_output) + '\n'
 

[Nico, 2012/02/07 05:53:19]

Just

  if opts.diffable:
    print '#',
  print 'Found %d...'

is a bit simpler

-  print 'Found %d static initializers in %d files.' % (initializer_count,
-                                                       file_count)
+  last_line = 'Found %d static initializers in %d files.' % (initializer_count,
+                                                             file_count)
+  if opts.diffable:
+    print '# ' + last_line
+  else:
+    print last_line
 
   return 0
 
 if '__main__' == __name__:
   sys.exit(main())