From d893d78d90bec0a3969be12dd9ddcf3a9c089f1e Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Mon, 13 Apr 2020 11:10:14 -0600 Subject: [PATCH] Fix typo. Fix a typo noted in the comments to PR 777 --- include/nuttx/fs/fs.h | 52 +++++++++++++++---------------------------- 1 file changed, 18 insertions(+), 34 deletions(-) diff --git a/include/nuttx/fs/fs.h b/include/nuttx/fs/fs.h index beb2814f0bb..d4e16146045 100644 --- a/include/nuttx/fs/fs.h +++ b/include/nuttx/fs/fs.h @@ -1,36 +1,20 @@ /**************************************************************************** * include/nuttx/fs/fs.h * - * Copyright (C) 2007-2009, 2011-2013, 2015-2018 Gregory Nutt. All rights - * reserved. - * Author: Gregory Nutt + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. The + * ASF licenses this file to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the + * License. You may obtain a copy of the License at * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * http://www.apache.org/licenses/LICENSE-2.0 * - * 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. - * 3. Neither the name NuttX nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * 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. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. * ****************************************************************************/ @@ -179,12 +163,12 @@ * the open method will redirect to another driver and return a file * descriptor instead. * - * This case is when SUSv1 pseudo-terminals are usedi - * (CONFIG_PSEUDOTERM_SUSV1=y). - * In this case, the output is encoded and decoded using these macros in - * order to support (a) returning file descriptor 0 (which really should - * not happen), and (b) avoiding confusion if some other open method returns - * a positive, non-zero value which is not a file descriptor. + * This case is when SUSv1 pseudo-terminals are used + * (CONFIG_PSEUDOTERM_SUSV1=y). In this case, the output is encoded and + * decoded using these macros in order to support (a) returning file + * descriptor 0 (which really should not happen), and (b) avoiding + * confusion if some other open method returns a positive, non-zero value + * hich is not a file descriptor. * * OPEN_ISFD(r) tests if the return value from the open method is * really a file descriptor.