Tims patch to fix test 122: the __arch_pack stuff is confusing it - as was the case...

with the "attribute packed" stuff for the efi/efd items etc..
It is confusing the parsing which works out the type names.
Merge of master-melb:xfs-cmds:31658a by kenmcd.

diff --git a/122 b/122
index f193ae49a4e2dc56bf6db3bac1a331c999cc6437..6cb238d4a1f9faffbc854453c8607199513173e4 100755 (executable)
--- a/122
+++ b/122
@@ -43,6 +43,12 @@ s/sizeof\( xfs_agf_t \) = 64/sizeof( xfs_agf_t ) = <SIZE>/;
        fi
 }
 
+_attribute_filter()
+{
+       sed -e 's/__attribute__ *[(][(]packed[)][)]//' \
+           -e 's/__arch_pack//'
+}
+
 cprog=$tmp.get_structs.c
 oprog=$tmp.get_structs
 progout=$tmp.output
@@ -137,7 +143,7 @@ echo 'int main(int argc, char *argv[]) {' >>$cprog
 # Printfs of typedef sizes
 #
 cat /usr/include/xfs/xfs*.h | indent |\
-sed -e 's/__attribute__ *[(][(]packed[)][)]//' |\
+_attribute_filter |\
 tee $seq.full |\
 egrep '} *xfs_.*_t' |\
 egrep -v -f $tmp.ignore |\