From: Jamey Sharp <jamey@minilop.net>
Date: Sun, 15 Oct 2006 19:34:30 +0000 (-0700)
Subject: Match only XCB-namespaced XID generators when converting to xcb_generate_id.
X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d619d14e347b9dd1d544627060023a4bca2452b;p=free-sw%2Fxcb%2Flibxcb

Match only XCB-namespaced XID generators when converting to xcb_generate_id.

Thanks to Vincent Torri for pointing out that I screwed up. :-)
---

diff --git a/tools/api_conv.pl b/tools/api_conv.pl
index 83fd82d..5b3c18d 100755
--- a/tools/api_conv.pl
+++ b/tools/api_conv.pl
@@ -59,6 +59,7 @@ sub convert($$)
 	local $_ = shift;
 	my ($fun) = @_;
 
+	return "xcb_generate_id" if /^xcb_[a-z0-9_]+_new$/ or /^XCB[A-Z0-9]+New$/;
 	return "uint$1_t" if /^CARD(8|16|32)$/;
 	return "int$1_t" if /^INT(8|16|32)$/;
 	return "uint8_t" if $_ eq 'BOOL' or $_ eq 'BYTE';
@@ -95,4 +96,3 @@ sub convert($$)
 
 s/^(\s*#\s*include\s*<)X11\/XCB\//$1xcb\//;
 s/([_A-Za-z][_A-Za-z0-9]*)([ \t]*\()?/convert($1, defined $2) . ($2 or "")/eg;
-s/xcb_[a-z0-9_]*_new/xcb_generate_id/g;