Changeset: 6b31828525a0 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6b31828525a0
Modified Files:
clients/Tests/exports.stable.out
gdk/gdk_atoms.c
gdk/gdk_atoms.h
Branch: default
Log Message:
Add some restrict qualifiers.
diffs (101 lines):
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -266,7 +266,7 @@ gdk_return GDKreleasesem(int sem_id, str
void GDKreset(int status, int exit);
gdk_return GDKsetenv(const char *name, const char *value);
void GDKsetmallocsuccesscount(lng count);
-ssize_t GDKstrFromStr(unsigned char *dst, const unsigned char *src, ssize_t
len);
+ssize_t GDKstrFromStr(unsigned char *restrict dst, const unsigned char
*restrict src, ssize_t len);
str GDKstrdup(const char *s) __attribute__((__warn_unused_result__));
str GDKstrndup(const char *s, size_t n)
__attribute__((__warn_unused_result__));
void GDKsyserror(_In_z_ _Printf_format_string_ const char *format, ...)
__attribute__((__format__(__printf__, 1, 2)));
@@ -383,8 +383,8 @@ int dlclose(void *handle);
char *dlerror(void);
void *dlopen(const char *file, int mode);
void *dlsym(void *handle, const char *name);
-size_t escapedStr(char *dst, const char *src, size_t dstlen, const char *sep1,
const char *sep2, int quote);
-size_t escapedStrlen(const char *src, const char *sep1, const char *sep2, int
quote);
+size_t escapedStr(char *restrict dst, const char *restrict src, size_t dstlen,
const char *sep1, const char *sep2, int quote);
+size_t escapedStrlen(const char *restrict src, const char *sep1, const char
*sep2, int quote);
ssize_t fltFromStr(const char *src, size_t *len, flt **dst);
ssize_t fltToStr(str *dst, size_t *len, const flt *src);
NANCONST flt flt_nil;
@@ -478,7 +478,7 @@ void rewinddir(DIR *dir);
ssize_t shtFromStr(const char *src, size_t *len, sht **dst);
ssize_t shtToStr(str *dst, size_t *len, const sht *src);
const sht sht_nil;
-ssize_t strFromStr(const char *src, size_t *len, str *dst);
+ssize_t strFromStr(const char *restrict src, size_t *restrict len, str
*restrict dst);
BUN strHash(const char *s);
size_t strLen(const char *s);
int strNil(const char *s);
diff --git a/gdk/gdk_atoms.c b/gdk/gdk_atoms.c
--- a/gdk/gdk_atoms.c
+++ b/gdk/gdk_atoms.c
@@ -1442,7 +1442,7 @@ static int utf8chkmsk[] = {
};
ssize_t
-GDKstrFromStr(unsigned char *dst, const unsigned char *src, ssize_t len)
+GDKstrFromStr(unsigned char *restrict dst, const unsigned char *restrict src,
ssize_t len)
{
unsigned char *p = dst;
const unsigned char *cur = src, *end = src + len;
@@ -1599,7 +1599,7 @@ GDKstrFromStr(unsigned char *dst, const
}
ssize_t
-strFromStr(const char *src, size_t *len, char **dst)
+strFromStr(const char *restrict src, size_t *restrict len, char **restrict dst)
{
const char *cur = src, *start = NULL;
size_t l = 1;
@@ -1665,7 +1665,7 @@ strFromStr(const char *src, size_t *len,
#endif
size_t
-escapedStrlen(const char *src, const char *sep1, const char *sep2, int quote)
+escapedStrlen(const char *restrict src, const char *sep1, const char *sep2,
int quote)
{
size_t end, sz = 0;
size_t sep1len, sep2len;
@@ -1700,7 +1700,7 @@ escapedStrlen(const char *src, const cha
}
size_t
-escapedStr(char *dst, const char *src, size_t dstlen, const char *sep1, const
char *sep2, int quote)
+escapedStr(char *restrict dst, const char *restrict src, size_t dstlen, const
char *sep1, const char *sep2, int quote)
{
size_t cur = 0, l = 0;
size_t sep1len, sep2len;
@@ -1753,7 +1753,7 @@ escapedStr(char *dst, const char *src, s
}
static ssize_t
-strToStr(char **dst, size_t *len, const char *src)
+strToStr(char **restrict dst, size_t *restrict len, const char *restrict src)
{
if (GDK_STRNIL(src)) {
atommem(4);
diff --git a/gdk/gdk_atoms.h b/gdk/gdk_atoms.h
--- a/gdk/gdk_atoms.h
+++ b/gdk/gdk_atoms.h
@@ -66,13 +66,13 @@ gdk_export ssize_t fltFromStr(const char
gdk_export ssize_t fltToStr(str *dst, size_t *len, const flt *src);
gdk_export ssize_t dblFromStr(const char *src, size_t *len, dbl **dst);
gdk_export ssize_t dblToStr(str *dst, size_t *len, const dbl *src);
-gdk_export ssize_t GDKstrFromStr(unsigned char *dst, const unsigned char *src,
ssize_t len);
-gdk_export ssize_t strFromStr(const char *src, size_t *len, str *dst);
+gdk_export ssize_t GDKstrFromStr(unsigned char *restrict dst, const unsigned
char *restrict src, ssize_t len);
+gdk_export ssize_t strFromStr(const char *restrict src, size_t *restrict len,
str *restrict dst);
gdk_export BUN strHash(const char *s);
gdk_export size_t strLen(const char *s);
gdk_export int strNil(const char *s);
-gdk_export size_t escapedStrlen(const char *src, const char *sep1, const char
*sep2, int quote);
-gdk_export size_t escapedStr(char *dst, const char *src, size_t dstlen, const
char *sep1, const char *sep2, int quote);
+gdk_export size_t escapedStrlen(const char *restrict src, const char *sep1,
const char *sep2, int quote);
+gdk_export size_t escapedStr(char *restrict dst, const char *restrict src,
size_t dstlen, const char *sep1, const char *sep2, int quote);
/*
* @- nil values
* All types have a single value designated as a NIL value. It
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
