XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-03-24 03:44:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

dix: rpcbuf: use x_rpcbuf_t instead of struct x_rpcbuf

Browse Source 
Both are the same types, the `struct x_rpcbuf` still remains, but it
seems more clear to use the `x_rpcbuf_t` as the canonical name.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult
2025-07-23 13:05:53 +02:00
committed by Enrico Weigelt
parent 0797119176
commit 123652228e
2 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
dix/rpcbuf.c
View File

@@ -8,7 +8,7 @@
#include "dix/rpcbuf_priv.h"
Bool x_rpcbuf_makeroom(struct x_rpcbuf *rpcbuf, size_t needed)
Bool x_rpcbuf_makeroom(x_rpcbuf_t *rpcbuf, size_t needed)
{
/* break out of alreay in error state */
if (rpcbuf->error)
@@ -48,13 +48,13 @@ err:
return FALSE;
}
void x_rpcbuf_clear(struct x_rpcbuf *rpcbuf)
void x_rpcbuf_clear(x_rpcbuf_t *rpcbuf)
{
free(rpcbuf->buffer);
memset(rpcbuf, 0, sizeof(struct x_rpcbuf));
memset(rpcbuf, 0, sizeof(x_rpcbuf_t));
}
void x_rpcbuf_reset(struct x_rpcbuf *rpcbuf)
void x_rpcbuf_reset(x_rpcbuf_t *rpcbuf)
{
/* no need to reset if never been actually written to */
if ((!rpcbuf->buffer) || (!rpcbuf->size) || (!rpcbuf->wpos))
@@ -65,7 +65,7 @@ void x_rpcbuf_reset(struct x_rpcbuf *rpcbuf)
rpcbuf->wpos = 0;
}
void *x_rpcbuf_reserve(struct x_rpcbuf *rpcbuf, size_t needed)
void *x_rpcbuf_reserve(x_rpcbuf_t *rpcbuf, size_t needed)
{
if (!x_rpcbuf_makeroom(rpcbuf, needed))
return NULL;
@@ -76,7 +76,7 @@ void *x_rpcbuf_reserve(struct x_rpcbuf *rpcbuf, size_t needed)
return pos;
}
Bool x_rpcbuf_write_string_pad(struct x_rpcbuf *rpcbuf, const char *str)
Bool x_rpcbuf_write_string_pad(x_rpcbuf_t *rpcbuf, const char *str)
{
if (!str)
return TRUE;
@@ -93,7 +93,7 @@ Bool x_rpcbuf_write_string_pad(struct x_rpcbuf *rpcbuf, const char *str)
return TRUE;
}
Bool x_rpcbuf_write_string_0t_pad(struct x_rpcbuf *rpcbuf, const char *str)
Bool x_rpcbuf_write_string_0t_pad(x_rpcbuf_t *rpcbuf, const char *str)
{
if (!str)
return x_rpcbuf_write_CARD32(rpcbuf, 0);
@@ -110,7 +110,7 @@ Bool x_rpcbuf_write_string_0t_pad(struct x_rpcbuf *rpcbuf, const char *str)
return TRUE;
}
Bool x_rpcbuf_write_CARD8(struct x_rpcbuf *rpcbuf, CARD8 value)
Bool x_rpcbuf_write_CARD8(x_rpcbuf_t *rpcbuf, CARD8 value)
{
CARD8 *reserved = x_rpcbuf_reserve(rpcbuf, sizeof(value));
if (!reserved)
@@ -121,7 +121,7 @@ Bool x_rpcbuf_write_CARD8(struct x_rpcbuf *rpcbuf, CARD8 value)
return TRUE;
}
Bool x_rpcbuf_write_CARD16(struct x_rpcbuf *rpcbuf, CARD16 value)
Bool x_rpcbuf_write_CARD16(x_rpcbuf_t *rpcbuf, CARD16 value)
{
CARD16 *reserved = x_rpcbuf_reserve(rpcbuf, sizeof(value));
if (!reserved)
@@ -135,7 +135,7 @@ Bool x_rpcbuf_write_CARD16(struct x_rpcbuf *rpcbuf, CARD16 value)
return TRUE;
}
Bool x_rpcbuf_write_CARD32(struct x_rpcbuf *rpcbuf, CARD32 value)
Bool x_rpcbuf_write_CARD32(x_rpcbuf_t *rpcbuf, CARD32 value)
{
CARD32 *reserved = x_rpcbuf_reserve(rpcbuf, sizeof(value));
if (!reserved)
@@ -149,7 +149,7 @@ Bool x_rpcbuf_write_CARD32(struct x_rpcbuf *rpcbuf, CARD32 value)
return TRUE;
}
Bool x_rpcbuf_write_CARD8s(struct x_rpcbuf *rpcbuf, const CARD8 *values,
Bool x_rpcbuf_write_CARD8s(x_rpcbuf_t *rpcbuf, const CARD8 *values,
size_t count)
{
if ((!values) || (!count))
@@ -164,7 +164,7 @@ Bool x_rpcbuf_write_CARD8s(struct x_rpcbuf *rpcbuf, const CARD8 *values,
return TRUE;
}
Bool x_rpcbuf_write_CARD16s(struct x_rpcbuf *rpcbuf, const CARD16 *values,
Bool x_rpcbuf_write_CARD16s(x_rpcbuf_t *rpcbuf, const CARD16 *values,
size_t count)
{
if ((!values) || (!count))
@@ -182,7 +182,7 @@ Bool x_rpcbuf_write_CARD16s(struct x_rpcbuf *rpcbuf, const CARD16 *values,
return TRUE;
}
Bool x_rpcbuf_write_CARD32s(struct x_rpcbuf *rpcbuf, const CARD32 *values,
Bool x_rpcbuf_write_CARD32s(x_rpcbuf_t *rpcbuf, const CARD32 *values,
size_t count)
{
if ((!values) || (!count))
@@ -200,7 +200,7 @@ Bool x_rpcbuf_write_CARD32s(struct x_rpcbuf *rpcbuf, const CARD32 *values,
return TRUE;
}
Bool x_rpcbuf_write_binary_pad(struct x_rpcbuf *rpcbuf, const void *values,
Bool x_rpcbuf_write_binary_pad(x_rpcbuf_t *rpcbuf, const void *values,
size_t size)
{
if ((!values) || (!size))

58
dix/rpcbuf_priv.h
View File

@@ -18,7 +18,7 @@
*
* Example:
*
* struct x_rpcbuf buf = { 0 };
* x_rpcbuf_t x_rpcbuf buf = { 0 };
* x_rpcbuf_write_string(&buf, "hello world");
* x_rpcbuf_write_CARD1&(&buf, 91126);
* ...
@@ -41,19 +41,19 @@ typedef struct x_rpcbuf {
/*
* make sure there's enough room for `needed` bytes in the buffer.
*
* @param rpcbuf pointer to struct x_rpcbuf to operate on
* @param rpcbuf pointer to x_rpcbuf_t to operate on
* @param needed amount of free space needed in the buffer
* @return TRUE if there (now) is enough room, FALSE on alloc failure
*/
Bool x_rpcbuf_makeroom(struct x_rpcbuf *rpcbuf, size_t needed)
Bool x_rpcbuf_makeroom(x_rpcbuf_t *rpcbuf, size_t needed)
_X_ATTRIBUTE_NONNULL_ARG(1);
/*
* clear rpcbuf and free all held memory.
*
* @param rpcbuf pointer to struct x_rpcbuf to operate on
* @param rpcbuf pointer to x_rpcbuf_t to operate on
*/
void x_rpcbuf_clear(struct x_rpcbuf *rpcbuf)
void x_rpcbuf_clear(x_rpcbuf_t *rpcbuf)
_X_ATTRIBUTE_NONNULL_ARG(1);
/*
@@ -62,9 +62,9 @@ void x_rpcbuf_clear(struct x_rpcbuf *rpcbuf)
* this is for reusing existing buffers for different purpose, w/o
* having to go through new allocatons.
*
* @param rpcbuf pointer to struct x_rpcbuf to operate on
* @param rpcbuf pointer to x_rpcbuf_t to operate on
*/
void x_rpcbuf_reset(struct x_rpcbuf *rpcbuf)
void x_rpcbuf_reset(x_rpcbuf_t *rpcbuf)
_X_ATTRIBUTE_NONNULL_ARG(1);
/*
@@ -77,11 +77,11 @@ void x_rpcbuf_reset(struct x_rpcbuf *rpcbuf)
* buffer that might affect the allocated memory block: when buffer
* needs to be resized, it may get a new memory location.
*
* @param rpcbuf pointer to struct x_rpcbuf to operate on
* @param rpcbuf pointer to x_rpcbuf_t to operate on
* @param needed amount of bytes needed
* @return pointer to reserved region of NULL on allocation failure
*/
void *x_rpcbuf_reserve(struct x_rpcbuf *rpcbuf, size_t needed)
void *x_rpcbuf_reserve(x_rpcbuf_t *rpcbuf, size_t needed)
_X_ATTRIBUTE_NONNULL_ARG(1);
/*
@@ -90,11 +90,11 @@ void *x_rpcbuf_reserve(struct x_rpcbuf *rpcbuf, size_t needed)
* allocate a region for the string (padded to 32bits) and copy in the string.
* if given string is NULL or zero-size, nothing happens.
*
* @param rpcbuf pointer to struct x_rpcbuf to operate on
* @param rpcbuf pointer to x_rpcbuf_t to operate on
* @param needed string to plain C string
* @return TRUE on success, FALSE on allocation failure
*/
Bool x_rpcbuf_write_string_pad(struct x_rpcbuf *rpcbuf, const char *str)
Bool x_rpcbuf_write_string_pad(x_rpcbuf_t *rpcbuf, const char *str)
_X_ATTRIBUTE_NONNULL_ARG(1);
/*
@@ -103,11 +103,11 @@ Bool x_rpcbuf_write_string_pad(struct x_rpcbuf *rpcbuf, const char *str)
* allocate a region for the string (padded to 32bits) and copy in the string.
* if given string is NULL or zero-size, only a (CARD32)0 is written.
*
* @param rpcbuf pointer to struct x_rpcbuf to operate on
* @param rpcbuf pointer to x_rpcbuf_t to operate on
* @param needed string to plain C string
* @return TRUE on success, FALSE on allocation failure
*/
Bool x_rpcbuf_write_string_0t_pad(struct x_rpcbuf *rpcbuf, const char *str)
Bool x_rpcbuf_write_string_0t_pad(x_rpcbuf_t *rpcbuf, const char *str)
_X_ATTRIBUTE_NONNULL_ARG(1);
/*
@@ -116,11 +116,11 @@ Bool x_rpcbuf_write_string_0t_pad(struct x_rpcbuf *rpcbuf, const char *str)
* allocate a region for the string (padded to 32bits) and copy in the data.
* if given data is NULL or size is zero , nothing happens.
*
* @param rpcbuf pointer to struct x_rpcbuf to operate on
* @param rpcbuf pointer to x_rpcbuf_t to operate on
* @param needed string to plain C string
* @return TRUE on success, FALSE on allocation failure
*/
Bool x_rpcbuf_write_binary_pad(struct x_rpcbuf *rpcbuf, const void *data,
Bool x_rpcbuf_write_binary_pad(x_rpcbuf_t *rpcbuf, const void *data,
size_t count) _X_ATTRIBUTE_NONNULL_ARG(1);
/*
@@ -130,11 +130,11 @@ Bool x_rpcbuf_write_binary_pad(struct x_rpcbuf *rpcbuf, const void *data,
*
* doesn't do any padding.
*
* @param rpcbuf pointer to struct x_rpcbuf to operate on
* @param rpcbuf pointer to x_rpcbuf_t to operate on
* @param value the CARD16 value to write
* @return TRUE on success, FALSE on allocation failure
*/
Bool x_rpcbuf_write_CARD8(struct x_rpcbuf *rpcbuf, CARD8 value)
Bool x_rpcbuf_write_CARD8(x_rpcbuf_t *rpcbuf, CARD8 value)
_X_ATTRIBUTE_NONNULL_ARG(1);
/*
@@ -145,11 +145,11 @@ Bool x_rpcbuf_write_CARD8(struct x_rpcbuf *rpcbuf, CARD8 value)
*
* doesn't do any padding.
*
* @param rpcbuf pointer to struct x_rpcbuf to operate on
* @param rpcbuf pointer to x_rpcbuf_t to operate on
* @param value the CARD16 value to write
* @return TRUE on success, FALSE on allocation failure
*/
Bool x_rpcbuf_write_CARD16(struct x_rpcbuf *rpcbuf, CARD16 value)
Bool x_rpcbuf_write_CARD16(x_rpcbuf_t *rpcbuf, CARD16 value)
_X_ATTRIBUTE_NONNULL_ARG(1);
/*
@@ -160,11 +160,11 @@ Bool x_rpcbuf_write_CARD16(struct x_rpcbuf *rpcbuf, CARD16 value)
*
* doesn't do any padding.
*
* @param rpcbuf pointer to struct x_rpcbuf to operate on
* @param rpcbuf pointer to x_rpcbuf_t to operate on
* @param value the CARD32 value to write
* @return TRUE on success, FALSE on allocation failure
*/
Bool x_rpcbuf_write_CARD32(struct x_rpcbuf *rpcbuf, CARD32 value)
Bool x_rpcbuf_write_CARD32(x_rpcbuf_t *rpcbuf, CARD32 value)
_X_ATTRIBUTE_NONNULL_ARG(1);
/*
@@ -175,12 +175,12 @@ Bool x_rpcbuf_write_CARD32(struct x_rpcbuf *rpcbuf, CARD32 value)
*
* doesn't do any padding.
*
* @param rpcbuf pointer to struct x_rpcbuf to operate on
* @param rpcbuf pointer to x_rpcbuf_t to operate on
* @param values pointer to CARD16 array to write
* @param count number of elements in the array
* @return TRUE on success, FALSE on allocation failure
*/
Bool x_rpcbuf_write_CARD8s(struct x_rpcbuf *rpcbuf, const CARD8 *values,
Bool x_rpcbuf_write_CARD8s(x_rpcbuf_t *rpcbuf, const CARD8 *values,
size_t count) _X_ATTRIBUTE_NONNULL_ARG(1);
/*
@@ -192,12 +192,12 @@ Bool x_rpcbuf_write_CARD8s(struct x_rpcbuf *rpcbuf, const CARD8 *values,
*
* doesn't do any padding.
*
* @param rpcbuf pointer to struct x_rpcbuf to operate on
* @param rpcbuf pointer to x_rpcbuf_t to operate on
* @param values pointer to CARD16 array to write
* @param count number of elements in the array
* @return TRUE on success, FALSE on allocation failure
*/
Bool x_rpcbuf_write_CARD16s(struct x_rpcbuf *rpcbuf, const CARD16 *values,
Bool x_rpcbuf_write_CARD16s(x_rpcbuf_t *rpcbuf, const CARD16 *values,
size_t count) _X_ATTRIBUTE_NONNULL_ARG(1);
/*
@@ -209,21 +209,21 @@ Bool x_rpcbuf_write_CARD16s(struct x_rpcbuf *rpcbuf, const CARD16 *values,
*
* doesn't do any padding.
*
* @param rpcbuf pointer to struct x_rpcbuf to operate on
* @param rpcbuf pointer to x_rpcbuf_t to operate on
* @param values pointer to CARD32 array to write
* @param count number of elements in the array
* @return TRUE on success, FALSE on allocation failure
*/
Bool x_rpcbuf_write_CARD32s(struct x_rpcbuf *rpcbuf, const CARD32 *values,
Bool x_rpcbuf_write_CARD32s(x_rpcbuf_t *rpcbuf, const CARD32 *values,
size_t count) _X_ATTRIBUTE_NONNULL_ARG(1);
/*
* retrieve number of 4-byte-units (padded) of data written in the buffer
*
* @param rpcbuf pointer to struct x_rpcbuf to operate on
* @param rpcbuf pointer to x_rpcbuf_t to operate on
* @return number of 4-byte units (w/ padding) written into the buffer
*/
static inline size_t x_rpcbuf_wsize_units(struct x_rpcbuf *rpcbuf) {
static inline size_t x_rpcbuf_wsize_units(x_rpcbuf_t *rpcbuf) {
return bytes_to_int32(pad_to_int32(rpcbuf->wpos));
}