tools/nxstyle.c: Add fixedmath.h defines to white-listed prefixes
Checking for white-listed prefixes is also simpler now because the check is table driver. New data structure: g_white_prefix[] and new function white_prefix().
This commit is contained in:
Gregory Nutt
Abdelatif Guettouche
parent
c009927deb
commit
7f510a61b4
@ -1,35 +1,20 @@
|
||||
/********************************************************************************
|
||||
* tools/nxstyle.c
|
||||
*
|
||||
* Copyright (C) 2015, 2018-2020 Gregory Nutt. All rights reserved.
|
||||
* Author: Gregory Nutt <gnutt@nuttx.org>
|
||||
* 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 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.
|
||||
*
|
||||
********************************************************************************/
|
||||
|
||||
@ -195,6 +180,21 @@ static const struct file_section_s g_section_info[] =
|
||||
}
|
||||
};
|
||||
|
||||
static const char *g_white_prefix[] =
|
||||
{
|
||||
"Elf", /* Ref: include/elf.h, include/elf32.h, include/elf64.h */
|
||||
"PRIx", /* Ref: intttypes.h */
|
||||
"SYS_", /* Ref: include/sys/syscall.h */
|
||||
"STUB_", /* Ref: syscall/syscall_lookup.h, syscall/sycall_stublookup.c */
|
||||
"b8", /* Ref: include/fixedmath.h */
|
||||
"b16", /* Ref: include/fixedmath.h */
|
||||
"b32", /* Ref: include/fixedmath.h */
|
||||
"ub8", /* Ref: include/fixedmath.h */
|
||||
"ub16", /* Ref: include/fixedmath.h */
|
||||
"ub32", /* Ref: include/fixedmath.h */
|
||||
NULL
|
||||
};
|
||||
|
||||
/********************************************************************************
|
||||
* Private Functions
|
||||
********************************************************************************/
|
||||
@ -494,6 +494,32 @@ static bool check_section_header(const char *line, int lineno)
|
||||
return false;
|
||||
}
|
||||
|
||||
/********************************************************************************
|
||||
* Name: white_prefix
|
||||
*
|
||||
* Description:
|
||||
* Return true if the identifier string begins with a white-listed prefix
|
||||
*
|
||||
********************************************************************************/
|
||||
|
||||
static bool white_prefix(const char *ident, int lineno)
|
||||
{
|
||||
const char **pptr;
|
||||
const char *str;
|
||||
|
||||
for (pptr = g_white_prefix;
|
||||
(str = *pptr) != NULL;
|
||||
pptr++)
|
||||
{
|
||||
if (strncmp(ident, str, strlen(str)) == 0)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
/********************************************************************************
|
||||
* Public Functions
|
||||
********************************************************************************/
|
||||
@ -1454,20 +1480,9 @@ int main(int argc, char **argv, char **envp)
|
||||
* considered false alarms.
|
||||
*/
|
||||
|
||||
/* Ignore inttype.h strings beginning with PRIx and
|
||||
* system calls beginning with SYS_
|
||||
*/
|
||||
/* Ignore symbols that begin with white-listed prefixes */
|
||||
|
||||
if ((strncmp(&line[ident_index], "PRIx", 4) == 0) ||
|
||||
(strncmp(&line[ident_index], "SYS_", 4) == 0) ||
|
||||
(strncmp(&line[ident_index], "STUB_", 5) == 0))
|
||||
{
|
||||
/* No error */
|
||||
}
|
||||
|
||||
/* Ignore ELF stuff like Elf32_Ehdr. */
|
||||
|
||||
else if ((strncmp(&line[ident_index], "Elf", 3) == 0))
|
||||
if (white_prefix(&line[ident_index], lineno))
|
||||
{
|
||||
/* No error */
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user