[Lsb-messages] /var/www/bzr/lsb/devel/misc-test r2340: regen dynchk, now it works again
Mats Wichmann
mats at linuxfoundation.org
Thu Dec 20 19:43:34 UTC 2012
------------------------------------------------------------
revno: 2340
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: misc-test
timestamp: Thu 2012-12-20 12:43:34 -0700
message:
regen dynchk, now it works again
removed:
dynchk/libs/libgio-2.0/g_io_module_load.c
dynchk/libs/libgio-2.0/g_io_module_query.c
dynchk/libs/libgio-2.0/g_io_module_unload.c
added:
dynchk/tests/struct/validate_struct__PangoXftRenderer.c
modified:
dynchk/libs/libXft/XftDrawChange.c
dynchk/libs/libXft/XftDrawCharFontSpec.c
dynchk/libs/libXft/XftDrawCharSpec.c
dynchk/libs/libXft/XftDrawColormap.c
dynchk/libs/libXft/XftDrawDestroy.c
dynchk/libs/libXft/XftDrawDisplay.c
dynchk/libs/libXft/XftDrawDrawable.c
dynchk/libs/libXft/XftDrawGlyphFontSpec.c
dynchk/libs/libXft/XftDrawGlyphSpec.c
dynchk/libs/libXft/XftDrawGlyphs.c
dynchk/libs/libXft/XftDrawPicture.c
dynchk/libs/libXft/XftDrawRect.c
dynchk/libs/libXft/XftDrawSetClip.c
dynchk/libs/libXft/XftDrawSetClipRectangles.c
dynchk/libs/libXft/XftDrawSetSubwindowMode.c
dynchk/libs/libXft/XftDrawSrcPicture.c
dynchk/libs/libXft/XftDrawString16.c
dynchk/libs/libXft/XftDrawString32.c
dynchk/libs/libXft/XftDrawString8.c
dynchk/libs/libXft/XftDrawStringUtf16.c
dynchk/libs/libXft/XftDrawStringUtf8.c
dynchk/libs/libXft/XftDrawVisual.c
dynchk/libs/libgio-2.0/g_action_get_parameter_type.c
dynchk/libs/libgio-2.0/g_action_get_state_type.c
dynchk/libs/libgio-2.0/g_action_group_get_action_parameter_type.c
dynchk/libs/libgio-2.0/g_action_group_get_action_state_type.c
dynchk/libs/libgio-2.0/g_dbus_connection_register_subtree.c
dynchk/libs/libgio-2.0/g_dbus_error_register_error_domain.c
dynchk/libs/libgio-2.0/g_simple_action_new.c
dynchk/libs/libgio-2.0/g_simple_action_new_stateful.c
dynchk/libs/libgio-2.0/gen.mk
dynchk/libs/libpangoxft-1.0/pango_xft_render.c
dynchk/libs/libpangoxft-1.0/pango_xft_render_layout.c
dynchk/libs/libpangoxft-1.0/pango_xft_render_layout_line.c
dynchk/libs/libpangoxft-1.0/pango_xft_render_transformed.c
dynchk/libs/libpangoxft-1.0/pango_xft_renderer_get_type.c
dynchk/libs/libpangoxft-1.0/pango_xft_renderer_new.c
dynchk/libs/libpangoxft-1.0/pango_xft_renderer_set_default_color.c
dynchk/libs/libpangoxft-1.0/pango_xft_renderer_set_draw.c
dynchk/tests/struct.mk
dynchk/tests/struct_tests.h
-------------- next part --------------
=== modified file 'dynchk/libs/libXft/XftDrawChange.c'
--- a/dynchk/libs/libXft/XftDrawChange.c 2012-06-26 07:14:59 +0000
+++ b/dynchk/libs/libXft/XftDrawChange.c 2012-12-20 19:43:34 +0000
@@ -3,9 +3,8 @@
#include "../../tests/type_tests.h"
#include "../../misc/lsb_output.h"
#include "stdlib.h"
-#include <pango-1.0/pango/pangoxft.h>
+#include <X11/Xft/Xft.h>
#include <X11/X.h>
-#include <X11/Xft/Xft.h>
#undef XftDrawChange
static void(*funcptr) (XftDraw * , Drawable ) = 0;
=== modified file 'dynchk/libs/libXft/XftDrawCharFontSpec.c'
--- a/dynchk/libs/libXft/XftDrawCharFontSpec.c 2012-06-26 07:14:59 +0000
+++ b/dynchk/libs/libXft/XftDrawCharFontSpec.c 2012-12-20 19:43:34 +0000
@@ -3,7 +3,6 @@
#include "../../tests/type_tests.h"
#include "../../misc/lsb_output.h"
#include "stdlib.h"
-#include <pango-1.0/pango/pangoxft.h>
#include <X11/Xft/Xft.h>
#undef XftDrawCharFontSpec
static void(*funcptr) (XftDraw * , const XftColor * , const XftCharFontSpec * , int ) = 0;
=== modified file 'dynchk/libs/libXft/XftDrawCharSpec.c'
--- a/dynchk/libs/libXft/XftDrawCharSpec.c 2012-06-26 07:14:59 +0000
+++ b/dynchk/libs/libXft/XftDrawCharSpec.c 2012-12-20 19:43:34 +0000
@@ -3,7 +3,6 @@
#include "../../tests/type_tests.h"
#include "../../misc/lsb_output.h"
#include "stdlib.h"
-#include <pango-1.0/pango/pangoxft.h>
#include <X11/Xft/Xft.h>
#undef XftDrawCharSpec
static void(*funcptr) (XftDraw * , const XftColor * , XftFont * , const XftCharSpec * , int ) = 0;
=== modified file 'dynchk/libs/libXft/XftDrawColormap.c'
--- a/dynchk/libs/libXft/XftDrawColormap.c 2012-06-26 07:14:59 +0000
+++ b/dynchk/libs/libXft/XftDrawColormap.c 2012-12-20 19:43:34 +0000
@@ -3,7 +3,6 @@
#include "../../tests/type_tests.h"
#include "../../misc/lsb_output.h"
#include "stdlib.h"
-#include <pango-1.0/pango/pangoxft.h>
#include <X11/Xft/Xft.h>
#undef XftDrawColormap
static Colormap(*funcptr) (XftDraw * ) = 0;
=== modified file 'dynchk/libs/libXft/XftDrawDestroy.c'
--- a/dynchk/libs/libXft/XftDrawDestroy.c 2012-06-26 07:14:59 +0000
+++ b/dynchk/libs/libXft/XftDrawDestroy.c 2012-12-20 19:43:34 +0000
@@ -3,7 +3,6 @@
#include "../../tests/type_tests.h"
#include "../../misc/lsb_output.h"
#include "stdlib.h"
-#include <pango-1.0/pango/pangoxft.h>
#include <X11/Xft/Xft.h>
#undef XftDrawDestroy
static void(*funcptr) (XftDraw * ) = 0;
=== modified file 'dynchk/libs/libXft/XftDrawDisplay.c'
--- a/dynchk/libs/libXft/XftDrawDisplay.c 2012-06-26 07:14:59 +0000
+++ b/dynchk/libs/libXft/XftDrawDisplay.c 2012-12-20 19:43:34 +0000
@@ -3,7 +3,6 @@
#include "../../tests/type_tests.h"
#include "../../misc/lsb_output.h"
#include "stdlib.h"
-#include <pango-1.0/pango/pangoxft.h>
#include <X11/Xft/Xft.h>
#undef XftDrawDisplay
static Display *(*funcptr) (XftDraw * ) = 0;
=== modified file 'dynchk/libs/libXft/XftDrawDrawable.c'
--- a/dynchk/libs/libXft/XftDrawDrawable.c 2012-06-26 07:14:59 +0000
+++ b/dynchk/libs/libXft/XftDrawDrawable.c 2012-12-20 19:43:34 +0000
@@ -3,7 +3,6 @@
#include "../../tests/type_tests.h"
#include "../../misc/lsb_output.h"
#include "stdlib.h"
-#include <pango-1.0/pango/pangoxft.h>
#include <X11/Xft/Xft.h>
#undef XftDrawDrawable
static Drawable(*funcptr) (XftDraw * ) = 0;
=== modified file 'dynchk/libs/libXft/XftDrawGlyphFontSpec.c'
--- a/dynchk/libs/libXft/XftDrawGlyphFontSpec.c 2012-06-26 07:14:59 +0000
+++ b/dynchk/libs/libXft/XftDrawGlyphFontSpec.c 2012-12-20 19:43:34 +0000
@@ -3,7 +3,6 @@
#include "../../tests/type_tests.h"
#include "../../misc/lsb_output.h"
#include "stdlib.h"
-#include <pango-1.0/pango/pangoxft.h>
#include <X11/Xft/Xft.h>
#undef XftDrawGlyphFontSpec
static void(*funcptr) (XftDraw * , const XftColor * , const XftGlyphFontSpec * , int ) = 0;
=== modified file 'dynchk/libs/libXft/XftDrawGlyphSpec.c'
--- a/dynchk/libs/libXft/XftDrawGlyphSpec.c 2012-06-26 07:14:59 +0000
+++ b/dynchk/libs/libXft/XftDrawGlyphSpec.c 2012-12-20 19:43:34 +0000
@@ -3,7 +3,6 @@
#include "../../tests/type_tests.h"
#include "../../misc/lsb_output.h"
#include "stdlib.h"
-#include <pango-1.0/pango/pangoxft.h>
#include <X11/Xft/Xft.h>
#undef XftDrawGlyphSpec
static void(*funcptr) (XftDraw * , const XftColor * , XftFont * , const XftGlyphSpec * , int ) = 0;
=== modified file 'dynchk/libs/libXft/XftDrawGlyphs.c'
--- a/dynchk/libs/libXft/XftDrawGlyphs.c 2012-06-26 07:14:59 +0000
+++ b/dynchk/libs/libXft/XftDrawGlyphs.c 2012-12-20 19:43:34 +0000
@@ -3,7 +3,6 @@
#include "../../tests/type_tests.h"
#include "../../misc/lsb_output.h"
#include "stdlib.h"
-#include <pango-1.0/pango/pangoxft.h>
#include <X11/Xft/Xft.h>
#undef XftDrawGlyphs
static void(*funcptr) (XftDraw * , const XftColor * , XftFont * , int , int , const FT_UInt * , int ) = 0;
=== modified file 'dynchk/libs/libXft/XftDrawPicture.c'
--- a/dynchk/libs/libXft/XftDrawPicture.c 2012-06-26 07:14:59 +0000
+++ b/dynchk/libs/libXft/XftDrawPicture.c 2012-12-20 19:43:34 +0000
@@ -3,7 +3,6 @@
#include "../../tests/type_tests.h"
#include "../../misc/lsb_output.h"
#include "stdlib.h"
-#include <pango-1.0/pango/pangoxft.h>
#include <X11/Xft/Xft.h>
#undef XftDrawPicture
static Picture(*funcptr) (XftDraw * ) = 0;
=== modified file 'dynchk/libs/libXft/XftDrawRect.c'
--- a/dynchk/libs/libXft/XftDrawRect.c 2012-06-26 07:14:59 +0000
+++ b/dynchk/libs/libXft/XftDrawRect.c 2012-12-20 19:43:34 +0000
@@ -3,7 +3,6 @@
#include "../../tests/type_tests.h"
#include "../../misc/lsb_output.h"
#include "stdlib.h"
-#include <pango-1.0/pango/pangoxft.h>
#include <X11/Xft/Xft.h>
#undef XftDrawRect
static void(*funcptr) (XftDraw * , const XftColor * , int , int , unsigned int , unsigned int ) = 0;
=== modified file 'dynchk/libs/libXft/XftDrawSetClip.c'
--- a/dynchk/libs/libXft/XftDrawSetClip.c 2012-06-26 07:14:59 +0000
+++ b/dynchk/libs/libXft/XftDrawSetClip.c 2012-12-20 19:43:34 +0000
@@ -3,9 +3,8 @@
#include "../../tests/type_tests.h"
#include "../../misc/lsb_output.h"
#include "stdlib.h"
-#include <pango-1.0/pango/pangoxft.h>
+#include <X11/Xft/Xft.h>
#include <X11/Xutil.h>
-#include <X11/Xft/Xft.h>
#undef XftDrawSetClip
static int(*funcptr) (XftDraw * , Region ) = 0;
=== modified file 'dynchk/libs/libXft/XftDrawSetClipRectangles.c'
--- a/dynchk/libs/libXft/XftDrawSetClipRectangles.c 2012-06-26 07:14:59 +0000
+++ b/dynchk/libs/libXft/XftDrawSetClipRectangles.c 2012-12-20 19:43:34 +0000
@@ -3,9 +3,8 @@
#include "../../tests/type_tests.h"
#include "../../misc/lsb_output.h"
#include "stdlib.h"
-#include <pango-1.0/pango/pangoxft.h>
+#include <X11/Xft/Xft.h>
#include <X11/extensions/Xrender.h>
-#include <X11/Xft/Xft.h>
#undef XftDrawSetClipRectangles
static int(*funcptr) (XftDraw * , int , int , const XRectangle * , int ) = 0;
=== modified file 'dynchk/libs/libXft/XftDrawSetSubwindowMode.c'
--- a/dynchk/libs/libXft/XftDrawSetSubwindowMode.c 2012-06-26 07:14:59 +0000
+++ b/dynchk/libs/libXft/XftDrawSetSubwindowMode.c 2012-12-20 19:43:34 +0000
@@ -3,7 +3,6 @@
#include "../../tests/type_tests.h"
#include "../../misc/lsb_output.h"
#include "stdlib.h"
-#include <pango-1.0/pango/pangoxft.h>
#include <X11/Xft/Xft.h>
#undef XftDrawSetSubwindowMode
static void(*funcptr) (XftDraw * , int ) = 0;
=== modified file 'dynchk/libs/libXft/XftDrawSrcPicture.c'
--- a/dynchk/libs/libXft/XftDrawSrcPicture.c 2012-06-26 07:14:59 +0000
+++ b/dynchk/libs/libXft/XftDrawSrcPicture.c 2012-12-20 19:43:34 +0000
@@ -3,7 +3,6 @@
#include "../../tests/type_tests.h"
#include "../../misc/lsb_output.h"
#include "stdlib.h"
-#include <pango-1.0/pango/pangoxft.h>
#include <X11/Xft/Xft.h>
#undef XftDrawSrcPicture
static Picture(*funcptr) (XftDraw * , const XftColor * ) = 0;
=== modified file 'dynchk/libs/libXft/XftDrawString16.c'
--- a/dynchk/libs/libXft/XftDrawString16.c 2012-06-26 07:14:59 +0000
+++ b/dynchk/libs/libXft/XftDrawString16.c 2012-12-20 19:43:34 +0000
@@ -3,7 +3,6 @@
#include "../../tests/type_tests.h"
#include "../../misc/lsb_output.h"
#include "stdlib.h"
-#include <pango-1.0/pango/pangoxft.h>
#include <X11/Xft/Xft.h>
#undef XftDrawString16
static void(*funcptr) (XftDraw * , const XftColor * , XftFont * , int , int , const FcChar16 * , int ) = 0;
=== modified file 'dynchk/libs/libXft/XftDrawString32.c'
--- a/dynchk/libs/libXft/XftDrawString32.c 2012-06-26 07:14:59 +0000
+++ b/dynchk/libs/libXft/XftDrawString32.c 2012-12-20 19:43:34 +0000
@@ -3,7 +3,6 @@
#include "../../tests/type_tests.h"
#include "../../misc/lsb_output.h"
#include "stdlib.h"
-#include <pango-1.0/pango/pangoxft.h>
#include <X11/Xft/Xft.h>
#undef XftDrawString32
static void(*funcptr) (XftDraw * , const XftColor * , XftFont * , int , int , const FcChar32 * , int ) = 0;
=== modified file 'dynchk/libs/libXft/XftDrawString8.c'
--- a/dynchk/libs/libXft/XftDrawString8.c 2012-06-26 07:14:59 +0000
+++ b/dynchk/libs/libXft/XftDrawString8.c 2012-12-20 19:43:34 +0000
@@ -3,7 +3,6 @@
#include "../../tests/type_tests.h"
#include "../../misc/lsb_output.h"
#include "stdlib.h"
-#include <pango-1.0/pango/pangoxft.h>
#include <X11/Xft/Xft.h>
#include <fontconfig/fontconfig.h>
#undef XftDrawString8
=== modified file 'dynchk/libs/libXft/XftDrawStringUtf16.c'
--- a/dynchk/libs/libXft/XftDrawStringUtf16.c 2012-06-26 07:14:59 +0000
+++ b/dynchk/libs/libXft/XftDrawStringUtf16.c 2012-12-20 19:43:34 +0000
@@ -3,7 +3,6 @@
#include "../../tests/type_tests.h"
#include "../../misc/lsb_output.h"
#include "stdlib.h"
-#include <pango-1.0/pango/pangoxft.h>
#include <X11/Xft/Xft.h>
#include <fontconfig/fontconfig.h>
#undef XftDrawStringUtf16
=== modified file 'dynchk/libs/libXft/XftDrawStringUtf8.c'
--- a/dynchk/libs/libXft/XftDrawStringUtf8.c 2012-06-26 07:14:59 +0000
+++ b/dynchk/libs/libXft/XftDrawStringUtf8.c 2012-12-20 19:43:34 +0000
@@ -3,7 +3,6 @@
#include "../../tests/type_tests.h"
#include "../../misc/lsb_output.h"
#include "stdlib.h"
-#include <pango-1.0/pango/pangoxft.h>
#include <X11/Xft/Xft.h>
#include <fontconfig/fontconfig.h>
#undef XftDrawStringUtf8
=== modified file 'dynchk/libs/libXft/XftDrawVisual.c'
--- a/dynchk/libs/libXft/XftDrawVisual.c 2012-06-26 07:14:59 +0000
+++ b/dynchk/libs/libXft/XftDrawVisual.c 2012-12-20 19:43:34 +0000
@@ -3,7 +3,6 @@
#include "../../tests/type_tests.h"
#include "../../misc/lsb_output.h"
#include "stdlib.h"
-#include <pango-1.0/pango/pangoxft.h>
#include <X11/Xft/Xft.h>
#undef XftDrawVisual
static Visual *(*funcptr) (XftDraw * ) = 0;
=== modified file 'dynchk/libs/libgio-2.0/g_action_get_parameter_type.c'
--- a/dynchk/libs/libgio-2.0/g_action_get_parameter_type.c 2012-12-13 14:29:07 +0000
+++ b/dynchk/libs/libgio-2.0/g_action_get_parameter_type.c 2012-12-20 19:43:34 +0000
@@ -6,13 +6,13 @@
#include <glib-2.0/gio/giotypes.h>
#include <glib-2.0/gio/gaction.h>
#undef g_action_get_parameter_type
-static (*funcptr)(GAction * ) = 0;
+static GVariantType *(*funcptr) (GAction * ) = 0;
extern int __lsb_check_params;
- g_action_get_parameter_type(GAction * arg0 )
+GVariantType * g_action_get_parameter_type (GAction * arg0 )
{
int reset_flag = __lsb_check_params;
- ret_value ;
+ GVariantType * ret_value ;
__lsb_output(4, "Invoking wrapper for g_action_get_parameter_type()");
if(!funcptr)
funcptr = dlsym(RTLD_NEXT, "g_action_get_parameter_type");
=== modified file 'dynchk/libs/libgio-2.0/g_action_get_state_type.c'
--- a/dynchk/libs/libgio-2.0/g_action_get_state_type.c 2012-12-13 14:29:07 +0000
+++ b/dynchk/libs/libgio-2.0/g_action_get_state_type.c 2012-12-20 19:43:34 +0000
@@ -6,13 +6,13 @@
#include <glib-2.0/gio/giotypes.h>
#include <glib-2.0/gio/gaction.h>
#undef g_action_get_state_type
-static (*funcptr)(GAction * ) = 0;
+static GVariantType *(*funcptr) (GAction * ) = 0;
extern int __lsb_check_params;
- g_action_get_state_type(GAction * arg0 )
+GVariantType * g_action_get_state_type (GAction * arg0 )
{
int reset_flag = __lsb_check_params;
- ret_value ;
+ GVariantType * ret_value ;
__lsb_output(4, "Invoking wrapper for g_action_get_state_type()");
if(!funcptr)
funcptr = dlsym(RTLD_NEXT, "g_action_get_state_type");
=== modified file 'dynchk/libs/libgio-2.0/g_action_group_get_action_parameter_type.c'
--- a/dynchk/libs/libgio-2.0/g_action_group_get_action_parameter_type.c 2012-12-13 14:29:07 +0000
+++ b/dynchk/libs/libgio-2.0/g_action_group_get_action_parameter_type.c 2012-12-20 19:43:34 +0000
@@ -6,13 +6,13 @@
#include <glib-2.0/gio/giotypes.h>
#include <glib-2.0/gio/gactiongroup.h>
#undef g_action_group_get_action_parameter_type
-static (*funcptr)(GActionGroup * , const char * ) = 0;
+static GVariantType *(*funcptr) (GActionGroup * , const char * ) = 0;
extern int __lsb_check_params;
- g_action_group_get_action_parameter_type(GActionGroup * arg0 , const char * arg1 )
+GVariantType * g_action_group_get_action_parameter_type (GActionGroup * arg0 , const char * arg1 )
{
int reset_flag = __lsb_check_params;
- ret_value ;
+ GVariantType * ret_value ;
__lsb_output(4, "Invoking wrapper for g_action_group_get_action_parameter_type()");
if(!funcptr)
funcptr = dlsym(RTLD_NEXT, "g_action_group_get_action_parameter_type");
=== modified file 'dynchk/libs/libgio-2.0/g_action_group_get_action_state_type.c'
--- a/dynchk/libs/libgio-2.0/g_action_group_get_action_state_type.c 2012-12-13 14:29:07 +0000
+++ b/dynchk/libs/libgio-2.0/g_action_group_get_action_state_type.c 2012-12-20 19:43:34 +0000
@@ -6,13 +6,13 @@
#include <glib-2.0/gio/giotypes.h>
#include <glib-2.0/gio/gactiongroup.h>
#undef g_action_group_get_action_state_type
-static (*funcptr)(GActionGroup * , const char * ) = 0;
+static GVariantType *(*funcptr) (GActionGroup * , const char * ) = 0;
extern int __lsb_check_params;
- g_action_group_get_action_state_type(GActionGroup * arg0 , const char * arg1 )
+GVariantType * g_action_group_get_action_state_type (GActionGroup * arg0 , const char * arg1 )
{
int reset_flag = __lsb_check_params;
- ret_value ;
+ GVariantType * ret_value ;
__lsb_output(4, "Invoking wrapper for g_action_group_get_action_state_type()");
if(!funcptr)
funcptr = dlsym(RTLD_NEXT, "g_action_group_get_action_state_type");
=== modified file 'dynchk/libs/libgio-2.0/g_dbus_connection_register_subtree.c'
--- a/dynchk/libs/libgio-2.0/g_dbus_connection_register_subtree.c 2012-12-13 14:29:07 +0000
+++ b/dynchk/libs/libgio-2.0/g_dbus_connection_register_subtree.c 2012-12-20 19:43:34 +0000
@@ -5,13 +5,13 @@
#include "stdlib.h"
#include <glib-2.0/gio/giotypes.h>
#include <glib-2.0/glib.h>
+#include <glib-2.0/gio/gdbusconnection.h>
#include <glib-2.0/gio/gioenums.h>
-#include <glib-2.0/gio/gdbusconnection.h>
#undef g_dbus_connection_register_subtree
-static guint(*funcptr) (GDBusConnection * , const gchar * , , GDBusSubtreeFlags , void * , GDestroyNotify , GError * * ) = 0;
+static guint(*funcptr) (GDBusConnection * , const gchar * , const GDBusSubtreeVTable * , GDBusSubtreeFlags , void * , GDestroyNotify , GError * * ) = 0;
extern int __lsb_check_params;
-guint g_dbus_connection_register_subtree (GDBusConnection * arg0 , const gchar * arg1 , arg2, GDBusSubtreeFlags arg3 , void * arg4 , GDestroyNotify arg5 , GError * * arg6 )
+guint g_dbus_connection_register_subtree (GDBusConnection * arg0 , const gchar * arg1 , const GDBusSubtreeVTable * arg2 , GDBusSubtreeFlags arg3 , void * arg4 , GDestroyNotify arg5 , GError * * arg6 )
{
int reset_flag = __lsb_check_params;
guint ret_value ;
@@ -34,7 +34,10 @@
validate_Rdaddress( arg1, "g_dbus_connection_register_subtree - arg1 (object_path)");
}
validate_NULL_TYPETYPE( arg1, "g_dbus_connection_register_subtree - arg1 (object_path)");
- validate_UNSET_TYPETYPE( arg2, "g_dbus_connection_register_subtree - arg2 (vtable)");
+ if( arg2 ) {
+ validate_Rdaddress( arg2, "g_dbus_connection_register_subtree - arg2 (vtable)");
+ }
+ validate_NULL_TYPETYPE( arg2, "g_dbus_connection_register_subtree - arg2 (vtable)");
validate_NULL_TYPETYPE( arg3, "g_dbus_connection_register_subtree - arg3 (flags)");
if( arg4 ) {
validate_RWaddress( arg4, "g_dbus_connection_register_subtree - arg4 (user_data)");
=== modified file 'dynchk/libs/libgio-2.0/g_dbus_error_register_error_domain.c'
--- a/dynchk/libs/libgio-2.0/g_dbus_error_register_error_domain.c 2012-12-13 14:29:07 +0000
+++ b/dynchk/libs/libgio-2.0/g_dbus_error_register_error_domain.c 2012-12-20 19:43:34 +0000
@@ -6,10 +6,10 @@
#include <glib-2.0/glib.h>
#include <glib-2.0/gio/gdbuserror.h>
#undef g_dbus_error_register_error_domain
-static void(*funcptr) (const gchar * , gsize volatile * , , guint ) = 0;
+static void(*funcptr) (const gchar * , gsize volatile * , const GDBusErrorEntry * , guint ) = 0;
extern int __lsb_check_params;
-void g_dbus_error_register_error_domain (const gchar * arg0 , gsize volatile * arg1 , arg2, guint arg3 )
+void g_dbus_error_register_error_domain (const gchar * arg0 , gsize volatile * arg1 , const GDBusErrorEntry * arg2 , guint arg3 )
{
int reset_flag = __lsb_check_params;
__lsb_output(4, "Invoking wrapper for g_dbus_error_register_error_domain()");
@@ -31,7 +31,10 @@
validate_RWaddress( arg1, "g_dbus_error_register_error_domain - arg1 (quark_volatile)");
}
validate_NULL_TYPETYPE( arg1, "g_dbus_error_register_error_domain - arg1 (quark_volatile)");
- validate_UNSET_TYPETYPE( arg2, "g_dbus_error_register_error_domain - arg2 (entries)");
+ if( arg2 ) {
+ validate_Rdaddress( arg2, "g_dbus_error_register_error_domain - arg2 (entries)");
+ }
+ validate_NULL_TYPETYPE( arg2, "g_dbus_error_register_error_domain - arg2 (entries)");
validate_NULL_TYPETYPE( arg3, "g_dbus_error_register_error_domain - arg3 (num_entries)");
}
funcptr(arg0, arg1, arg2, arg3);
=== removed file 'dynchk/libs/libgio-2.0/g_io_module_load.c'
--- a/dynchk/libs/libgio-2.0/g_io_module_load.c 2012-12-13 14:29:07 +0000
+++ b/dynchk/libs/libgio-2.0/g_io_module_load.c 1970-01-01 00:00:00 +0000
@@ -1,34 +0,0 @@
-// Generated by gen_lib.pl
-
-#include "../../tests/type_tests.h"
-#include "../../misc/lsb_output.h"
-#include "stdlib.h"
-#include <glib-2.0/gio/giotypes.h>
-#include <glib-2.0/gio/giomodule.h>
-#undef g_io_module_load
-static void(*funcptr) (GIOModule * ) = 0;
-
-extern int __lsb_check_params;
-void g_io_module_load (GIOModule * arg0 )
-{
- int reset_flag = __lsb_check_params;
- __lsb_output(4, "Invoking wrapper for g_io_module_load()");
- if(!funcptr)
- funcptr = dlsym(RTLD_NEXT, "g_io_module_load");
- if(!funcptr) {
- __lsb_output(-1, "Failed to load g_io_module_load. Probably the library was loaded using dlopen, we don't support this at the moment.");
- exit(1);
- }
- if(__lsb_check_params)
- {
- __lsb_check_params=0;
- __lsb_output(4, "g_io_module_load() - validating");
- if( arg0 ) {
- validate_RWaddress( arg0, "g_io_module_load - arg0 (module)");
- }
- validate_NULL_TYPETYPE( arg0, "g_io_module_load - arg0 (module)");
- }
- funcptr(arg0);
- __lsb_check_params = reset_flag;
-}
-
=== removed file 'dynchk/libs/libgio-2.0/g_io_module_query.c'
--- a/dynchk/libs/libgio-2.0/g_io_module_query.c 2012-12-13 14:29:07 +0000
+++ b/dynchk/libs/libgio-2.0/g_io_module_query.c 1970-01-01 00:00:00 +0000
@@ -1,29 +0,0 @@
-// Generated by gen_lib.pl
-
-#include "../../tests/type_tests.h"
-#include "../../misc/lsb_output.h"
-#include "stdlib.h"
-#include <glib-2.0/gio/giomodule.h>
-#undef g_io_module_query
-static void(*funcptr) () = 0;
-
-extern int __lsb_check_params;
-void g_io_module_query ()
-{
- int reset_flag = __lsb_check_params;
- __lsb_output(4, "Invoking wrapper for g_io_module_query()");
- if(!funcptr)
- funcptr = dlsym(RTLD_NEXT, "g_io_module_query");
- if(!funcptr) {
- __lsb_output(-1, "Failed to load g_io_module_query. Probably the library was loaded using dlopen, we don't support this at the moment.");
- exit(1);
- }
- if(__lsb_check_params)
- {
- __lsb_check_params=0;
- __lsb_output(4, "g_io_module_query() - validating");
- }
- funcptr();
- __lsb_check_params = reset_flag;
-}
-
=== removed file 'dynchk/libs/libgio-2.0/g_io_module_unload.c'
--- a/dynchk/libs/libgio-2.0/g_io_module_unload.c 2012-12-13 14:29:07 +0000
+++ b/dynchk/libs/libgio-2.0/g_io_module_unload.c 1970-01-01 00:00:00 +0000
@@ -1,34 +0,0 @@
-// Generated by gen_lib.pl
-
-#include "../../tests/type_tests.h"
-#include "../../misc/lsb_output.h"
-#include "stdlib.h"
-#include <glib-2.0/gio/giotypes.h>
-#include <glib-2.0/gio/giomodule.h>
-#undef g_io_module_unload
-static void(*funcptr) (GIOModule * ) = 0;
-
-extern int __lsb_check_params;
-void g_io_module_unload (GIOModule * arg0 )
-{
- int reset_flag = __lsb_check_params;
- __lsb_output(4, "Invoking wrapper for g_io_module_unload()");
- if(!funcptr)
- funcptr = dlsym(RTLD_NEXT, "g_io_module_unload");
- if(!funcptr) {
- __lsb_output(-1, "Failed to load g_io_module_unload. Probably the library was loaded using dlopen, we don't support this at the moment.");
- exit(1);
- }
- if(__lsb_check_params)
- {
- __lsb_check_params=0;
- __lsb_output(4, "g_io_module_unload() - validating");
- if( arg0 ) {
- validate_RWaddress( arg0, "g_io_module_unload - arg0 (module)");
- }
- validate_NULL_TYPETYPE( arg0, "g_io_module_unload - arg0 (module)");
- }
- funcptr(arg0);
- __lsb_check_params = reset_flag;
-}
-
=== modified file 'dynchk/libs/libgio-2.0/g_simple_action_new.c'
--- a/dynchk/libs/libgio-2.0/g_simple_action_new.c 2012-12-13 14:29:07 +0000
+++ b/dynchk/libs/libgio-2.0/g_simple_action_new.c 2012-12-20 19:43:34 +0000
@@ -6,10 +6,10 @@
#include <glib-2.0/glib.h>
#include <glib-2.0/gio/gsimpleaction.h>
#undef g_simple_action_new
-static GSimpleAction *(*funcptr) (const gchar * , ) = 0;
+static GSimpleAction *(*funcptr) (const gchar * , GVariantType * ) = 0;
extern int __lsb_check_params;
-GSimpleAction * g_simple_action_new (const gchar * arg0 , arg1)
+GSimpleAction * g_simple_action_new (const gchar * arg0 , GVariantType * arg1 )
{
int reset_flag = __lsb_check_params;
GSimpleAction * ret_value ;
@@ -28,7 +28,10 @@
validate_Rdaddress( arg0, "g_simple_action_new - arg0 (name)");
}
validate_NULL_TYPETYPE( arg0, "g_simple_action_new - arg0 (name)");
- validate_UNSET_TYPETYPE( arg1, "g_simple_action_new - arg1 (parameter_type)");
+ if( arg1 ) {
+ validate_RWaddress( arg1, "g_simple_action_new - arg1 (parameter_type)");
+ }
+ validate_NULL_TYPETYPE( arg1, "g_simple_action_new - arg1 (parameter_type)");
}
ret_value = funcptr(arg0, arg1);
__lsb_check_params = reset_flag;
=== modified file 'dynchk/libs/libgio-2.0/g_simple_action_new_stateful.c'
--- a/dynchk/libs/libgio-2.0/g_simple_action_new_stateful.c 2012-12-13 14:29:07 +0000
+++ b/dynchk/libs/libgio-2.0/g_simple_action_new_stateful.c 2012-12-20 19:43:34 +0000
@@ -6,10 +6,10 @@
#include <glib-2.0/glib.h>
#include <glib-2.0/gio/gsimpleaction.h>
#undef g_simple_action_new_stateful
-static GSimpleAction *(*funcptr) (const gchar * , , GVariant * ) = 0;
+static GSimpleAction *(*funcptr) (const gchar * , GVariantType * , GVariant * ) = 0;
extern int __lsb_check_params;
-GSimpleAction * g_simple_action_new_stateful (const gchar * arg0 , arg1, GVariant * arg2 )
+GSimpleAction * g_simple_action_new_stateful (const gchar * arg0 , GVariantType * arg1 , GVariant * arg2 )
{
int reset_flag = __lsb_check_params;
GSimpleAction * ret_value ;
@@ -28,7 +28,10 @@
validate_Rdaddress( arg0, "g_simple_action_new_stateful - arg0 (name)");
}
validate_NULL_TYPETYPE( arg0, "g_simple_action_new_stateful - arg0 (name)");
- validate_UNSET_TYPETYPE( arg1, "g_simple_action_new_stateful - arg1 (parameter_type)");
+ if( arg1 ) {
+ validate_RWaddress( arg1, "g_simple_action_new_stateful - arg1 (parameter_type)");
+ }
+ validate_NULL_TYPETYPE( arg1, "g_simple_action_new_stateful - arg1 (parameter_type)");
if( arg2 ) {
validate_RWaddress( arg2, "g_simple_action_new_stateful - arg2 (state)");
}
=== modified file 'dynchk/libs/libgio-2.0/gen.mk'
--- a/dynchk/libs/libgio-2.0/gen.mk 2012-12-13 14:29:07 +0000
+++ b/dynchk/libs/libgio-2.0/gen.mk 2012-12-20 19:43:34 +0000
@@ -893,14 +893,11 @@
g_io_extension_point_set_required_type.o \
g_io_extension_ref_class.o \
g_io_module_get_type.o \
-g_io_module_load.o \
g_io_module_new.o \
-g_io_module_query.o \
g_io_module_scope_block.o \
g_io_module_scope_flags_get_type.o \
g_io_module_scope_free.o \
g_io_module_scope_new.o \
-g_io_module_unload.o \
g_io_modules_load_all_in_directory.o \
g_io_modules_load_all_in_directory_with_scope.o \
g_io_modules_scan_all_in_directory.o \
=== modified file 'dynchk/libs/libpangoxft-1.0/pango_xft_render.c'
--- a/dynchk/libs/libpangoxft-1.0/pango_xft_render.c 2012-12-13 14:29:07 +0000
+++ b/dynchk/libs/libpangoxft-1.0/pango_xft_render.c 2012-12-20 19:43:34 +0000
@@ -3,11 +3,10 @@
#include "../../tests/type_tests.h"
#include "../../misc/lsb_output.h"
#include "stdlib.h"
-#include <pango-1.0/pango/pangoxft.h>
#include <X11/Xft/Xft.h>
#include <pango-1.0/pango/pango.h>
#include <glib-2.0/glib.h>
-#include <pango-1.0/pango/pangoxft-render.h>
+#include <pango-1.0/pango/pangoxft.h>
#undef pango_xft_render
static void(*funcptr) (XftDraw * , XftColor * , PangoFont * , PangoGlyphString * , gint , gint ) = 0;
=== modified file 'dynchk/libs/libpangoxft-1.0/pango_xft_render_layout.c'
--- a/dynchk/libs/libpangoxft-1.0/pango_xft_render_layout.c 2012-12-13 14:29:07 +0000
+++ b/dynchk/libs/libpangoxft-1.0/pango_xft_render_layout.c 2012-12-20 19:43:34 +0000
@@ -3,10 +3,9 @@
#include "../../tests/type_tests.h"
#include "../../misc/lsb_output.h"
#include "stdlib.h"
-#include <pango-1.0/pango/pangoxft.h>
#include <X11/Xft/Xft.h>
#include <pango-1.0/pango/pango.h>
-#include <pango-1.0/pango/pangoxft-render.h>
+#include <pango-1.0/pango/pangoxft.h>
#undef pango_xft_render_layout
static void(*funcptr) (XftDraw * , XftColor * , PangoLayout * , int , int ) = 0;
=== modified file 'dynchk/libs/libpangoxft-1.0/pango_xft_render_layout_line.c'
--- a/dynchk/libs/libpangoxft-1.0/pango_xft_render_layout_line.c 2012-12-13 14:29:07 +0000
+++ b/dynchk/libs/libpangoxft-1.0/pango_xft_render_layout_line.c 2012-12-20 19:43:34 +0000
@@ -3,10 +3,9 @@
#include "../../tests/type_tests.h"
#include "../../misc/lsb_output.h"
#include "stdlib.h"
-#include <pango-1.0/pango/pangoxft.h>
#include <X11/Xft/Xft.h>
#include <pango-1.0/pango/pango.h>
-#include <pango-1.0/pango/pangoxft-render.h>
+#include <pango-1.0/pango/pangoxft.h>
#undef pango_xft_render_layout_line
static void(*funcptr) (XftDraw * , XftColor * , PangoLayoutLine * , int , int ) = 0;
=== modified file 'dynchk/libs/libpangoxft-1.0/pango_xft_render_transformed.c'
--- a/dynchk/libs/libpangoxft-1.0/pango_xft_render_transformed.c 2012-12-13 14:29:07 +0000
+++ b/dynchk/libs/libpangoxft-1.0/pango_xft_render_transformed.c 2012-12-20 19:43:34 +0000
@@ -3,10 +3,9 @@
#include "../../tests/type_tests.h"
#include "../../misc/lsb_output.h"
#include "stdlib.h"
-#include <pango-1.0/pango/pangoxft.h>
#include <X11/Xft/Xft.h>
#include <pango-1.0/pango/pango.h>
-#include <pango-1.0/pango/pangoxft-render.h>
+#include <pango-1.0/pango/pangoxft.h>
#undef pango_xft_render_transformed
static void(*funcptr) (XftDraw * , XftColor * , PangoMatrix * , PangoFont * , PangoGlyphString * , int , int ) = 0;
=== modified file 'dynchk/libs/libpangoxft-1.0/pango_xft_renderer_get_type.c'
--- a/dynchk/libs/libpangoxft-1.0/pango_xft_renderer_get_type.c 2012-12-13 14:29:07 +0000
+++ b/dynchk/libs/libpangoxft-1.0/pango_xft_renderer_get_type.c 2012-12-20 19:43:34 +0000
@@ -3,7 +3,7 @@
#include "../../tests/type_tests.h"
#include "../../misc/lsb_output.h"
#include "stdlib.h"
-#include <pango-1.0/pango/pangoxft-render.h>
+#include <pango-1.0/pango/pangoxft.h>
#undef pango_xft_renderer_get_type
static GType(*funcptr) () = 0;
=== modified file 'dynchk/libs/libpangoxft-1.0/pango_xft_renderer_new.c'
--- a/dynchk/libs/libpangoxft-1.0/pango_xft_renderer_new.c 2012-12-13 14:29:07 +0000
+++ b/dynchk/libs/libpangoxft-1.0/pango_xft_renderer_new.c 2012-12-20 19:43:34 +0000
@@ -4,7 +4,7 @@
#include "../../misc/lsb_output.h"
#include "stdlib.h"
#include <X11/Xlib.h>
-#include <pango-1.0/pango/pangoxft-render.h>
+#include <pango-1.0/pango/pangoxft.h>
#undef pango_xft_renderer_new
static PangoRenderer *(*funcptr) (Display * , int ) = 0;
=== modified file 'dynchk/libs/libpangoxft-1.0/pango_xft_renderer_set_default_color.c'
--- a/dynchk/libs/libpangoxft-1.0/pango_xft_renderer_set_default_color.c 2012-12-13 14:29:07 +0000
+++ b/dynchk/libs/libpangoxft-1.0/pango_xft_renderer_set_default_color.c 2012-12-20 19:43:34 +0000
@@ -3,7 +3,7 @@
#include "../../tests/type_tests.h"
#include "../../misc/lsb_output.h"
#include "stdlib.h"
-#include <pango-1.0/pango/pangoxft-render.h>
+#include <pango-1.0/pango/pangoxft.h>
#include <pango-1.0/pango/pango.h>
#undef pango_xft_renderer_set_default_color
static void(*funcptr) (PangoXftRenderer * , PangoColor * ) = 0;
=== modified file 'dynchk/libs/libpangoxft-1.0/pango_xft_renderer_set_draw.c'
--- a/dynchk/libs/libpangoxft-1.0/pango_xft_renderer_set_draw.c 2012-12-13 14:29:07 +0000
+++ b/dynchk/libs/libpangoxft-1.0/pango_xft_renderer_set_draw.c 2012-12-20 19:43:34 +0000
@@ -3,8 +3,8 @@
#include "../../tests/type_tests.h"
#include "../../misc/lsb_output.h"
#include "stdlib.h"
-#include <pango-1.0/pango/pangoxft-render.h>
#include <pango-1.0/pango/pangoxft.h>
+#include <X11/Xft/Xft.h>
#undef pango_xft_renderer_set_draw
static void(*funcptr) (PangoXftRenderer * , XftDraw * ) = 0;
=== modified file 'dynchk/tests/struct.mk'
--- a/dynchk/tests/struct.mk 2012-12-13 14:29:07 +0000
+++ b/dynchk/tests/struct.mk 2012-12-20 19:43:34 +0000
@@ -216,6 +216,7 @@
struct/validate_struct__GZlibCompressorClass.o \
struct/validate_struct__GZlibDecompressorClass.o \
struct/validate_struct__IO_FILE.o \
+struct/validate_struct__PangoXftRenderer.o \
struct/validate_struct__Unwind_Exception.o \
struct/validate_struct___jmp_buf_tag.o \
struct/validate_struct___locale_struct.o \
=== added file 'dynchk/tests/struct/validate_struct__PangoXftRenderer.c'
--- a/dynchk/tests/struct/validate_struct__PangoXftRenderer.c 1970-01-01 00:00:00 +0000
+++ b/dynchk/tests/struct/validate_struct__PangoXftRenderer.c 2012-12-20 19:43:34 +0000
@@ -0,0 +1,21 @@
+// Code generated by gen_tests.pl
+
+#include "../type_tests.h"
+#include <pango-1.0/pango/pangoxft.h>
+
+int validate_struct__PangoXftRenderer(struct _PangoXftRenderer * input, char *name)
+{
+int failure = 0;
+ if(validate_NULL_TYPETYPE(input-> parent_instance,name ))
+ failure = 1;
+ if(validate_NULL_TYPETYPE(input-> display,name ))
+ failure = 1;
+ if(validate_NULL_TYPETYPE(input-> screen,name ))
+ failure = 1;
+ if(validate_NULL_TYPETYPE(input-> draw,name ))
+ failure = 1;
+ if(validate_NULL_TYPETYPE(input-> priv,name ))
+ failure = 1;
+return failure;
+}
+
=== modified file 'dynchk/tests/struct_tests.h'
--- a/dynchk/tests/struct_tests.h 2012-12-13 14:29:07 +0000
+++ b/dynchk/tests/struct_tests.h 2012-12-20 19:43:34 +0000
@@ -215,6 +215,7 @@
extern int validate_struct__GZlibCompressorClass(struct _GZlibCompressorClass * input, char *name);
extern int validate_struct__GZlibDecompressorClass(struct _GZlibDecompressorClass * input, char *name);
extern int validate_struct__IO_FILE(struct _IO_FILE * input, char *name);
+extern int validate_struct__PangoXftRenderer(struct _PangoXftRenderer * input, char *name);
extern int validate_struct__Unwind_Exception(struct _Unwind_Exception * input, char *name);
extern int validate_struct___jmp_buf_tag(struct __jmp_buf_tag * input, char *name);
extern int validate_struct___locale_struct(struct __locale_struct * input, char *name);
More information about the lsb-messages
mailing list