From f95d753759ddbd821cefebc6b938103ec4e60551 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sun, 12 Apr 2020 09:31:34 -0600 Subject: [PATCH] Fix warnings noted in PR build checks. userfs_main.c:547:7: warning: variable 'ret' is used uninitialized whenever 'if' condition is true [-Wsometimes-uninitialized] if (*relpath == '\0') ^~~~~~~~~~~~~~~~ userfs_main.c:564:10: note: uninitialized use occurs here return ret; ^~~ userfs_main.c:547:3: note: remove the 'if' if its condition is always false if (*relpath == '\0') ^~~~~~~~~~~~~~~~~~~~~ userfs_main.c:543:10: note: initialize the variable 'ret' to silence this warning int ret; ^ = 0 test_motor.c:1068:14: warning: explicitly assigning value of variable of type 'float' to itself [-Wself-assign] expected_e = expected_e; ~~~~~~~~~~ ^ ~~~~~~~~~~ --- examples/dsptest/test_motor.c | 1 - examples/pf_ieee802154/pf_server.c | 10 ++++---- examples/userfs/userfs_main.c | 41 ++++++++++-------------------- 3 files changed, 19 insertions(+), 33 deletions(-) diff --git a/examples/dsptest/test_motor.c b/examples/dsptest/test_motor.c index 3dde2ae75..15f9f7f52 100644 --- a/examples/dsptest/test_motor.c +++ b/examples/dsptest/test_motor.c @@ -1065,7 +1065,6 @@ static void test_angle_m_el_mixed(void) angle_step = 2 * MOTOR_ANGLE_E_MAX; expected_i = expected_i - 2; - expected_e = expected_e; expected_m = expected_m - 2 * MOTOR_ANGLE_M_MAX / p; s = sin(expected_e); c = cos(expected_e); diff --git a/examples/pf_ieee802154/pf_server.c b/examples/pf_ieee802154/pf_server.c index f476b6679..f2afa6775 100644 --- a/examples/pf_ieee802154/pf_server.c +++ b/examples/pf_ieee802154/pf_server.c @@ -145,15 +145,15 @@ int main(int argc, FAR char *argv[]) offset, nbytes, client.sa_addr.s_saddr[0], client.sa_addr.s_saddr[1]); } - else if (client.sa_addr.s_mode == IEEE802154_ADDRMODE_SHORT) + else if (client.sa_addr.s_mode == IEEE802154_ADDRMODE_EXTENDED) { printf("server: %d. Received %d bytes from " "%02x:%02x:%02x:%02x:%02x:%02x:%02x: %02x\n", offset, nbytes, - client.sa_addr.s_saddr[0], client.sa_addr.s_saddr[1], - client.sa_addr.s_saddr[2], client.sa_addr.s_saddr[3], - client.sa_addr.s_saddr[4], client.sa_addr.s_saddr[5], - client.sa_addr.s_saddr[6], client.sa_addr.s_saddr[7]); + client.sa_addr.s_eaddr[0], client.sa_addr.s_eaddr[1], + client.sa_addr.s_eaddr[2], client.sa_addr.s_eaddr[3], + client.sa_addr.s_eaddr[4], client.sa_addr.s_eaddr[5], + client.sa_addr.s_eaddr[6], client.sa_addr.s_eaddr[7]); } else { diff --git a/examples/userfs/userfs_main.c b/examples/userfs/userfs_main.c index e231ae0fd..83478cd29 100644 --- a/examples/userfs/userfs_main.c +++ b/examples/userfs/userfs_main.c @@ -1,35 +1,20 @@ /**************************************************************************** * examples/userfs/userfs_main.c * - * Copyright (C) 2017 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. * ****************************************************************************/ @@ -550,6 +535,8 @@ static int ufstest_stat(FAR void *volinfo, FAR const char *relpath, buf->st_mode = (S_IFDIR | S_IRWXU | S_IRUSR | S_IRGRP | S_IRWXG | S_IROTH | S_IRWXO); buf->st_blksize = UFSTEST_FS_BLOCKSIZE; + + ret = OK; } else {