projects
/
free-sw
/
xcb
/
libxcb
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added generating code for _serialize() in case of variable sized structs (largely...
[free-sw/xcb/libxcb]
/
src
/
xcb_ext.c
diff --git
a/src/xcb_ext.c
b/src/xcb_ext.c
index
3732515
..
68bb29b
100644
(file)
--- a/
src/xcb_ext.c
+++ b/
src/xcb_ext.c
@@
-33,18
+33,18
@@
#include "xcbint.h"
typedef struct lazyreply {
#include "xcbint.h"
typedef struct lazyreply {
- enum
{ LAZY_NONE = 0, LAZY_COOKIE, LAZY_FORCED }
tag;
+ enum
lazy_reply_tag
tag;
union {
union {
-
XCBQueryExtensionCookie
cookie;
-
XCBQueryExtensionRep
*reply;
+
xcb_query_extension_cookie_t
cookie;
+
xcb_query_extension_reply_t
*reply;
} value;
} lazyreply;
} value;
} lazyreply;
-static lazyreply *get_index(
XCBConnection *c, int inde
x)
+static lazyreply *get_index(
xcb_connection_t *c, int id
x)
{
{
- if(i
nde
x > c->ext.extensions_size)
+ if(i
d
x > c->ext.extensions_size)
{
{
- int new_size = i
nde
x << 1;
+ int new_size = i
d
x << 1;
lazyreply *new_extensions = realloc(c->ext.extensions, sizeof(lazyreply) * new_size);
if(!new_extensions)
return 0;
lazyreply *new_extensions = realloc(c->ext.extensions, sizeof(lazyreply) * new_size);
if(!new_extensions)
return 0;
@@
-52,10
+52,10
@@
static lazyreply *get_index(XCBConnection *c, int index)
c->ext.extensions = new_extensions;
c->ext.extensions_size = new_size;
}
c->ext.extensions = new_extensions;
c->ext.extensions_size = new_size;
}
- return c->ext.extensions + i
nde
x - 1;
+ return c->ext.extensions + i
d
x - 1;
}
}
-static lazyreply *get_lazyreply(
XCBConnection *c, XCBExtension
*ext)
+static lazyreply *get_lazyreply(
xcb_connection_t *c, xcb_extension_t
*ext)
{
static pthread_mutex_t global_lock = PTHREAD_MUTEX_INITIALIZER;
static int next_global_id;
{
static pthread_mutex_t global_lock = PTHREAD_MUTEX_INITIALIZER;
static int next_global_id;
@@
-72,16
+72,16
@@
static lazyreply *get_lazyreply(XCBConnection *c, XCBExtension *ext)
{
/* cache miss: query the server */
data->tag = LAZY_COOKIE;
{
/* cache miss: query the server */
data->tag = LAZY_COOKIE;
- data->value.cookie =
XCBQueryE
xtension(c, strlen(ext->name), ext->name);
+ data->value.cookie =
xcb_query_e
xtension(c, strlen(ext->name), ext->name);
}
return data;
}
/* Public interface */
}
return data;
}
/* Public interface */
-/* Do not free the returned
XCBQueryExtensionRep
- on return, it's aliased
+/* Do not free the returned
xcb_query_extension_reply_t
- on return, it's aliased
* from the cache. */
* from the cache. */
-const
XCBQueryExtensionRep *XCBGetExtensionData(XCBConnection *c, XCBExtension
*ext)
+const
xcb_query_extension_reply_t *xcb_get_extension_data(xcb_connection_t *c, xcb_extension_t
*ext)
{
lazyreply *data;
if(c->has_error)
{
lazyreply *data;
if(c->has_error)
@@
-92,14
+92,14
@@
const XCBQueryExtensionRep *XCBGetExtensionData(XCBConnection *c, XCBExtension *
if(data && data->tag == LAZY_COOKIE)
{
data->tag = LAZY_FORCED;
if(data && data->tag == LAZY_COOKIE)
{
data->tag = LAZY_FORCED;
- data->value.reply =
XCBQueryExtensionR
eply(c, data->value.cookie, 0);
+ data->value.reply =
xcb_query_extension_r
eply(c, data->value.cookie, 0);
}
pthread_mutex_unlock(&c->ext.lock);
return data ? data->value.reply : 0;
}
}
pthread_mutex_unlock(&c->ext.lock);
return data ? data->value.reply : 0;
}
-void
XCBPrefetchExtensionData(XCBConnection *c, XCBExtension
*ext)
+void
xcb_prefetch_extension_data(xcb_connection_t *c, xcb_extension_t
*ext)
{
if(c->has_error)
return;
{
if(c->has_error)
return;
@@
-110,14
+110,14
@@
void XCBPrefetchExtensionData(XCBConnection *c, XCBExtension *ext)
/* Private interface */
/* Private interface */
-int _xcb_ext_init(
XCBConnection
*c)
+int _xcb_ext_init(
xcb_connection_t
*c)
{
if(pthread_mutex_init(&c->ext.lock, 0))
return 0;
return 1;
}
{
if(pthread_mutex_init(&c->ext.lock, 0))
return 0;
return 1;
}
-void _xcb_ext_destroy(
XCBConnection
*c)
+void _xcb_ext_destroy(
xcb_connection_t
*c)
{
pthread_mutex_destroy(&c->ext.lock);
while(c->ext.extensions_size-- > 0)
{
pthread_mutex_destroy(&c->ext.lock);
while(c->ext.extensions_size-- > 0)