[Lsb-messages] /var/www/bzr/lsb/devel/devchk r2356: clean up some stub_libs data sizes

Mats Wichmann mats at linuxfoundation.org
Sun Mar 3 14:26:34 UTC 2013


------------------------------------------------------------
revno: 2356
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: devchk
timestamp: Sun 2013-03-03 07:26:34 -0700
message:
  clean up some stub_libs data sizes
modified:
  ts/devchk/libxslt_documents_h.c
  ts/devchk/xcb_xcb_h.c
-------------- next part --------------
=== modified file 'ts/devchk/libxslt_documents_h.c'
--- a/ts/devchk/libxslt_documents_h.c	2012-10-01 13:17:07 +0000
+++ b/ts/devchk/libxslt_documents_h.c	2013-03-03 14:26:34 +0000
@@ -32,53 +32,53 @@
 CheckTypeSize(xsltLoadType,4, 40771, 1, 5.0, NULL, 40770, NULL)
 #endif
 
-#if defined __x86_64__
+#if defined __s390x__
+CheckTypeSize(xsltDocLoaderFunc,8, 40772, 12, 5.0, NULL, 40773, NULL)
+#elif defined __x86_64__
 CheckTypeSize(xsltDocLoaderFunc,8, 40772, 11, 5.0, NULL, 40773, NULL)
+#elif defined __s390__ && !defined __s390x__
+CheckTypeSize(xsltDocLoaderFunc,4, 40772, 10, 5.0, NULL, 40773, NULL)
+#elif defined __powerpc64__
+CheckTypeSize(xsltDocLoaderFunc,8, 40772, 9, 5.0, NULL, 40773, NULL)
+#elif defined __powerpc__ && !defined __powerpc64__
+CheckTypeSize(xsltDocLoaderFunc,4, 40772, 6, 5.0, NULL, 40773, NULL)
+#elif defined __ia64__
+CheckTypeSize(xsltDocLoaderFunc,8, 40772, 3, 5.0, NULL, 40773, NULL)
 #elif defined __i386__
 CheckTypeSize(xsltDocLoaderFunc,4, 40772, 2, 5.0, NULL, 40773, NULL)
-#elif defined __ia64__
-Msg("Find size of xsltDocLoaderFunc (40772)\n");
-Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""5.0""',NULL,40773,NULL);\n",architecture,40772,0);
-#elif defined __powerpc__ && !defined __powerpc64__
-Msg("Find size of xsltDocLoaderFunc (40772)\n");
-Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""5.0""',NULL,40773,NULL);\n",architecture,40772,0);
-#elif defined __powerpc64__
-Msg("Find size of xsltDocLoaderFunc (40772)\n");
-Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""5.0""',NULL,40773,NULL);\n",architecture,40772,0);
-#elif defined __s390__ && !defined __s390x__
-Msg("Find size of xsltDocLoaderFunc (40772)\n");
-Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""5.0""',NULL,40773,NULL);\n",architecture,40772,0);
-#elif defined __s390x__
-Msg("Find size of xsltDocLoaderFunc (40772)\n");
-Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""5.0""',NULL,40773,NULL);\n",architecture,40772,0);
 #else
 Msg("Find size of xsltDocLoaderFunc (40772)\n");
 Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""5.0""',NULL,40773, NULL);\n",architecture,40772,0);
 #endif
 
-#if defined __x86_64__
+#if defined __s390x__
+/* S390X */
+typedef xmlDocPtr (*xsltDocLoaderFunc_db)(void);
+CheckFunctionTypedef(xsltDocLoaderFunc,xsltDocLoaderFunc_db);
+#elif defined __x86_64__
 /* x86-64 */
 typedef xmlDocPtr (*xsltDocLoaderFunc_db)(void);
 CheckFunctionTypedef(xsltDocLoaderFunc,xsltDocLoaderFunc_db);
+#elif defined __s390__ && !defined __s390x__
+/* S390 */
+typedef xmlDocPtr (*xsltDocLoaderFunc_db)(void);
+CheckFunctionTypedef(xsltDocLoaderFunc,xsltDocLoaderFunc_db);
+#elif defined __powerpc64__
+/* PPC64 */
+typedef xmlDocPtr (*xsltDocLoaderFunc_db)(void);
+CheckFunctionTypedef(xsltDocLoaderFunc,xsltDocLoaderFunc_db);
+#elif defined __powerpc__ && !defined __powerpc64__
+/* PPC32 */
+typedef xmlDocPtr (*xsltDocLoaderFunc_db)(void);
+CheckFunctionTypedef(xsltDocLoaderFunc,xsltDocLoaderFunc_db);
+#elif defined __ia64__
+/* IA64 */
+typedef xmlDocPtr (*xsltDocLoaderFunc_db)(void);
+CheckFunctionTypedef(xsltDocLoaderFunc,xsltDocLoaderFunc_db);
 #elif defined __i386__
 /* IA32 */
 typedef xmlDocPtr (*xsltDocLoaderFunc_db)(void);
 CheckFunctionTypedef(xsltDocLoaderFunc,xsltDocLoaderFunc_db);
-#elif defined __ia64__
-Msg("Find size of xsltDocLoaderFunc (40772)\n");
-Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""5.0""',NULL,40773,NULL);\n",architecture,40772,0);
-#elif defined __powerpc__ && !defined __powerpc64__
-Msg("Find size of xsltDocLoaderFunc (40772)\n");
-Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""5.0""',NULL,40773,NULL);\n",architecture,40772,0);
-#elif defined __powerpc64__
-Msg("Find size of xsltDocLoaderFunc (40772)\n");
-Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""5.0""',NULL,40773,NULL);\n",architecture,40772,0);
-#elif defined __s390__ && !defined __s390x__
-Msg("Find size of xsltDocLoaderFunc (40772)\n");
-Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""5.0""',NULL,40773,NULL);\n",architecture,40772,0);
-#elif defined __s390x__
-Msg("Find size of xsltDocLoaderFunc (40772)\n");
-Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""5.0""',NULL,40773,NULL);\n",architecture,40772,0);
 #endif
 
 extern xsltDocumentPtr xsltNewDocument_db(xsltTransformContextPtr, xmlDocPtr);

=== modified file 'ts/devchk/xcb_xcb_h.c'
--- a/ts/devchk/xcb_xcb_h.c	2013-01-11 16:08:10 +0000
+++ b/ts/devchk/xcb_xcb_h.c	2013-03-03 14:26:34 +0000
@@ -132,25 +132,20 @@
 Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""5.0""',NULL,10000248,NULL);\n",architecture,10000250,0);
 #endif
 
-#if defined __x86_64__
+#if defined __s390x__
+CheckTypeSize(xcb_extension_t,16, 10000252, 12, 5.0, NULL, 10000213, NULL)
+#elif defined __x86_64__
 CheckTypeSize(xcb_extension_t,16, 10000252, 11, 5.0, NULL, 10000213, NULL)
+#elif defined __s390__ && !defined __s390x__
+CheckTypeSize(xcb_extension_t,8, 10000252, 10, 5.0, NULL, 10000213, NULL)
+#elif defined __powerpc64__
+CheckTypeSize(xcb_extension_t,16, 10000252, 9, 5.0, NULL, 10000213, NULL)
+#elif defined __powerpc__ && !defined __powerpc64__
+CheckTypeSize(xcb_extension_t,8, 10000252, 6, 5.0, NULL, 10000213, NULL)
+#elif defined __ia64__
+CheckTypeSize(xcb_extension_t,16, 10000252, 3, 5.0, NULL, 10000213, NULL)
 #elif defined __i386__
 CheckTypeSize(xcb_extension_t,8, 10000252, 2, 5.0, NULL, 10000213, NULL)
-#elif defined __ia64__
-Msg("Find size of xcb_extension_t (10000252)\n");
-Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""5.0""',NULL,10000213,NULL);\n",architecture,10000252,0);
-#elif defined __powerpc__ && !defined __powerpc64__
-Msg("Find size of xcb_extension_t (10000252)\n");
-Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""5.0""',NULL,10000213,NULL);\n",architecture,10000252,0);
-#elif defined __powerpc64__
-Msg("Find size of xcb_extension_t (10000252)\n");
-Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""5.0""',NULL,10000213,NULL);\n",architecture,10000252,0);
-#elif defined __s390__ && !defined __s390x__
-Msg("Find size of xcb_extension_t (10000252)\n");
-Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""5.0""',NULL,10000213,NULL);\n",architecture,10000252,0);
-#elif defined __s390x__
-Msg("Find size of xcb_extension_t (10000252)\n");
-Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""5.0""',NULL,10000213,NULL);\n",architecture,10000252,0);
 #else
 Msg("Find size of xcb_extension_t (10000252)\n");
 Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""5.0""',NULL,10000213, NULL);\n",architecture,10000252,0);



More information about the lsb-messages mailing list