riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

c++: s/restrict/__restrict/

Browse Source 
`restrict` is not a keyword in C++, but `__restrict` is understood by
GCC-ish compilers.
This commit is contained in:
René Kijewski 2014-11-19 14:27:19 +01:00
parent 3ea777ff14
commit f89e1f4a3d
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
core/include/ringbuffer.h
View File

@ -49,7 +49,7 @@ typedef struct ringbuffer {
* @param[in] buffer Buffer to use by rb. * @param[in] buffer Buffer to use by rb.
* @param[in] bufsize `sizeof (buffer)` * @param[in] bufsize `sizeof (buffer)`
*/ */
static inline void ringbuffer_init(ringbuffer_t *restrict rb, char *buffer, unsigned bufsize) static inline void ringbuffer_init(ringbuffer_t *__restrict rb, char *buffer, unsigned bufsize)
{ {
rb->buf = buffer; rb->buf = buffer;
rb->size = bufsize; rb->size = bufsize;
@ -66,7 +66,7 @@ static inline void ringbuffer_init(ringbuffer_t *restrict rb, char *buffer, unsi
* @returns The element that was dropped, iff the buffer was full. * @returns The element that was dropped, iff the buffer was full.
* -1 iff the buffer was not full. * -1 iff the buffer was not full.
*/ */
int ringbuffer_add_one(ringbuffer_t *restrict rb, char c); int ringbuffer_add_one(ringbuffer_t *__restrict rb, char c);
/** /**
* @brief Add a number of elements to the ringbuffer. * @brief Add a number of elements to the ringbuffer.
@ -78,14 +78,14 @@ int ringbuffer_add_one(ringbuffer_t *restrict rb, char c);
* @param[in] n Maximum number of elements to add. * @param[in] n Maximum number of elements to add.
* @returns Number of elements actually added. 0 if rb is full. * @returns Number of elements actually added. 0 if rb is full.
*/ */
unsigned ringbuffer_add(ringbuffer_t *restrict rb, const char *buf, unsigned n); unsigned ringbuffer_add(ringbuffer_t *__restrict rb, const char *buf, unsigned n);
/** /**
* @brief Peek and remove oldest element from the ringbuffer. * @brief Peek and remove oldest element from the ringbuffer.
* @param[in,out] rb Ringbuffer to operate on. * @param[in,out] rb Ringbuffer to operate on.
* @returns The oldest element that was added, or `-1` if rb is empty. * @returns The oldest element that was added, or `-1` if rb is empty.
*/ */
int ringbuffer_get_one(ringbuffer_t *restrict rb); int ringbuffer_get_one(ringbuffer_t *__restrict rb);
/** /**
* @brief Read and remove a number of elements from the ringbuffer. * @brief Read and remove a number of elements from the ringbuffer.
@ -94,7 +94,7 @@ int ringbuffer_get_one(ringbuffer_t *restrict rb);
* @param[in] n Read at most n elements. * @param[in] n Read at most n elements.
* @returns Number of elements actually read. * @returns Number of elements actually read.
*/ */
unsigned ringbuffer_get(ringbuffer_t *restrict rb, char *buf, unsigned n); unsigned ringbuffer_get(ringbuffer_t *__restrict rb, char *buf, unsigned n);
/** /**
* @brief Remove a number of elements from the ringbuffer. * @brief Remove a number of elements from the ringbuffer.
@ -102,14 +102,14 @@ unsigned ringbuffer_get(ringbuffer_t *restrict rb, char *buf, unsigned n);
* @param[in] n Read at most n elements. * @param[in] n Read at most n elements.
* @returns Number of elements actually removed. * @returns Number of elements actually removed.
*/ */
unsigned ringbuffer_remove(ringbuffer_t *restrict rb, unsigned n); unsigned ringbuffer_remove(ringbuffer_t *__restrict rb, unsigned n);
/** /**
* @brief Test if the ringbuffer is empty. * @brief Test if the ringbuffer is empty.
* @param[in,out] rb Ringbuffer to operate on. * @param[in,out] rb Ringbuffer to operate on.
* @returns 0 iff not empty * @returns 0 iff not empty
*/ */
static inline int ringbuffer_empty(const ringbuffer_t *restrict rb) static inline int ringbuffer_empty(const ringbuffer_t *__restrict rb)
{ {
return rb->avail == 0; return rb->avail == 0;
} }
@ -119,7 +119,7 @@ static inline int ringbuffer_empty(const ringbuffer_t *restrict rb)
* @param[in,out] rb Ringbuffer to operate on. * @param[in,out] rb Ringbuffer to operate on.
* @returns 0 iff not full * @returns 0 iff not full
*/ */
static inline int ringbuffer_full(const ringbuffer_t *restrict rb) static inline int ringbuffer_full(const ringbuffer_t *__restrict rb)
{ {
return rb->avail == rb->size; return rb->avail == rb->size;
} }
@ -129,7 +129,7 @@ static inline int ringbuffer_full(const ringbuffer_t *restrict rb)
* @param[in,out] rb Ringbuffer to query. * @param[in,out] rb Ringbuffer to query.
* @returns number of available bytes * @returns number of available bytes
*/ */
static inline unsigned int ringbuffer_get_free(const ringbuffer_t *restrict rb) static inline unsigned int ringbuffer_get_free(const ringbuffer_t *__restrict rb)
{ {
return rb->size - rb->avail; return rb->size - rb->avail;
} }
@ -139,7 +139,7 @@ static inline unsigned int ringbuffer_get_free(const ringbuffer_t *restrict rb)
* @param[in] rb Ringbuffer to operate on. * @param[in] rb Ringbuffer to operate on.
* @returns Same as ringbuffer_get_one() * @returns Same as ringbuffer_get_one()
*/ */
int ringbuffer_peek_one(const ringbuffer_t *restrict rb); int ringbuffer_peek_one(const ringbuffer_t *__restrict rb);
/** /**
* @brief Read, but don't remove, the a number of element of the buffer. * @brief Read, but don't remove, the a number of element of the buffer.
@ -148,7 +148,7 @@ int ringbuffer_peek_one(const ringbuffer_t *restrict rb);
* @param[in] n Read at most n elements. * @param[in] n Read at most n elements.
* @returns Same as ringbuffer_get() * @returns Same as ringbuffer_get()
*/ */
unsigned ringbuffer_peek(const ringbuffer_t *restrict rb, char *buf, unsigned n); unsigned ringbuffer_peek(const ringbuffer_t *__restrict rb, char *buf, unsigned n);
#ifdef __cplusplus #ifdef __cplusplus
} }

12
sys/posix/pnet/include/sys/socket.h
View File

@ -206,8 +206,8 @@ struct __attribute__((packed)) sockaddr_storage {
* file descriptor of the accepted socket. Otherwise, -1 shall be * file descriptor of the accepted socket. Otherwise, -1 shall be
* returned and errno set to indicate the error. * returned and errno set to indicate the error.
*/ */
int accept(int socket, struct sockaddr *restrict address, int accept(int socket, struct sockaddr *__restrict address,
socklen_t *restrict address_len); socklen_t *__restrict address_len);
/** /**
* @brief Bind a name to a socket. * @brief Bind a name to a socket.
@ -279,7 +279,7 @@ int connect(int socket, const struct sockaddr *address, socklen_t address_len);
* -1 shall be returned and errno set to indicate the error. * -1 shall be returned and errno set to indicate the error.
*/ */
int getsockopt(int socket, int level, int option_name, int getsockopt(int socket, int level, int option_name,
void *restrict option_value, socklen_t *restrict option_len); void *__restrict option_value, socklen_t *__restrict option_len);
/** /**
* @brief Listen for socket connections and limit the queue of incoming * @brief Listen for socket connections and limit the queue of incoming
@ -363,9 +363,9 @@ ssize_t recv(int socket, void *buffer, size_t length, int flags);
* return 0. Otherwise, the function shall return -1 and set errno to * return 0. Otherwise, the function shall return -1 and set errno to
* indicate the error. * indicate the error.
*/ */
ssize_t recvfrom(int socket, void *restrict buffer, size_t length, int flags, ssize_t recvfrom(int socket, void *__restrict buffer, size_t length, int flags,
struct sockaddr *restrict address, struct sockaddr *__restrict address,
socklen_t *restrict address_len); socklen_t *__restrict address_len);
/** /**
* @brief Send a message on a socket. * @brief Send a message on a socket.