[Lsb-messages] /var/www/bzr/lsb/devel/misc-test r2334: some more xcb fixes - dynchk rebuild (bug 3351)

[Mats Wichmann]

------------------------------------------------------------
revno: 2334
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: misc-test
timestamp: Thu 2012-11-22 06:21:42 -0700
message:
  some more xcb fixes - dynchk rebuild (bug 3351)
modified:
  dynchk/libs/libxcb/xcb_get_extension_data.c
  dynchk/libs/libxcb/xcb_parse_display.c
  dynchk/libs/libxcb/xcb_prefetch_extension_data.c
-------------- next part --------------
=== modified file 'dynchk/libs/libxcb/xcb_get_extension_data.c'
--- a/dynchk/libs/libxcb/xcb_get_extension_data.c	2012-11-19 14:43:12 +0000
+++ b/dynchk/libs/libxcb/xcb_get_extension_data.c	2012-11-22 13:21:42 +0000
@@ -4,11 +4,12 @@
 #include "../../misc/lsb_output.h"
 #include "stdlib.h"
 #include <xcb/xcb.h>
+#include <xcb/xcbext.h>
 #undef xcb_get_extension_data
-static const xcb_query_extension_reply_t *(*funcptr) (xcb_connection_t * , xcb_extension_t * ) = 0;
+static const xcb_query_extension_reply_t *(*funcptr) (xcb_connection_t * , struct xcb_extension_t * ) = 0;
 
 extern int __lsb_check_params;
-const xcb_query_extension_reply_t * xcb_get_extension_data (xcb_connection_t * arg0 , xcb_extension_t * arg1 )
+const xcb_query_extension_reply_t * xcb_get_extension_data (xcb_connection_t * arg0 , struct xcb_extension_t * arg1 )
 {
 	int reset_flag = __lsb_check_params;
 	const xcb_query_extension_reply_t * ret_value  ;

=== modified file 'dynchk/libs/libxcb/xcb_parse_display.c'
--- a/dynchk/libs/libxcb/xcb_parse_display.c	2012-11-19 14:43:12 +0000
+++ b/dynchk/libs/libxcb/xcb_parse_display.c	2012-11-22 13:21:42 +0000
@@ -5,10 +5,10 @@
 #include "stdlib.h"
 #include <xcb/xcb.h>
 #undef xcb_parse_display
-static int(*funcptr) (const char * , int * , int * ) = 0;
+static int(*funcptr) (const char * , char * * , int * , int * ) = 0;
 
 extern int __lsb_check_params;
-int xcb_parse_display (const char * arg0 , int * arg1 , int * arg2 )
+int xcb_parse_display (const char * arg0 , char * * arg1 , int * arg2 , int * arg3 )
 {
 	int reset_flag = __lsb_check_params;
 	int ret_value  ;
@@ -28,15 +28,19 @@
 		}
 		validate_NULL_TYPETYPE(  arg0, "xcb_parse_display - arg0 (name)");
 		if( arg1 ) {
-		validate_RWaddress( arg1, "xcb_parse_display - arg1 (display)");
+		validate_RWaddress( arg1, "xcb_parse_display - arg1 (host)");
 		}
-		validate_NULL_TYPETYPE(  arg1, "xcb_parse_display - arg1 (display)");
+		validate_NULL_TYPETYPE(  arg1, "xcb_parse_display - arg1 (host)");
 		if( arg2 ) {
-		validate_RWaddress( arg2, "xcb_parse_display - arg2 (screen)");
-		}
-		validate_NULL_TYPETYPE(  arg2, "xcb_parse_display - arg2 (screen)");
+		validate_RWaddress( arg2, "xcb_parse_display - arg2 (display)");
+		}
+		validate_NULL_TYPETYPE(  arg2, "xcb_parse_display - arg2 (display)");
+		if( arg3 ) {
+		validate_RWaddress( arg3, "xcb_parse_display - arg3 (screen)");
+		}
+		validate_NULL_TYPETYPE(  arg3, "xcb_parse_display - arg3 (screen)");
 	}
-	ret_value = funcptr(arg0, arg1, arg2);
+	ret_value = funcptr(arg0, arg1, arg2, arg3);
 	__lsb_check_params = reset_flag;
 	return ret_value;
 }

=== modified file 'dynchk/libs/libxcb/xcb_prefetch_extension_data.c'
--- a/dynchk/libs/libxcb/xcb_prefetch_extension_data.c	2012-11-19 14:43:12 +0000
+++ b/dynchk/libs/libxcb/xcb_prefetch_extension_data.c	2012-11-22 13:21:42 +0000
@@ -4,11 +4,12 @@
 #include "../../misc/lsb_output.h"
 #include "stdlib.h"
 #include <xcb/xcb.h>
+#include <xcb/xcbext.h>
 #undef xcb_prefetch_extension_data
-static void(*funcptr) (xcb_connection_t * , xcb_extension_t * ) = 0;
+static void(*funcptr) (xcb_connection_t * , struct xcb_extension_t * ) = 0;
 
 extern int __lsb_check_params;
-void xcb_prefetch_extension_data (xcb_connection_t * arg0 , xcb_extension_t * arg1 )
+void xcb_prefetch_extension_data (xcb_connection_t * arg0 , struct xcb_extension_t * arg1 )
 {
 	int reset_flag = __lsb_check_params;
 	__lsb_output(4, "Invoking wrapper for xcb_prefetch_extension_data()");