From 8dc63b5232f71f4bf34693f55a2a4ab095da9976 Mon Sep 17 00:00:00 2001 From: Domen Vrankar Date: Wed, 27 Aug 2014 23:04:55 +0200 Subject: [PATCH] -(add) added missing license header -(fix) writer was calling archive_read_free instead of archive_write_free --- archive_writer.cpp | 2 +- archive_writer_entry.cpp | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/archive_writer.cpp b/archive_writer.cpp index d343024..49b4710 100644 --- a/archive_writer.cpp +++ b/archive_writer.cpp @@ -36,7 +36,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. namespace ns_archive { writer::writer(std::ostream& stream) : - _archive( archive_write_new(), [](archive* archive){ archive_read_free(archive); } ), // errors in destructor will be silently ignored + _archive( archive_write_new(), [](archive* archive){ archive_write_free(archive); } ), // errors in destructor will be silently ignored _writer_container( stream ) { // diff --git a/archive_writer_entry.cpp b/archive_writer_entry.cpp index 74195e2..13916c4 100644 --- a/archive_writer_entry.cpp +++ b/archive_writer_entry.cpp @@ -1,3 +1,31 @@ +/* +BSD 2-Clause license + +Copyright (c) 2014, Domen Vrankar +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + #include "archive_writer_entry.hpp" namespace ns_archive {