[PATCH 4/6] Remove synchronous xcb_atom_get()

Arnaud Fontaine arnau at debian.org
Sat Sep 4 09:20:55 PDT 2010


---
 atom/atoms.gperf.m4 |   13 -------------
 atom/xcb_atom.h.m4  |   10 ----------
 2 files changed, 0 insertions(+), 23 deletions(-)

diff --git a/atom/atoms.gperf.m4 b/atom/atoms.gperf.m4
index 190e395..ea006df 100644
--- a/atom/atoms.gperf.m4
+++ b/atom/atoms.gperf.m4
@@ -39,19 +39,6 @@ define(`DO', `	OFFSET,define(`OFFSET', eval(OFFSET+1+len($1)))')dnl
 include(atomlist.m4)`'dnl
 };
 
-xcb_atom_t xcb_atom_get(xcb_connection_t *connection, const char *atom_name)
-{
-	if(atom_name == NULL)
-		return XCB_NONE;
-	xcb_intern_atom_reply_t *reply = xcb_intern_atom_reply(connection,
-		xcb_intern_atom(connection, 0, strlen(atom_name), atom_name), NULL);
-	if(!reply)
-		return XCB_NONE;
-	xcb_atom_t atom = reply->atom;
-	free(reply);
-	return atom;
-}
-
 xcb_atom_t xcb_atom_get_predefined(uint16_t name_len, const char *name)
 {
 	const struct atom_map *value = in_word_set(name, name_len);
diff --git a/atom/xcb_atom.h.m4 b/atom/xcb_atom.h.m4
index ce1473e..fe80bc0 100644
--- a/atom/xcb_atom.h.m4
+++ b/atom/xcb_atom.h.m4
@@ -19,16 +19,6 @@ typedef struct {
 	} u;
 } xcb_atom_fast_cookie_t;
 
-/**
- * @brief Get an atom synchronously.
- * @param connection The connection to the X server.
- * @param atom_name The name of the atom that should be returned.
- * @return The requested atom, or XCB_NONE if there is an error.
- *
- * xcb_atom_get() is essentially a synchronous version of xcb_intern_atom(),
- * use it only on non-performance critical execution paths.
- */
-xcb_atom_t xcb_atom_get(xcb_connection_t *connection, const char *atom_name);
 xcb_atom_t xcb_atom_get_predefined(uint16_t name_len, const char *name);
 xcb_atom_fast_cookie_t xcb_atom_get_fast(xcb_connection_t *c, uint8_t only_if_exists, uint16_t name_len, const char *name);
 xcb_atom_t xcb_atom_get_fast_reply(xcb_connection_t *c, xcb_atom_fast_cookie_t cookie, xcb_generic_error_t **e);
-- 
1.7.2.3


--=-=-=
Content-Type: text/x-diff
Content-Disposition: attachment;
 filename=0005-Remove-useless-xcb_atom_get_fast-and-xcb_atom_get_na.patch



More information about the Xcb mailing list