From 9cc056e567fe923bb3a19fce3828cdbea9a3d2f7 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 28 Mar 2012 12:45:06 +1100 Subject: build: Remove sys_creat wrapper --- source3/client/clitar.c | 4 ++-- source3/include/proto.h | 1 - source3/lib/system.c | 9 --------- 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/source3/client/clitar.c b/source3/client/clitar.c index bf18e54f61..43311c13ae 100644 --- a/source3/client/clitar.c +++ b/source3/client/clitar.c @@ -1968,8 +1968,8 @@ int tar_parseargs(int argc, char *argv[], const char *Optarg, int Optind) } else { if (tar_type=='c' && dry_run) { tarhandle=-1; - } else if ((tar_type=='x' && (tarhandle = sys_open(argv[Optind], O_RDONLY, 0)) == -1) - || (tar_type=='c' && (tarhandle=sys_creat(argv[Optind], 0644)) < 0)) { + } else if ((tar_type=='x' && (tarhandle = open(argv[Optind], O_RDONLY, 0)) == -1) + || (tar_type=='c' && (tarhandle=creat(argv[Optind], 0644)) < 0)) { DEBUG(0,("Error opening local file %s - %s\n", argv[Optind], strerror(errno))); return(0); } diff --git a/source3/include/proto.h b/source3/include/proto.h index ccda53faea..6af0a044e6 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -336,7 +336,6 @@ int sys_lstat(const char *fname,SMB_STRUCT_STAT *sbuf, bool fake_dir_create_times); int sys_posix_fallocate(int fd, SMB_OFF_T offset, SMB_OFF_T len); int sys_fallocate(int fd, enum vfs_fallocate_mode mode, SMB_OFF_T offset, SMB_OFF_T len); -int sys_creat(const char *path, mode_t mode); int sys_open(const char *path, int oflag, mode_t mode); FILE *sys_fopen(const char *path, const char *type); void kernel_flock(int fd, uint32 share_mode, uint32 access_mask); diff --git a/source3/lib/system.c b/source3/lib/system.c index 1028e32b96..b12def5929 100644 --- a/source3/lib/system.c +++ b/source3/lib/system.c @@ -584,15 +584,6 @@ int sys_fallocate(int fd, enum vfs_fallocate_mode mode, SMB_OFF_T offset, SMB_OF #endif } -/******************************************************************* - A creat() wrapper. -********************************************************************/ - -int sys_creat(const char *path, mode_t mode) -{ - return creat(path, mode); -} - /******************************************************************* An open() wrapper. ********************************************************************/ -- cgit