diff options
Diffstat (limited to 'cpukit/libblock/src/media.c')
| -rw-r--r-- | cpukit/libblock/src/media.c | 37 |
1 files changed, 25 insertions, 12 deletions
diff --git a/cpukit/libblock/src/media.c b/cpukit/libblock/src/media.c index c176e12243..cc6bb70f91 100644 --- a/cpukit/libblock/src/media.c +++ b/cpukit/libblock/src/media.c @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: BSD-2-Clause */ + /** * @file * @@ -7,17 +9,28 @@ */ /* - * Copyright (c) 2009-2013 embedded brains GmbH. All rights reserved. + * Copyright (C) 2009, 2013 embedded brains GmbH & Co. KG * - * embedded brains GmbH - * Dornierstr. 4 - * 82178 Puchheim - * Germany - * <rtems@embedded-brains.de> + * 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. * - * 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. + * 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. */ #include <stdlib.h> @@ -181,7 +194,7 @@ static void error( const char *dest ) { - notify(RTEMS_MEDIA_EVENT_ERROR, state, src, dest); + (void) notify(RTEMS_MEDIA_EVENT_ERROR, state, src, dest); } static media_item *get_media_item( @@ -421,7 +434,7 @@ static rtems_status_code process_event( { rtems_status_code sc = RTEMS_SUCCESSFUL; rtems_status_code sc_retry = RTEMS_SUCCESSFUL; - rtems_media_state state = RTEMS_MEDIA_STATE_FAILED; + rtems_media_state state; char *dest = NULL; do { @@ -506,7 +519,7 @@ static rtems_status_code mount_worker( &mount_options ); if (rv != 0) { - rmdir(mount_path); + (void) rmdir(mount_path); free(mount_path); (*mount_options.converter->handler->destroy)(mount_options.converter); |