From ca29c652c3833da042f919a452bbdb68e3ee1e42 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Tue, 12 May 2015 07:00:11 -0600 Subject: [PATCH] Remove duplicate prototype of statfs from stdio.h. Belongs in sys/statfs.h only. Note by Michael Hope --- include/cxx/cstdio | 1 - include/stdio.h | 1 - include/sys/statfs.h | 4 ++-- syscall/syscall.csv | 3 +-- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/include/cxx/cstdio b/include/cxx/cstdio index 3fb78ed80d..e2de1c23f3 100644 --- a/include/cxx/cstdio +++ b/include/cxx/cstdio @@ -103,7 +103,6 @@ namespace std // Operations on paths - using ::statfs; using ::tmpnam; using ::tempnam; } diff --git a/include/stdio.h b/include/stdio.h index cb1636679e..13e99eb4a9 100644 --- a/include/stdio.h +++ b/include/stdio.h @@ -180,7 +180,6 @@ int vdprintf(int fd, FAR const char *fmt, va_list ap); /* Operations on paths */ -int statfs(FAR const char *path, FAR struct statfs *buf); FAR char *tmpnam(FAR char *s); FAR char *tempnam(FAR const char *dir, FAR const char *pfx); diff --git a/include/sys/statfs.h b/include/sys/statfs.h index 0be3c17abc..de13de0d92 100644 --- a/include/sys/statfs.h +++ b/include/sys/statfs.h @@ -137,8 +137,8 @@ extern "C" * form of the struct statfs. */ -int statfs(const char *path, struct statfs *buf); -int fstatfs(int fd, struct statfs *buf); +int statfs(FAR const char *path, FAR struct statfs *buf); +int fstatfs(int fd, FAR struct statfs *buf); #undef EXTERN #if defined(__cplusplus) diff --git a/syscall/syscall.csv b/syscall/syscall.csv index 2855e15260..7d386b954a 100644 --- a/syscall/syscall.csv +++ b/syscall/syscall.csv @@ -133,8 +133,7 @@ "sigwaitinfo","signal.h","!defined(CONFIG_DISABLE_SIGNALS)","int","FAR const sigset_t*","FAR struct siginfo*" "socket","sys/socket.h","CONFIG_NSOCKET_DESCRIPTORS > 0 && defined(CONFIG_NET)","int","int","int","int" "stat","sys/stat.h","CONFIG_NFILE_DESCRIPTORS > 0","int","const char*","FAR struct stat*" -#"statfs","stdio.h","","int","FAR const char*","FAR struct statfs*" -"statfs","sys/statfs.h","CONFIG_NFILE_DESCRIPTORS > 0","int","const char*","struct statfs*" +"statfs","sys/statfs.h","CONFIG_NFILE_DESCRIPTORS > 0","int","FAR const char*","FAR struct statfs*" "task_create","sched.h","!defined(CONFIG_BUILD_KERNEL)", "int","FAR const char*","int","int","main_t","FAR char * const []|FAR char * const *" #"task_create","sched.h","","int","const char*","int","main_t","FAR char * const []|FAR char * const *" "task_delete","sched.h","","int","pid_t"