X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=lib%2Fdiskimage_mbr.ml;h=25da9c4645947c13243a1a99d89222aeb57bdf30;hb=c4c7f4c73a94788e8fe193153046e3ca2b6adfcf;hp=6839380c22db3d1939c5759dbc199fbd0a0c3b1b;hpb=a2eceb20d16bb7f9e3c7cea1d5d2525ab5d018e6;p=virt-df.git diff --git a/lib/diskimage_mbr.ml b/lib/diskimage_mbr.ml index 6839380..25da9c4 100644 --- a/lib/diskimage_mbr.ml +++ b/lib/diskimage_mbr.ml @@ -3,19 +3,20 @@ (C) Copyright 2007 Richard W.M. Jones, Red Hat Inc. http://libvirt.org/ - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version, + with the OCaml linking exception described in ../COPYING.LIB. - This program is distributed in the hope that it will be useful, + This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Support for Master Boot Record partition scheme. *) @@ -185,14 +186,14 @@ and probe_extended_partition max dev start = * to the current sector. *) let ppriv = - { ppriv with mbr_part_start = ppriv.mbr_part_start + start } in + { ppriv with mbr_part_start = ppriv.mbr_part_start +^ start } in let (next, npriv) = parse_mbr_entry next in if next.part_status = NullEntry then [ part, ppriv ] (* End of list. *) else ( - let start_of_next = start + npriv.mbr_part_start in + let start_of_next = start +^ npriv.mbr_part_start in (part, ppriv) :: probe_extended_partition (max-1) dev start_of_next )