summaryrefslogtreecommitdiff
path: root/src/libstddjb
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2020-10-26 12:52:31 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2020-10-26 12:52:31 +0000
commitad90bc1107ef9a76f4ca530cc41e86d4f352e3d9 (patch)
tree7a949f8a814a6a9624e6bb0246ec1db4c3dd30b7 /src/libstddjb
parent9806a4f3bb81f71c46735a2b378cb074fef6e27b (diff)
downloadskalibs-ad90bc1107ef9a76f4ca530cc41e86d4f352e3d9.tar.xz
Change new function names to openc_*; update deps.mak
Diffstat (limited to 'src/libstddjb')
-rw-r--r--src/libstddjb/openbc_read.c (renamed from src/libstddjb/openb_readcoe.c)2
-rw-r--r--src/libstddjb/openc_append.c (renamed from src/libstddjb/open_appendcoe.c)2
-rw-r--r--src/libstddjb/openc_create.c (renamed from src/libstddjb/open_createcoe.c)2
-rw-r--r--src/libstddjb/openc_excl.c (renamed from src/libstddjb/open_exclcoe.c)2
-rw-r--r--src/libstddjb/openc_read.c (renamed from src/libstddjb/open_readcoe.c)2
-rw-r--r--src/libstddjb/openc_readb.c (renamed from src/libstddjb/open_readbcoe.c)4
-rw-r--r--src/libstddjb/openc_trunc.c (renamed from src/libstddjb/open_trunccoe.c)2
-rw-r--r--src/libstddjb/openc_write.c (renamed from src/libstddjb/open_writecoe.c)2
-rw-r--r--src/libstddjb/openreadfileclose.c2
-rw-r--r--src/libstddjb/openreadnclose.c4
-rw-r--r--src/libstddjb/openslurpclose.c2
-rw-r--r--src/libstddjb/openwritenclose_unsafe.c2
-rw-r--r--src/libstddjb/openwritevnclose_unsafe.c2
13 files changed, 15 insertions, 15 deletions
diff --git a/src/libstddjb/openb_readcoe.c b/src/libstddjb/openbc_read.c
index 933830e..4783780 100644
--- a/src/libstddjb/openb_readcoe.c
+++ b/src/libstddjb/openbc_read.c
@@ -4,7 +4,7 @@
#include <fcntl.h>
#include <skalibs/djbunix.h>
-int openb_readcoe (char const *fn)
+int openbc_read (char const *fn)
{
return open2(fn, O_RDONLY | O_CLOEXEC) ;
}
diff --git a/src/libstddjb/open_appendcoe.c b/src/libstddjb/openc_append.c
index 3bda62e..9765aa6 100644
--- a/src/libstddjb/open_appendcoe.c
+++ b/src/libstddjb/openc_append.c
@@ -4,7 +4,7 @@
#include <fcntl.h>
#include <skalibs/djbunix.h>
-int open_appendcoe (char const *fn)
+int openc_append (char const *fn)
{
return open3(fn, O_WRONLY | O_NONBLOCK | O_APPEND | O_CREAT | O_CLOEXEC, 0666) ;
}
diff --git a/src/libstddjb/open_createcoe.c b/src/libstddjb/openc_create.c
index 4f42f78..2c0dd86 100644
--- a/src/libstddjb/open_createcoe.c
+++ b/src/libstddjb/openc_create.c
@@ -4,7 +4,7 @@
#include <fcntl.h>
#include <skalibs/djbunix.h>
-int open_createcoe (char const *fn)
+int openc_create (char const *fn)
{
return open3(fn, O_WRONLY | O_NONBLOCK | O_CREAT | O_CLOEXEC, 0666) ;
}
diff --git a/src/libstddjb/open_exclcoe.c b/src/libstddjb/openc_excl.c
index b24786c..9a45913 100644
--- a/src/libstddjb/open_exclcoe.c
+++ b/src/libstddjb/openc_excl.c
@@ -4,7 +4,7 @@
#include <fcntl.h>
#include <skalibs/djbunix.h>
-int open_exclcoe (char const *fn)
+int openc_excl (char const *fn)
{
return open3(fn, O_WRONLY | O_CREAT | O_EXCL | O_NONBLOCK | O_CLOEXEC, 0666) ;
}
diff --git a/src/libstddjb/open_readcoe.c b/src/libstddjb/openc_read.c
index cd6a69d..57a23bc 100644
--- a/src/libstddjb/open_readcoe.c
+++ b/src/libstddjb/openc_read.c
@@ -4,7 +4,7 @@
#include <fcntl.h>
#include <skalibs/djbunix.h>
-int open_readcoe (char const *fn)
+int openc_read (char const *fn)
{
return open2(fn, O_RDONLY | O_NONBLOCK | O_CLOEXEC) ;
}
diff --git a/src/libstddjb/open_readbcoe.c b/src/libstddjb/openc_readb.c
index d461854..e0bfcc0 100644
--- a/src/libstddjb/open_readbcoe.c
+++ b/src/libstddjb/openc_readb.c
@@ -2,9 +2,9 @@
#include <skalibs/djbunix.h>
-int open_readbcoe (char const *fn)
+int openc_readb (char const *fn)
{
- int fd = open_readbcoe(fn) ;
+ int fd = openc_read(fn) ;
if (fd < 0) return -1 ;
if (ndelay_off(fd) < 0)
{
diff --git a/src/libstddjb/open_trunccoe.c b/src/libstddjb/openc_trunc.c
index 3be3df6..ca39160 100644
--- a/src/libstddjb/open_trunccoe.c
+++ b/src/libstddjb/openc_trunc.c
@@ -4,7 +4,7 @@
#include <fcntl.h>
#include <skalibs/djbunix.h>
-int open_trunccoe (char const *fn)
+int openc_trunc (char const *fn)
{
return open3(fn, O_WRONLY | O_NONBLOCK | O_TRUNC | O_CREAT | O_CLOEXEC, 0666) ;
}
diff --git a/src/libstddjb/open_writecoe.c b/src/libstddjb/openc_write.c
index d04c4c5..518c460 100644
--- a/src/libstddjb/open_writecoe.c
+++ b/src/libstddjb/openc_write.c
@@ -4,7 +4,7 @@
#include <fcntl.h>
#include <skalibs/djbunix.h>
-int open_writecoe (char const *fn)
+int openc_write (char const *fn)
{
return open2(fn, O_WRONLY | O_NONBLOCK | O_CLOEXEC) ;
}
diff --git a/src/libstddjb/openreadfileclose.c b/src/libstddjb/openreadfileclose.c
index 95895e8..afa895a 100644
--- a/src/libstddjb/openreadfileclose.c
+++ b/src/libstddjb/openreadfileclose.c
@@ -8,7 +8,7 @@
int openreadfileclose (char const *file, stralloc *sa, size_t limit)
{
size_t n ;
- int fd = openb_readcoe(file) ;
+ int fd = openbc_read(file) ;
if (fd < 0) return 0 ;
{
struct stat st ;
diff --git a/src/libstddjb/openreadnclose.c b/src/libstddjb/openreadnclose.c
index 0853c87..4466796 100644
--- a/src/libstddjb/openreadnclose.c
+++ b/src/libstddjb/openreadnclose.c
@@ -22,12 +22,12 @@ static ssize_t readnclose (int fd, char *s, size_t n)
ssize_t openreadnclose (char const *file, char *s, size_t n)
{
- int fd = openb_readcoe(file) ;
+ int fd = openbc_read(file) ;
return fd < 0 ? fd : readnclose(fd, s, n) ;
}
ssize_t openreadnclose_nb (char const *file, char *s, size_t n)
{
- int fd = open_readcoe(file) ;
+ int fd = openc_read(file) ;
return fd < 0 ? fd : readnclose(fd, s, n) ;
}
diff --git a/src/libstddjb/openslurpclose.c b/src/libstddjb/openslurpclose.c
index 6a431d0..8485413 100644
--- a/src/libstddjb/openslurpclose.c
+++ b/src/libstddjb/openslurpclose.c
@@ -6,7 +6,7 @@
int openslurpclose (stralloc *sa, char const *fn)
{
int r ;
- int fd = openb_readcoe(fn) ;
+ int fd = openbc_read(fn) ;
if (fd == -1) return 0 ;
r = slurp(sa, fd) ;
fd_close(fd) ;
diff --git a/src/libstddjb/openwritenclose_unsafe.c b/src/libstddjb/openwritenclose_unsafe.c
index 893fc3a..8022f74 100644
--- a/src/libstddjb/openwritenclose_unsafe.c
+++ b/src/libstddjb/openwritenclose_unsafe.c
@@ -6,7 +6,7 @@
int openwritenclose_unsafe_internal (char const *fn, char const *s, size_t len, dev_t *dev, ino_t *ino, int dosync)
{
- int fd = open_trunccoe(fn) ;
+ int fd = openc_trunc(fn) ;
if (fd < 0) return 0 ;
if (!writenclose_unsafe_internal(fd, s, len, dev, ino, dosync))
{
diff --git a/src/libstddjb/openwritevnclose_unsafe.c b/src/libstddjb/openwritevnclose_unsafe.c
index d707fb0..ca98f1c 100644
--- a/src/libstddjb/openwritevnclose_unsafe.c
+++ b/src/libstddjb/openwritevnclose_unsafe.c
@@ -8,7 +8,7 @@
int openwritevnclose_unsafe_internal (char const *fn, struct iovec const *v, unsigned int vlen, dev_t *dev, ino_t *ino, int dosync)
{
- int fd = open_trunccoe(fn) ;
+ int fd = openc_trunc(fn) ;
if (fd < 0) return 0 ;
if (!writevnclose_unsafe_internal(fd, v, vlen, dev, ino, dosync))
{