Sorting out the datatype mess

Mon Sep 26 09:10:01 PDT 2005

On Mon, 2005-09-26 at 10:35 -0400, David Zeuthen wrote:
> On Mon, 2005-09-26 at 15:33 +0100, Richard Hughes wrote:
> > If you are busy David, do you want me to commit this?
> 
> Yup, go for it. Thanks a lot.

Martin,

The patch has *lots* of rejects:

Could you resync against the current CVS please? I can go through
manually if you like - but I'm not sure what rejects are good and which
are bad...

Thanks, 

Richard.

[hughsie at localhost hal-fresh-checkout]$ patch -p1
< /home/hughsie/Desktop/hal-datatypes.patch patching file configure
Hunk #1 succeeded at 1201 (offset 2 lines).
Hunk #3 succeeded at 2724 (offset 2 lines).
Hunk #5 succeeded at 2894 (offset 2 lines).
Hunk #7 succeeded at 2983 (offset 2 lines).
Hunk #9 succeeded at 3224 (offset 2 lines).
Hunk #11 succeeded at 3681 (offset 2 lines).
Hunk #13 succeeded at 3851 (offset 2 lines).
Hunk #15 succeeded at 3940 (offset 2 lines).
Hunk #17 succeeded at 4513 (offset 2 lines).
Hunk #19 succeeded at 4683 (offset 2 lines).
Hunk #21 succeeded at 4772 (offset 2 lines).
Hunk #23 FAILED at 5926.
Hunk #24 succeeded at 6048 (offset 2 lines).
Hunk #26 succeeded at 6194 (offset 2 lines).
Hunk #28 succeeded at 6512 (offset 2 lines).
Hunk #30 succeeded at 6627 (offset 2 lines).
Hunk #31 FAILED at 7099.
Hunk #33 succeeded at 7194 (offset 2 lines).
Hunk #34 FAILED at 8195.
Hunk #35 FAILED at 8457.
Hunk #36 FAILED at 8519.
Hunk #38 succeeded at 9007 (offset 2 lines).
Hunk #39 FAILED at 9903.
Hunk #40 succeeded at 10244 (offset 8 lines).
Hunk #41 succeeded at 10341 (offset 2 lines).
Hunk #42 succeeded at 10412 (offset 8 lines).
Hunk #43 succeeded at 10499 (offset 2 lines).
Hunk #44 succeeded at 10570 (offset 8 lines).
Hunk #45 succeeded at 10630 (offset 2 lines).
Hunk #46 succeeded at 10702 (offset 8 lines).
Hunk #47 FAILED at 10777.
Hunk #48 FAILED at 10875.
Hunk #49 succeeded at 11938 (offset 2 lines).
Hunk #50 succeeded at 12005 (offset 8 lines).
Hunk #51 FAILED at 13121.
Hunk #52 FAILED at 13183.
Hunk #53 FAILED at 13698.
Hunk #54 succeeded at 14042 (offset 17 lines).
Hunk #55 succeeded at 14136 (offset 8 lines).
Hunk #56 succeeded at 14210 (offset 17 lines).
Hunk #57 succeeded at 14294 (offset 8 lines).
Hunk #58 succeeded at 14368 (offset 17 lines).
Hunk #59 succeeded at 14425 (offset 8 lines).
Hunk #60 succeeded at 14500 (offset 17 lines).
Hunk #61 FAILED at 14575.
Hunk #62 FAILED at 14673.
Hunk #63 FAILED at 15558.
Hunk #64 FAILED at 15620.
Hunk #65 succeeded at 16029 (offset 8 lines).
Hunk #66 succeeded at 16088 (offset 17 lines).
Hunk #67 FAILED at 16984.
Hunk #68 FAILED at 17761.
Hunk #69 FAILED at 18023.
Hunk #70 FAILED at 18085.
Hunk #71 succeeded at 18512 (offset 16 lines).
Hunk #72 succeeded at 18573 (offset 17 lines).
Hunk #73 FAILED at 19469.
Hunk #74 succeeded at 19811 (offset 24 lines).
Hunk #75 succeeded at 19907 (offset 17 lines).
Hunk #76 succeeded at 19979 (offset 24 lines).
Hunk #77 succeeded at 20065 (offset 17 lines).
Hunk #78 succeeded at 20137 (offset 24 lines).
Hunk #79 succeeded at 20196 (offset 17 lines).
Hunk #80 succeeded at 20269 (offset 24 lines).
Hunk #81 FAILED at 20344.
Hunk #82 FAILED at 20442.
Hunk #83 succeeded at 21708 (offset 17 lines).
Hunk #84 succeeded at 21744 (offset 24 lines).
Hunk #85 succeeded at 21807 (offset 17 lines).
Hunk #86 succeeded at 21866 (offset 24 lines).
Hunk #87 succeeded at 21930 (offset 17 lines).
Hunk #88 succeeded at 21989 (offset 24 lines).
Hunk #89 succeeded at 22051 (offset 17 lines).
Hunk #90 succeeded at 22277 (offset 127 lines).
Hunk #91 succeeded at 22351 (offset 17 lines).
Hunk #92 succeeded at 22619 (offset 127 lines).
Hunk #93 succeeded at 22990 (offset 81 lines).
Hunk #94 succeeded at 23189 (offset 127 lines).
Hunk #95 succeeded at 23493 (offset 81 lines).
misordered hunks! output would be garbled
Hunk #96 FAILED at 23538.
Hunk #97 succeeded at 24085 (offset 149 lines).
Hunk #98 succeeded at 24430 (offset 32 lines).
misordered hunks! output would be garbled
Hunk #99 FAILED at 24546.
Hunk #100 succeeded at 24720 (offset 106 lines).
Hunk #101 succeeded at 24688 (offset -70 lines).
misordered hunks! output would be garbled
Hunk #102 FAILED at 24863.
Hunk #103 succeeded at 24890 (offset -23 lines).
Hunk #104 succeeded at 25018 (offset 26 lines).
Hunk #105 succeeded at 25066 (offset 10 lines).
Hunk #106 succeeded at 25161 (offset 41 lines).
Hunk #107 succeeded at 25194 (offset -3 lines).
Hunk #108 succeeded at 25302 (offset 41 lines).
Hunk #109 succeeded at 25399 (offset 22 lines).
Hunk #110 succeeded at 25534 (offset -10 lines).
Hunk #111 succeeded at 25733 (offset 56 lines).
Hunk #112 succeeded at 25800 (offset 38 lines).
Hunk #113 succeeded at 27225 (offset 171 lines).
Hunk #114 succeeded at 27130 (offset 38 lines).
25 out of 114 hunks FAILED -- saving rejects to file configure.rej
patching file configure.in
Reversed (or previously applied) patch detected!  Assume -R? [n] n
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file configure.in.rej
patching file drive_id/drive_id.c
Hunk #1 succeeded at 111 with fuzz 2.
patching file volume_id/cramfs.c
Hunk #1 FAILED at 39.
1 out of 1 hunk FAILED -- saving rejects to file volume_id/cramfs.c.rej
patching file volume_id/cramfs.h
can't find file to patch at input line 1357
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -ruN hal-0.5.3-old/volume_id/dasd.c hal-0.5.3/volume_id/dasd.c
|--- hal-0.5.3-old/volume_id/dasd.c     2005-06-27 16:44:56.000000000
+0200
|+++ hal-0.5.3/volume_id/dasd.c 2005-08-11 22:36:24.000000000 +0200
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
1 out of 1 hunk ignored
patching file volume_id/ext.c
Reversed (or previously applied) patch detected!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file volume_id/ext.c.rej
patching file volume_id/ext.h
Reversed (or previously applied) patch detected!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file volume_id/ext.h.rej
patching file volume_id/fat.c
Hunk #1 FAILED at 47.
Hunk #2 FAILED at 136.
Hunk #3 FAILED at 293.
Hunk #4 FAILED at 317.
4 out of 4 hunks FAILED -- saving rejects to file volume_id/fat.c.rej
patching file volume_id/fat.h
Reversed (or previously applied) patch detected!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file volume_id/fat.h.rej
patching file volume_id/hfs.c
Hunk #1 FAILED at 39.
Hunk #2 FAILED at 149.
Hunk #3 FAILED at 160.
Hunk #4 FAILED at 170.
4 out of 4 hunks FAILED -- saving rejects to file volume_id/hfs.c.rej
patching file volume_id/hfs.h
Reversed (or previously applied) patch detected!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file volume_id/hfs.h.rej
patching file volume_id/highpoint.c
Hunk #1 FAILED at 39.
Hunk #2 FAILED at 55.
Hunk #3 FAILED at 78.
3 out of 3 hunks FAILED -- saving rejects to file
volume_id/highpoint.c.rej
patching file volume_id/highpoint.h
Reversed (or previously applied) patch detected!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file
volume_id/highpoint.h.rej
patching file volume_id/hpfs.c
Hunk #1 FAILED at 40.
1 out of 1 hunk FAILED -- saving rejects to file volume_id/hpfs.c.rej
patching file volume_id/hpfs.h
Reversed (or previously applied) patch detected!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file volume_id/hpfs.h.rej
patching file volume_id/iso9660.c
Hunk #1 FAILED at 47.
1 out of 1 hunk FAILED -- saving rejects to file volume_id/iso9660.c.rej
patching file volume_id/iso9660.h
Reversed (or previously applied) patch detected!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file
volume_id/iso9660.h.rej
patching file volume_id/isw_raid.c
Hunk #1 FAILED at 39.
1 out of 1 hunk FAILED -- saving rejects to file
volume_id/isw_raid.c.rej
patching file volume_id/isw_raid.h
Reversed (or previously applied) patch detected!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file
volume_id/isw_raid.h.rej
patching file volume_id/jfs.c
Hunk #1 FAILED at 39.
1 out of 1 hunk FAILED -- saving rejects to file volume_id/jfs.c.rej
patching file volume_id/jfs.h
Reversed (or previously applied) patch detected!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file volume_id/jfs.h.rej
patching file volume_id/linux_raid.c
Reversed (or previously applied) patch detected!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file
volume_id/linux_raid.c.rej
patching file volume_id/linux_raid.h
Reversed (or previously applied) patch detected!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file
volume_id/linux_raid.h.rej
patching file volume_id/linux_swap.c
Hunk #1 FAILED at 39.
1 out of 1 hunk FAILED -- saving rejects to file
volume_id/linux_swap.c.rej
patching file volume_id/linux_swap.h
Reversed (or previously applied) patch detected!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file
volume_id/linux_swap.h.rej
patching file volume_id/lsi_raid.c
Hunk #1 FAILED at 39.
1 out of 1 hunk FAILED -- saving rejects to file
volume_id/lsi_raid.c.rej
patching file volume_id/lsi_raid.h
Reversed (or previously applied) patch detected!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file
volume_id/lsi_raid.h.rej
patching file volume_id/luks.c
Hunk #1 FAILED at 48.
1 out of 1 hunk FAILED -- saving rejects to file volume_id/luks.c.rej
patching file volume_id/luks.h
Reversed (or previously applied) patch detected!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file volume_id/luks.h.rej
patching file volume_id/lvm.c
Hunk #1 FAILED at 39.
Hunk #2 FAILED at 78.
2 out of 2 hunks FAILED -- saving rejects to file volume_id/lvm.c.rej
patching file volume_id/lvm.h
Reversed (or previously applied) patch detected!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file volume_id/lvm.h.rej
patching file volume_id/mac.c
Hunk #1 FAILED at 39.
Hunk #2 FAILED at 107.
2 out of 2 hunks FAILED -- saving rejects to file volume_id/mac.c.rej
patching file volume_id/mac.h
Reversed (or previously applied) patch detected!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file volume_id/mac.h.rej
patching file volume_id/minix.c
Reversed (or previously applied) patch detected!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file volume_id/minix.c.rej
patching file volume_id/minix.h
Reversed (or previously applied) patch detected!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file volume_id/minix.h.rej
patching file volume_id/msdos.c
Hunk #1 FAILED at 39.
Hunk #2 FAILED at 66.
Hunk #3 FAILED at 112.
Hunk #4 FAILED at 166.
4 out of 4 hunks FAILED -- saving rejects to file volume_id/msdos.c.rej
patching file volume_id/msdos.h
Hunk #1 FAILED at 21.
1 out of 1 hunk FAILED -- saving rejects to file volume_id/msdos.h.rej
patching file volume_id/ntfs.c
Hunk #1 FAILED at 39.
Hunk #2 FAILED at 102.
Hunk #3 FAILED at 182.
Hunk #4 FAILED at 192.
4 out of 4 hunks FAILED -- saving rejects to file volume_id/ntfs.c.rej
patching file volume_id/ntfs.h
Reversed (or previously applied) patch detected!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file volume_id/ntfs.h.rej
patching file volume_id/nvidia_raid.c
Hunk #1 FAILED at 39.
1 out of 1 hunk FAILED -- saving rejects to file
volume_id/nvidia_raid.c.rej
patching file volume_id/nvidia_raid.h
Reversed (or previously applied) patch detected!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file
volume_id/nvidia_raid.h.rej
patching file volume_id/promise_raid.c
Reversed (or previously applied) patch detected!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
2 out of 2 hunks ignored -- saving rejects to file
volume_id/promise_raid.c.rej
patching file volume_id/promise_raid.h
Reversed (or previously applied) patch detected!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file
volume_id/promise_raid.h.rej
patching file volume_id/reiserfs.c
Hunk #1 FAILED at 40.
1 out of 1 hunk FAILED -- saving rejects to file
volume_id/reiserfs.c.rej
patching file volume_id/reiserfs.h
Reversed (or previously applied) patch detected!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file
volume_id/reiserfs.h.rej
patching file volume_id/romfs.c
Reversed (or previously applied) patch detected!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file volume_id/romfs.c.rej
patching file volume_id/romfs.h
Reversed (or previously applied) patch detected!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file volume_id/romfs.h.rej
patching file volume_id/silicon_raid.c
Hunk #1 FAILED at 39.
1 out of 1 hunk FAILED -- saving rejects to file
volume_id/silicon_raid.c.rej
patching file volume_id/silicon_raid.h
Reversed (or previously applied) patch detected!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file
volume_id/silicon_raid.h.rej
patching file volume_id/sysv.c
Hunk #1 FAILED at 43.
Hunk #2 FAILED at 101.
2 out of 2 hunks FAILED -- saving rejects to file volume_id/sysv.c.rej
patching file volume_id/sysv.h
Reversed (or previously applied) patch detected!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file volume_id/sysv.h.rej
patching file volume_id/udf.c
Hunk #1 FAILED at 40.
1 out of 1 hunk FAILED -- saving rejects to file volume_id/udf.c.rej
patching file volume_id/udf.h
Reversed (or previously applied) patch detected!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file volume_id/udf.h.rej
patching file volume_id/ufs.c
Hunk #1 FAILED at 39.
Hunk #2 FAILED at 180.
2 out of 2 hunks FAILED -- saving rejects to file volume_id/ufs.c.rej
patching file volume_id/ufs.h
Reversed (or previously applied) patch detected!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file volume_id/ufs.h.rej
patching file volume_id/util.c
Hunk #1 FAILED at 39.
Hunk #2 FAILED at 56.
Hunk #3 FAILED at 108.
Hunk #4 FAILED at 129.
Hunk #5 FAILED at 195.
5 out of 5 hunks FAILED -- saving rejects to file volume_id/util.c.rej
patching file volume_id/util.h
Hunk #1 FAILED at 37.
Hunk #2 FAILED at 85.
2 out of 2 hunks FAILED -- saving rejects to file volume_id/util.h.rej
patching file volume_id/via_raid.c
Hunk #1 FAILED at 39.
1 out of 1 hunk FAILED -- saving rejects to file
volume_id/via_raid.c.rej
patching file volume_id/via_raid.h
Reversed (or previously applied) patch detected!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file
volume_id/via_raid.h.rej
patching file volume_id/volume_id.c
Hunk #1 FAILED at 219.
1 out of 1 hunk FAILED -- saving rejects to file
volume_id/volume_id.c.rej
patching file volume_id/xfs.c
Reversed (or previously applied) patch detected!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file volume_id/xfs.c.rej
patching file volume_id/xfs.h
Reversed (or previously applied) patch detected!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file volume_id/xfs.h.rej