Clean up some spacing in the last commit... Seemed like a good idea at the time, but it is better to be consisten than better.

This commit is contained in:
Gregory Nutt 2018-05-10 15:59:40 -06:00
parent 29af41a85f
commit 024364eeef
2 changed files with 162 additions and 157 deletions

View File

@ -1,8 +1,9 @@
/**************************************************************************** /****************************************************************************
* include/unistd.h * include/unistd.h
* *
* Copyright (C) 2007-2009, 2013-2014, 2016-2018 Gregory Nutt. All rights reserved. * Copyright (C) 2007-2009, 2013-2014, 2016-2018 Gregory Nutt. All rights
* Author: Gregory Nutt <gnutt@nuttx.org> * reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@ -68,19 +69,19 @@
/* POSIX feature set macros */ /* POSIX feature set macros */
#define POSIX_VERSION #define POSIX_VERSION
#undef _POSIX_SAVED_IDS #undef _POSIX_SAVED_IDS
#undef _POSIX_JOB_CONTROL #undef _POSIX_JOB_CONTROL
#define _POSIX_REALTIME_SIGNALS 1 #define _POSIX_REALTIME_SIGNALS 1
#define _POSIX_MESSAGE_PASSING 1 #define _POSIX_MESSAGE_PASSING 1
#undef _POSIX_MAPPED_FILES #undef _POSIX_MAPPED_FILES
#undef _POSIX_SHARED_MEMORY_OBJECTS #undef _POSIX_SHARED_MEMORY_OBJECTS
#define _POSIX_PRIORITY_SCHEDULING 1 #define _POSIX_PRIORITY_SCHEDULING 1
#define _POSIX_TIMERS 1 #define _POSIX_TIMERS 1
#undef _POSIX_MEMLOCK #undef _POSIX_MEMLOCK
#undef _POSIX_MEMLOCK_RANGE #undef _POSIX_MEMLOCK_RANGE
#undef _POSIX_FSYNC #undef _POSIX_FSYNC
#define _POSIX_SYNCHRONIZED_IO 1 #define _POSIX_SYNCHRONIZED_IO 1
#ifdef CONFIG_FS_AIO #ifdef CONFIG_FS_AIO
# define _POSIX_ASYNCHRONOUS_IO 1 # define _POSIX_ASYNCHRONOUS_IO 1
@ -88,7 +89,7 @@
# undef _POSIX_ASYNCHRONOUS_IO # undef _POSIX_ASYNCHRONOUS_IO
#endif #endif
#undef _POSIX_PRIORITIZED_IO #undef _POSIX_PRIORITIZED_IO
#ifdef CONFIG_SCHED_SPORADIC #ifdef CONFIG_SCHED_SPORADIC
# define _POSIX_SPORADIC_SERVER 1 # define _POSIX_SPORADIC_SERVER 1
@ -100,154 +101,154 @@
/* Execution time constants (not supported) */ /* Execution time constants (not supported) */
#undef _POSIX_CHOWN_RESTRICTED #undef _POSIX_CHOWN_RESTRICTED
#undef _POSIX_NO_TRUNC #undef _POSIX_NO_TRUNC
#undef _POSIX_VDISABLE #undef _POSIX_VDISABLE
#define _POSIX_SYNC_IO 1 #define _POSIX_SYNC_IO 1
#undef _POSIX_ASYNC_IO #undef _POSIX_ASYNC_IO
#undef _POSIX_PRIO_IO #undef _POSIX_PRIO_IO
/* Constants used with POSIX sysconf(). /* Constants used with POSIX sysconf(). sysconf() will return -2 and set
* Most of these will return -1 and ENOSYS * errno to ENOSYS for most of these.
*/ */
#define _SC_2_C_BIND 0x0001 #define _SC_2_C_BIND 0x0001
#define _SC_2_C_DEV 0x0002 #define _SC_2_C_DEV 0x0002
#define _SC_2_CHAR_TERM 0x0003 #define _SC_2_CHAR_TERM 0x0003
#define _SC_2_FORT_DEV 0x0004 #define _SC_2_FORT_DEV 0x0004
#define _SC_2_FORT_RUN 0x0005 #define _SC_2_FORT_RUN 0x0005
#define _SC_2_LOCALEDEF 0x0006 #define _SC_2_LOCALEDEF 0x0006
#define _SC_2_PBS 0x0007 #define _SC_2_PBS 0x0007
#define _SC_2_PBS_ACCOUNTING 0x0008 #define _SC_2_PBS_ACCOUNTING 0x0008
#define _SC_2_PBS_CHECKPOINT 0x0009 #define _SC_2_PBS_CHECKPOINT 0x0009
#define _SC_2_PBS_LOCATE 0x000a #define _SC_2_PBS_LOCATE 0x000a
#define _SC_2_PBS_MESSAGE 0x000b #define _SC_2_PBS_MESSAGE 0x000b
#define _SC_2_PBS_TRACK 0x000c #define _SC_2_PBS_TRACK 0x000c
#define _SC_2_SW_DEV 0x000d #define _SC_2_SW_DEV 0x000d
#define _SC_2_UPE 0x000e #define _SC_2_UPE 0x000e
#define _SC_2_VERSION 0x000f #define _SC_2_VERSION 0x000f
#define _SC_ADVISORY_INFO 0x0010 #define _SC_ADVISORY_INFO 0x0010
#define _SC_AIO_LISTIO_MAX 0x0011 #define _SC_AIO_LISTIO_MAX 0x0011
#define _SC_AIO_MAX 0x0012 #define _SC_AIO_MAX 0x0012
#define _SC_AIO_PRIO_DELTA_MAX 0x0013 #define _SC_AIO_PRIO_DELTA_MAX 0x0013
#define _SC_ARG_MAX 0x0014 #define _SC_ARG_MAX 0x0014
#define _SC_ASYNCHRONOUS_IO 0x0015 #define _SC_ASYNCHRONOUS_IO 0x0015
#define _SC_ATEXIT_MAX 0x0016 #define _SC_ATEXIT_MAX 0x0016
#define _SC_BARRIERS 0x0017 #define _SC_BARRIERS 0x0017
#define _SC_BC_BASE_MAX 0x0018 #define _SC_BC_BASE_MAX 0x0018
#define _SC_BC_DIM_MAX 0x0019 #define _SC_BC_DIM_MAX 0x0019
#define _SC_BC_SCALE_MAX 0x001a #define _SC_BC_SCALE_MAX 0x001a
#define _SC_BC_STRING_MAX 0x001b #define _SC_BC_STRING_MAX 0x001b
#define _SC_CHILD_MAX 0x001c #define _SC_CHILD_MAX 0x001c
#define _SC_CLK_TCK 0x001d #define _SC_CLK_TCK 0x001d
#define _SC_CLOCK_SELECTION 0x001e #define _SC_CLOCK_SELECTION 0x001e
#define _SC_COLL_WEIGHTS_MAX 0x001f #define _SC_COLL_WEIGHTS_MAX 0x001f
#define _SC_CPUTIME 0x0020 #define _SC_CPUTIME 0x0020
#define _SC_DELAYTIMER_MAX 0x0021 #define _SC_DELAYTIMER_MAX 0x0021
#define _SC_EXPR_NEST_MAX 0x0022 #define _SC_EXPR_NEST_MAX 0x0022
#define _SC_FSYNC 0x0023 #define _SC_FSYNC 0x0023
#define _SC_GETGR_R_SIZE_MAX 0x0024 #define _SC_GETGR_R_SIZE_MAX 0x0024
#define _SC_GETPW_R_SIZE_MAX 0x0025 #define _SC_GETPW_R_SIZE_MAX 0x0025
#define _SC_HOST_NAME_MAX 0x0026 #define _SC_HOST_NAME_MAX 0x0026
#define _SC_IOV_MAX 0x0027 #define _SC_IOV_MAX 0x0027
#define _SC_IPV6 0x0028 #define _SC_IPV6 0x0028
#define _SC_JOB_CONTROL 0x0029 #define _SC_JOB_CONTROL 0x0029
#define _SC_LINE_MAX 0x002a #define _SC_LINE_MAX 0x002a
#define _SC_LOGIN_NAME_MAX 0x002b #define _SC_LOGIN_NAME_MAX 0x002b
#define _SC_MAPPED_FILES 0x002c #define _SC_MAPPED_FILES 0x002c
#define _SC_MEMLOCK 0x002d #define _SC_MEMLOCK 0x002d
#define _SC_MEMLOCK_RANGE 0x002e #define _SC_MEMLOCK_RANGE 0x002e
#define _SC_MEMORY_PROTECTION 0x002f #define _SC_MEMORY_PROTECTION 0x002f
#define _SC_MESSAGE_PASSING 0x0030 #define _SC_MESSAGE_PASSING 0x0030
#define _SC_MONOTONIC_CLOCK 0x0031 #define _SC_MONOTONIC_CLOCK 0x0031
#define _SC_MQ_OPEN_MAX 0x0032 #define _SC_MQ_OPEN_MAX 0x0032
#define _SC_MQ_PRIO_MAX 0x0033 #define _SC_MQ_PRIO_MAX 0x0033
#define _SC_NGROUPS_MAX 0x0034 #define _SC_NGROUPS_MAX 0x0034
#define _SC_OPEN_MAX 0x0035 #define _SC_OPEN_MAX 0x0035
#define _SC_PAGE_SIZE 0x0036 #define _SC_PAGE_SIZE 0x0036
#define _SC_PAGESIZE _SC_PAGE_SIZE #define _SC_PAGESIZE _SC_PAGE_SIZE
#define _SC_PRIORITIZED_IO 0x0037 #define _SC_PRIORITIZED_IO 0x0037
#define _SC_PRIORITY_SCHEDULING 0x0038 #define _SC_PRIORITY_SCHEDULING 0x0038
#define _SC_RAW_SOCKETS 0x0039 #define _SC_RAW_SOCKETS 0x0039
#define _SC_RE_DUP_MAX 0x003a #define _SC_RE_DUP_MAX 0x003a
#define _SC_READER_WRITER_LOCKS 0x003b #define _SC_READER_WRITER_LOCKS 0x003b
#define _SC_REALTIME_SIGNALS 0x003c #define _SC_REALTIME_SIGNALS 0x003c
#define _SC_REGEXP 0x003d #define _SC_REGEXP 0x003d
#define _SC_RTSIG_MAX 0x003e #define _SC_RTSIG_MAX 0x003e
#define _SC_SAVED_IDS 0x003f #define _SC_SAVED_IDS 0x003f
#define _SC_SEM_NSEMS_MAX 0x0040 #define _SC_SEM_NSEMS_MAX 0x0040
#define _SC_SEM_VALUE_MAX 0x0041 #define _SC_SEM_VALUE_MAX 0x0041
#define _SC_SEMAPHORES 0x0042 #define _SC_SEMAPHORES 0x0042
#define _SC_SHARED_MEMORY_OBJECTS 0x0043 #define _SC_SHARED_MEMORY_OBJECTS 0x0043
#define _SC_SHELL 0x0044 #define _SC_SHELL 0x0044
#define _SC_SIGQUEUE_MAX 0x0045 #define _SC_SIGQUEUE_MAX 0x0045
#define _SC_SPAWN 0x0046 #define _SC_SPAWN 0x0046
#define _SC_SPIN_LOCKS 0x0047 #define _SC_SPIN_LOCKS 0x0047
#define _SC_SPORADIC_SERVER 0x0048 #define _SC_SPORADIC_SERVER 0x0048
#define _SC_SS_REPL_MAX 0x0049 #define _SC_SS_REPL_MAX 0x0049
#define _SC_STREAM_MAX 0x004a #define _SC_STREAM_MAX 0x004a
#define _SC_SYMLOOP_MAX 0x004b #define _SC_SYMLOOP_MAX 0x004b
#define _SC_SYNCHRONIZED_IO 0x004c #define _SC_SYNCHRONIZED_IO 0x004c
#define _SC_THREAD_ATTR_STACKADDR 0x004d #define _SC_THREAD_ATTR_STACKADDR 0x004d
#define _SC_THREAD_ATTR_STACKSIZE 0x004e #define _SC_THREAD_ATTR_STACKSIZE 0x004e
#define _SC_THREAD_CPUTIME 0x004f #define _SC_THREAD_CPUTIME 0x004f
#define _SC_THREAD_DESTRUCTOR_ITERATIONS 0x0050 #define _SC_THREAD_DESTRUCTOR_ITERATIONS 0x0050
#define _SC_THREAD_KEYS_MAX 0x0051 #define _SC_THREAD_KEYS_MAX 0x0051
#define _SC_THREAD_PRIO_INHERIT 0x0052 #define _SC_THREAD_PRIO_INHERIT 0x0052
#define _SC_THREAD_PRIO_PROTECT 0x0053 #define _SC_THREAD_PRIO_PROTECT 0x0053
#define _SC_THREAD_PRIORITY_SCHEDULING 0x0054 #define _SC_THREAD_PRIORITY_SCHEDULING 0x0054
#define _SC_THREAD_PROCESS_SHARED 0x0055 #define _SC_THREAD_PROCESS_SHARED 0x0055
#define _SC_THREAD_SAFE_FUNCTIONS 0x0056 #define _SC_THREAD_SAFE_FUNCTIONS 0x0056
#define _SC_THREAD_SPORADIC_SERVER 0x0057 #define _SC_THREAD_SPORADIC_SERVER 0x0057
#define _SC_THREAD_STACK_MIN 0x0058 #define _SC_THREAD_STACK_MIN 0x0058
#define _SC_THREAD_THREADS_MAX 0x0059 #define _SC_THREAD_THREADS_MAX 0x0059
#define _SC_THREADS 0x005a #define _SC_THREADS 0x005a
#define _SC_TIMEOUTS 0x005b #define _SC_TIMEOUTS 0x005b
#define _SC_TIMER_MAX 0x005c #define _SC_TIMER_MAX 0x005c
#define _SC_TIMERS 0x005d #define _SC_TIMERS 0x005d
#define _SC_TRACE 0x005e #define _SC_TRACE 0x005e
#define _SC_TRACE_EVENT_FILTER 0x005f #define _SC_TRACE_EVENT_FILTER 0x005f
#define _SC_TRACE_EVENT_NAME_MAX 0x0060 #define _SC_TRACE_EVENT_NAME_MAX 0x0060
#define _SC_TRACE_INHERIT 0x0061 #define _SC_TRACE_INHERIT 0x0061
#define _SC_TRACE_LOG 0x0062 #define _SC_TRACE_LOG 0x0062
#define _SC_TRACE_NAME_MAX 0x0063 #define _SC_TRACE_NAME_MAX 0x0063
#define _SC_TRACE_SYS_MAX 0x0064 #define _SC_TRACE_SYS_MAX 0x0064
#define _SC_TRACE_USER_EVENT_MAX 0x0065 #define _SC_TRACE_USER_EVENT_MAX 0x0065
#define _SC_TTY_NAME_MAX 0x0066 #define _SC_TTY_NAME_MAX 0x0066
#define _SC_TYPED_MEMORY_OBJECTS 0x0067 #define _SC_TYPED_MEMORY_OBJECTS 0x0067
#define _SC_TZNAME_MAX 0x0068 #define _SC_TZNAME_MAX 0x0068
#define _SC_V6_ILP32_OFF32 0x0069 #define _SC_V6_ILP32_OFF32 0x0069
#define _SC_V6_ILP32_OFFBIG 0x006a #define _SC_V6_ILP32_OFFBIG 0x006a
#define _SC_V6_LP64_OFF64 0x006b #define _SC_V6_LP64_OFF64 0x006b
#define _SC_V6_LPBIG_OFFBIG 0x006c #define _SC_V6_LPBIG_OFFBIG 0x006c
#define _SC_VERSION 0x006d #define _SC_VERSION 0x006d
#define _SC_XBS5_ILP32_OFF32 0x006e /* (LEGACY) */ #define _SC_XBS5_ILP32_OFF32 0x006e /* (LEGACY) */
#define _SC_XBS5_ILP32_OFFBIG 0x006f /* (LEGACY) */ #define _SC_XBS5_ILP32_OFFBIG 0x006f /* (LEGACY) */
#define _SC_XBS5_LP64_OFF64 0x0070 /* (LEGACY) */ #define _SC_XBS5_LP64_OFF64 0x0070 /* (LEGACY) */
#define _SC_XBS5_LPBIG_OFFBIG 0x0071 /* (LEGACY) */ #define _SC_XBS5_LPBIG_OFFBIG 0x0071 /* (LEGACY) */
#define _SC_XOPEN_CRYPT 0x0072 #define _SC_XOPEN_CRYPT 0x0072
#define _SC_XOPEN_ENH_I18N 0x0073 #define _SC_XOPEN_ENH_I18N 0x0073
#define _SC_XOPEN_LEGACY 0x0074 #define _SC_XOPEN_LEGACY 0x0074
#define _SC_XOPEN_REALTIME 0x0075 #define _SC_XOPEN_REALTIME 0x0075
#define _SC_XOPEN_REALTIME_THREADS 0x0076 #define _SC_XOPEN_REALTIME_THREADS 0x0076
#define _SC_XOPEN_SHM 0x0077 #define _SC_XOPEN_SHM 0x0077
#define _SC_XOPEN_STREAMS 0x0078 #define _SC_XOPEN_STREAMS 0x0078
#define _SC_XOPEN_UNIX 0x0079 #define _SC_XOPEN_UNIX 0x0079
#define _SC_XOPEN_VERSION 0x007a #define _SC_XOPEN_VERSION 0x007a
/* The following symbolic constants must be defined for file streams: */ /* The following symbolic constants must be defined for file streams: */
#define STDERR_FILENO 2 /* File number of stderr */ #define STDERR_FILENO 2 /* File number of stderr */
#define STDIN_FILENO 0 /* File number of stdin */ #define STDIN_FILENO 0 /* File number of stdin */
#define STDOUT_FILENO 1 /* File number of stdout */ #define STDOUT_FILENO 1 /* File number of stdout */
#define HOST_NAME_MAX 32 #define HOST_NAME_MAX 32
/* Helpers and compatibility definitions */ /* Helpers and legacy compatibility definitions */
#define fdatasync(f) fsync(f) #define fdatasync(f) fsync(f)
#define getdtablesize(f) ((int)sysconf(_SC_OPEN_MAX)) #define getdtablesize(f) ((int)sysconf(_SC_OPEN_MAX))
/**************************************************************************** /****************************************************************************
* Public Data * Public Data
@ -355,9 +356,9 @@ int getopt(int argc, FAR char *const argv[], FAR const char *optstring);
* be referenced directly from external modules. * be referenced directly from external modules.
*/ */
FAR char **getoptargp(void); /* Optional argument following option */ FAR char **getoptargp(void); /* Optional argument following option */
int *getoptindp(void); /* Index into argv */ FAR int *getoptindp(void); /* Index into argv */
int *getoptoptp(void); /* Unrecognized option character */ FAR int *getoptoptp(void); /* Unrecognized option character */
#ifdef CONFIG_NET #ifdef CONFIG_NET
int gethostname(FAR char *name, size_t size); int gethostname(FAR char *name, size_t size);

View File

@ -226,7 +226,11 @@ long sysconf(int name)
return CONFIG_NFILE_DESCRIPTORS; return CONFIG_NFILE_DESCRIPTORS;
default: default:
#if 0 /* Assume valid but not implemented for the time being */
errcode = EINVAL; errcode = EINVAL;
#else
errcode = ENOSYS;
#endif
break; break;
} }