diff options
Diffstat (limited to 'cpukit/libdl/rtl-obj-comp.c')
-rw-r--r-- | cpukit/libdl/rtl-obj-comp.c | 40 |
1 files changed, 30 insertions, 10 deletions
diff --git a/cpukit/libdl/rtl-obj-comp.c b/cpukit/libdl/rtl-obj-comp.c index 4608a41bf4..001d416e80 100644 --- a/cpukit/libdl/rtl-obj-comp.c +++ b/cpukit/libdl/rtl-obj-comp.c @@ -1,10 +1,5 @@ -/* - * COPYRIGHT (c) 2012, 2018 Chris Johns <chrisj@rtems.org> - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rtems.org/license/LICENSE. - */ +/* SPDX-License-Identifier: BSD-2-Clause */ + /** * @file * @@ -14,6 +9,31 @@ * stream of data. */ +/* + * COPYRIGHT (c) 2012, 2018 Chris Johns <chrisj@rtems.org> + * + * 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 OWNER 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. + */ + #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -95,7 +115,7 @@ rtems_rtl_obj_comp_read (rtems_rtl_obj_comp* comp, } if (rtems_rtl_trace (RTEMS_RTL_TRACE_COMP)) - printf ("rtl: comp: %2d: fd=%d length=%zu level=%u offset=%" PRIdoff_t " area=[%" + printf ("rtl: comp: %2d: fd=%d length=%zu level=%zu offset=%" PRIdoff_t " area=[%" PRIdoff_t ",%" PRIdoff_t "] read=%" PRIu32 " size=%zu\n", comp->fd, comp->cache->fd, length, comp->level, comp->offset, comp->offset, comp->offset + length, @@ -123,7 +143,7 @@ rtems_rtl_obj_comp_read (rtems_rtl_obj_comp* comp, if ((comp->level - buffer_level) != 0) { if (rtems_rtl_trace (RTEMS_RTL_TRACE_COMP)) - printf ("rtl: comp: copy-down: level=%u length=%zu\n", + printf ("rtl: comp: copy-down: level=%zu length=%zu\n", comp->level, comp->level - buffer_level); memmove (comp->buffer, @@ -201,7 +221,7 @@ rtems_rtl_obj_comp_read (rtems_rtl_obj_comp* comp, if (rtems_rtl_trace (RTEMS_RTL_TRACE_COMP)) printf ("rtl: comp: expand: offset=%" PRIdoff_t \ - " level=%u read=%" PRIu32 "\n", + " level=%zu read=%" PRIu32 "\n", comp->offset, comp->level, comp->read); } } |