diff options
Diffstat (limited to 'src/utilities/archiveReader.vala')
| -rw-r--r-- | src/utilities/archiveReader.vala | 43 |
1 files changed, 29 insertions, 14 deletions
diff --git a/src/utilities/archiveReader.vala b/src/utilities/archiveReader.vala index df248cf..0200c8a 100644 --- a/src/utilities/archiveReader.vala +++ b/src/utilities/archiveReader.vala @@ -1,18 +1,24 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright (c) 2011-2017 by Simon Schneegans +// Copyright 2011-2018 Simon Schneegans // -// 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 3 of the License, or (at -// your option) any later version. -// -// This program 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. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ///////////////////////////////////////////////////////////////////////// namespace GnomePie { @@ -84,9 +90,14 @@ public class ArchiveReader : GLib.Object { if (entry.size() > 0) { while (true) { size_t offset, size; - void *buff; +#if VALA_0_42 + uint8[] buff; + r = this.archive.read_data_block(out buff, out offset); +#else + void* buff; r = this.archive.read_data_block(out buff, out size, out offset); +#endif if (r == Archive.Result.EOF) { break; } @@ -96,7 +107,11 @@ public class ArchiveReader : GLib.Object { return false; } +#if VALA_0_42 + this.writer.write_data_block(buff, offset); +#else this.writer.write_data_block(buff, size, offset); +#endif } } |