frederik
/
libxcb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow disconnecting connections that are in error state. 

In support of this, consolidate the two static error_connection
definitions into one so we don't try to free the static out-of-memory
error_connection.

Commit by Josh Triplett and Jamey Sharp.

Signed-off-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Jamey Sharp <jamey@minilop.net>
This commit is contained in:
Josh Triplett 2010-09-19 20:38:06 +02:00
parent f0565e8f06
commit 1c4717de36
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/xcb_conn.c
View File

@ -58,7 +58,7 @@ typedef struct {
uint16_t length; uint16_t length;
} xcb_setup_generic_t; } xcb_setup_generic_t;
static const int error_connection = 1; const int error_connection = 1;
static int set_fd_flags(const int fd) static int set_fd_flags(const int fd)
{ {
@ -293,7 +293,7 @@ xcb_connection_t *xcb_connect_to_fd(int fd, xcb_auth_info_t *auth_info)
void xcb_disconnect(xcb_connection_t *c) void xcb_disconnect(xcb_connection_t *c)
{ {
if(c->has_error) if(c == (xcb_connection_t *) &error_connection)
return; return;
free(c->setup); free(c->setup);

2
src/xcb_util.c
View File

@ -54,8 +54,6 @@
#include "xcbext.h" #include "xcbext.h"
#include "xcbint.h" #include "xcbint.h"
static const int error_connection = 1;
int xcb_popcount(uint32_t mask) int xcb_popcount(uint32_t mask)
{ {
uint32_t y; uint32_t y;

2
src/xcbint.h
View File

@ -174,6 +174,8 @@ void _xcb_ext_destroy(xcb_connection_t *c);
/* xcb_conn.c */ /* xcb_conn.c */
extern const int error_connection;
struct xcb_connection_t { struct xcb_connection_t {
int has_error; int has_error;