sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libc/getopt: Move struct getopt_s to include/nuttx/tls.h

Browse Source 
and remove include/nuttx/lib/getopt.h

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao 2021-12-06 01:01:01 +08:00 committed by David Sidrane
parent 490ac188c2
commit a6eb6df688
3 changed files with 18 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
include/nuttx/lib/getopt.h
View File

@ -1,75 +0,0 @@
/****************************************************************************
* include/nuttx/lib/getopt.h
*
* 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
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* 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.
*
****************************************************************************/
#ifndef __INCLUDE_NUTTX_LIB_GETOPT_H
#define __INCLUDE_NUTTX_LIB_GETOPT_H
/****************************************************************************
* Included Files
****************************************************************************/
#include <nuttx/config.h>
#include <stdbool.h>
/****************************************************************************
* Public Types
****************************************************************************/
/* This structure encapsulates all variables associated with getopt(). */
struct getopt_s
{
/* Part of the implementation of the public getopt() interface */
FAR char *go_optarg; /* Optional argument following option */
int go_opterr; /* Print error message */
int go_optind; /* Index into argv */
int go_optopt; /* unrecognized option character */
/* Internal getopt() state */
FAR char *go_optptr; /* Current parsing location */
bool go_binitialized; /* true: getopt() has been initialized */
};
/****************************************************************************
* Public Data
****************************************************************************/
#undef EXTERN
#if defined(__cplusplus)
#define EXTERN extern "C"
extern "C"
{
#else
#define EXTERN extern
#endif
/****************************************************************************
* Public Function Prototypes
****************************************************************************/
#undef EXTERN
#if defined(__cplusplus)
}
#endif
#endif /* __INCLUDE_NUTTX_LIB_GETOPT_H */

18
include/nuttx/tls.h
View File

@ -29,7 +29,6 @@
#include <nuttx/sched.h>
#include <nuttx/arch.h>
#include <nuttx/lib/getopt.h>
#include <sys/types.h>
/****************************************************************************
@ -83,6 +82,23 @@ typedef CODE void (*tls_dtor_t)(FAR void *);
#endif
/* This structure encapsulates all variables associated with getopt(). */
struct getopt_s
{
/* Part of the implementation of the public getopt() interface */
FAR char *go_optarg; /* Optional argument following option */
int go_opterr; /* Print error message */
int go_optind; /* Index into argv */
int go_optopt; /* unrecognized option character */
/* Internal getopt() state */
FAR char *go_optptr; /* Current parsing location */
bool go_binitialized; /* true: getopt() has been initialized */
};
struct task_info_s
{
sem_t ta_sem;

3
libs/libc/unistd/unistd.h
View File

@ -26,12 +26,11 @@
****************************************************************************/
#include <nuttx/config.h>
#include <nuttx/tls.h>
#include <stdbool.h>
#include <getopt.h>
#include <nuttx/lib/getopt.h>
/****************************************************************************
* Public Data
****************************************************************************/