[Ocfs2-tools-devel] [PATCH 1/8] odump.py: clean up useless comments

[Jeff Liu]

Signed-off-by: Jeff Liu <jeff.liu at oracle.com>
---
 ADDONS/odump.py |   31 ++-----------------------------
 1 files changed, 2 insertions(+), 29 deletions(-)

diff --git a/ADDONS/odump.py b/ADDONS/odump.py
index 69b1a24..5120a6b 100755
--- a/ADDONS/odump.py
+++ b/ADDONS/odump.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python
 
-#import pdb
 import os
 import re
 import sys
@@ -107,10 +106,7 @@ def getLVB(payload, fmtstr='<%s>'):
         lvbstr = lvbstr + 'size=' + size + ' '
 
     if payload.has_key('OVR2'):
-        #ovlist = string.split(payload['OVR2'], ', ')
         ovlist = ' '.join(string.split(payload['OVR2'], ','))
-        #for o in ovlist:
-        #    k, v = o.split('=')
         lvbstr = lvbstr + ovlist
             
     return fmtstr % lvbstr
@@ -127,7 +123,6 @@ def getEthHeader(msg, fmtstr=FRAME_FMT + TIME_FMT + IP_FMT):
     IP_REGEX = re.compile(r'Internet Protocol, Src: (\d+\.\d+\.\d+\.\d+) \(.*\),' \
                           ' Dst: (\d+\.\d+\.\d+\.\d+) \(.*\)')
 
-    # FIXME! 
     if not msg:
         return ''
 
@@ -201,8 +196,8 @@ def getOCFS2Payload(plist, func):
 
     payload = [[i,p] for i,p in enumerate(plist) if p.strip().startswith('Payload')]
 
-    # return {} if no "Payload" entry found or its value is MISSING 
-    if payload == []: # or payload[0][1].find('MISSING'):
+    # return {} if no "Payload" entry found
+    if payload == []:
         return {}
 
     # start from Payload line
@@ -211,7 +206,6 @@ def getOCFS2Payload(plist, func):
         plist = plist[i:]
         for pl in plist:
             vlist = pl.split(':')
-            #assert len(vlist) > 0, "incorrect payload entry"
             if len(vlist) > 0:
                 pdict[vlist[0].strip()] =  vlist[1:]
     except KeyError, ValueError:
@@ -296,25 +290,21 @@ def ConvertLockMsg(odict,   \
     else:
         cookie = ' '
 
-    #Node Index: 1
     if odict.has_key('Node Index'):
         nodeidx = odict['Node Index'][0].strip()
     else:
         nodeidx = ' '
 
-    #Flags: 0x00000400: 0000 0000 0000 0000 0000 0100 0000 0000 = convert
     if odict.has_key('Flags'):
         flags = odict['Flags'][0].strip()
     else:
         flags = ' '
 
-    #Requested Type: EX: Exclusive (5)
     if odict.has_key('Requested Type'):
         reqtype = odict['Requested Type'][0].strip()
     else:
         reqtype = ' '
 
-    #Name: M0000000000000000000005de982fa4
     if odict.has_key('Name'):
         name = odict['Name'][0].strip()
     else:
@@ -398,7 +388,6 @@ def ProxyASTMsg(odict, dumplvb, fmtstr=COOKIE_FMT + FLAGS_FMT + NODEIDX_FMT + BL
     else:
         cookie = ' '
 
-    #Flags: 0x40000000: 0100 0000 0000 0000 0000 0000 0000 0000 = get_lvb
     if odict.has_key('Flags'):
         flags = odict['Flags'][0].strip()
     else:
@@ -409,14 +398,11 @@ def ProxyASTMsg(odict, dumplvb, fmtstr=COOKIE_FMT + FLAGS_FMT + NODEIDX_FMT + BL
     else:
         nodeidx = ' '
     
-    #Type: Proxy AST (505)
-    #Blocked Locktype: NL: No lock (0)
     if odict.has_key('Blocked Locktype'):
         blktype = odict['Blocked Locktype'][0].strip()
     else:
         blktype = ' '
 
-    #Name: M0000000000000000000005de982fa4
     if odict.has_key('Name'):
         name = odict['Name'][0].strip()
     else:
@@ -445,8 +431,6 @@ def QueryJoinRequestMsg(odict, fmtstr=NODEIDX_FMT):
 def ExitDomainMsg(odict, fmtstr=NODEIDX_FMT):
     ''' returns node_idx '''
  
-    # Type: Exit Domain (513)
-
     if odict.has_key('Node Index'):
         nodeidx = odict['Node Index'][0].strip()
     else:
@@ -526,7 +510,6 @@ def AssertJoinMsg(odict, fmtstr=NODEIDX_FMT + DOMAIN_FMT):
     else:
         nodeidx = ' '
 
-    # FIXME, domain line format?
     if odict.has_key('Domain Name'):
         domain = odict['Domain Name'][0].strip()
     else:
@@ -544,7 +527,6 @@ def CancelJoinMsg(odict, fmtstr=NODEIDX_FMT + DOMAIN_FMT):
     else:
         nodeidx = ' '
 
-    # FIXME, domain line format?
     if odict.has_key('Domain Name'):
         domain = odict['Domain Name'][0].strip()
     else:
@@ -686,7 +668,6 @@ def main(srcfile, dstfile, o2type, dumplvb, verbose):
             packets.append(line)
             continue
 
-        #print packets
         i = 0
         is_valid = 0
         for p in packets:
@@ -737,15 +718,7 @@ def main(srcfile, dstfile, o2type, dumplvb, verbose):
         o2msgstr = ''
         try:
 	    if func in LVBFUNC:
-            #    o2msgstr = eval(funcstr, ocfs2payload, dumplvb)
-            #    print 'dump lvb func: %s\n' % globals()[func]
-            #    print 'dumplvb is %s\n' % dumplvb
-            #    call_func = globals()[func]
-            #    if 'ProxyASTMsg' in globals():
-            #        print 'Yeah\n'
 	        o2msgstr = globals()[func](ocfs2payload, dumplvb)
-	    #    o2msgstr = call_func(ocfs2payload, dumplvb)
-            #    print 'O2msgstr: %s\n' % o2msgstr
             else:
 	        o2msgstr = globals()[func](ocfs2payload)
         except KeyError: # DLM message do not support encountered
-- 
1.5.4.3