[Lsb-messages] /var/www/bzr/lsb/devel/devchk r2280: update sane sizes
Mats Wichmann
mats at linuxfoundation.org
Tue May 15 14:52:41 UTC 2012
------------------------------------------------------------
revno: 2280
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: devchk
timestamp: Tue 2012-05-15 08:52:41 -0600
message:
update sane sizes
modified:
ts/devchk/sane_sane_h.c
-------------- next part --------------
=== modified file 'ts/devchk/sane_sane_h.c'
--- a/ts/devchk/sane_sane_h.c 2012-04-26 14:57:22 +0000
+++ b/ts/devchk/sane_sane_h.c 2012-05-15 14:52:41 +0000
@@ -251,87 +251,201 @@
#endif
#if 1
-CheckTypeSize(SANE_Byte,0, 40529, 1, 5.0, NULL, 3, NULL)
-#endif
-
-#if 1
-CheckTypeSize(SANE_Word,0, 40530, 1, 5.0, NULL, 6, NULL)
-#endif
-
-#if 1
-CheckTypeSize(SANE_Bool,0, 40531, 1, 5.0, NULL, 6, NULL)
-#endif
-
-#if 1
-CheckTypeSize(SANE_Int,0, 40532, 1, 5.0, NULL, 6, NULL)
-#endif
-
-#if 1
-CheckTypeSize(SANE_Char,0, 40533, 1, 5.0, NULL, 2, NULL)
-#endif
-
-#if 1
-CheckTypeSize(SANE_String,0, 40534, 1, 5.0, NULL, 40535, NULL)
-#endif
-
-#if 1
-CheckTypeSize(SANE_String_Const,0, 40536, 1, 5.0, NULL, 40538, NULL)
-#endif
-
-#if 1
-CheckTypeSize(SANE_Handle,0, 40539, 1, 5.0, NULL, 40, NULL)
-#endif
-
-#if 1
-CheckTypeSize(SANE_Fixed,0, 40540, 1, 5.0, NULL, 6, NULL)
-#endif
-
-#if 1
-CheckTypeSize(SANE_Status,0, 40542, 1, 5.0, NULL, 40541, NULL)
-#endif
-
-#if 1
-CheckTypeSize(SANE_Value_Type,0, 40544, 1, 5.0, NULL, 40543, NULL)
-#endif
-
-#if 1
-CheckTypeSize(SANE_Unit,0, 40546, 1, 5.0, NULL, 40545, NULL)
-#endif
-
-#if 1
-CheckTypeSize(SANE_Device,0, 40548, 1, 5.0, NULL, 40547, NULL)
-#endif
-
-#if 1
-CheckTypeSize(SANE_Constraint_Type,0, 40550, 1, 5.0, NULL, 40549, NULL)
-#endif
-
-#if 1
-CheckTypeSize(SANE_Range,0, 40552, 1, 5.0, NULL, 40551, NULL)
-#endif
-
-#if 1
-CheckTypeSize(SANE_Option_Descriptor,0, 40561, 1, 5.0, NULL, 40560, NULL)
-#endif
-
-#if 1
-CheckTypeSize(SANE_Action,0, 40563, 1, 5.0, NULL, 40562, NULL)
-#endif
-
-#if 1
-CheckTypeSize(SANE_Frame,0, 40565, 1, 5.0, NULL, 40564, NULL)
-#endif
-
-#if 1
-CheckTypeSize(SANE_Parameters,0, 40567, 1, 5.0, NULL, 40566, NULL)
-#endif
-
-#if 1
-CheckTypeSize(SANE_Auth_Callback,0, 40569, 1, 5.0, NULL, 40570, NULL)
-#endif
-
-#if 1
-/* All */
+CheckTypeSize(SANE_Byte,1, 40529, 1, 5.0, NULL, 3, NULL)
+#endif
+
+#if 1
+CheckTypeSize(SANE_Word,4, 40530, 1, 5.0, NULL, 6, NULL)
+#endif
+
+#if 1
+CheckTypeSize(SANE_Bool,4, 40531, 1, 5.0, NULL, 6, NULL)
+#endif
+
+#if 1
+CheckTypeSize(SANE_Int,4, 40532, 1, 5.0, NULL, 6, NULL)
+#endif
+
+#if 1
+CheckTypeSize(SANE_Char,1, 40533, 1, 5.0, NULL, 2, NULL)
+#endif
+
+#if defined __s390x__
+CheckTypeSize(SANE_String,8, 40534, 12, 5.0, NULL, 40535, NULL)
+#elif defined __x86_64__
+CheckTypeSize(SANE_String,8, 40534, 11, 5.0, NULL, 40535, NULL)
+#elif defined __s390__ && !defined __s390x__
+CheckTypeSize(SANE_String,4, 40534, 10, 5.0, NULL, 40535, NULL)
+#elif defined __powerpc64__
+CheckTypeSize(SANE_String,8, 40534, 9, 5.0, NULL, 40535, NULL)
+#elif defined __powerpc__ && !defined __powerpc64__
+CheckTypeSize(SANE_String,4, 40534, 6, 5.0, NULL, 40535, NULL)
+#elif defined __ia64__
+CheckTypeSize(SANE_String,8, 40534, 3, 5.0, NULL, 40535, NULL)
+#elif defined __i386__
+CheckTypeSize(SANE_String,4, 40534, 2, 5.0, NULL, 40535, NULL)
+#else
+Msg("Find size of SANE_String (40534)\n");
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""5.0""',NULL,40535,NULL);\n",architecture,40534,0);
+#endif
+
+#if defined __s390x__
+CheckTypeSize(SANE_String_Const,8, 40536, 12, 5.0, NULL, 40538, NULL)
+#elif defined __x86_64__
+CheckTypeSize(SANE_String_Const,8, 40536, 11, 5.0, NULL, 40538, NULL)
+#elif defined __s390__ && !defined __s390x__
+CheckTypeSize(SANE_String_Const,4, 40536, 10, 5.0, NULL, 40538, NULL)
+#elif defined __powerpc64__
+CheckTypeSize(SANE_String_Const,8, 40536, 9, 5.0, NULL, 40538, NULL)
+#elif defined __powerpc__ && !defined __powerpc64__
+CheckTypeSize(SANE_String_Const,4, 40536, 6, 5.0, NULL, 40538, NULL)
+#elif defined __ia64__
+CheckTypeSize(SANE_String_Const,8, 40536, 3, 5.0, NULL, 40538, NULL)
+#elif defined __i386__
+CheckTypeSize(SANE_String_Const,4, 40536, 2, 5.0, NULL, 40538, NULL)
+#else
+Msg("Find size of SANE_String_Const (40536)\n");
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""5.0""',NULL,40538,NULL);\n",architecture,40536,0);
+#endif
+
+#if defined __s390x__
+CheckTypeSize(SANE_Handle,8, 40539, 12, 5.0, NULL, 40, NULL)
+#elif defined __x86_64__
+CheckTypeSize(SANE_Handle,8, 40539, 11, 5.0, NULL, 40, NULL)
+#elif defined __s390__ && !defined __s390x__
+CheckTypeSize(SANE_Handle,4, 40539, 10, 5.0, NULL, 40, NULL)
+#elif defined __powerpc64__
+CheckTypeSize(SANE_Handle,8, 40539, 9, 5.0, NULL, 40, NULL)
+#elif defined __powerpc__ && !defined __powerpc64__
+CheckTypeSize(SANE_Handle,4, 40539, 6, 5.0, NULL, 40, NULL)
+#elif defined __ia64__
+CheckTypeSize(SANE_Handle,8, 40539, 3, 5.0, NULL, 40, NULL)
+#elif defined __i386__
+CheckTypeSize(SANE_Handle,4, 40539, 2, 5.0, NULL, 40, NULL)
+#else
+Msg("Find size of SANE_Handle (40539)\n");
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""5.0""',NULL,40,NULL);\n",architecture,40539,0);
+#endif
+
+#if 1
+CheckTypeSize(SANE_Fixed,4, 40540, 1, 5.0, NULL, 6, NULL)
+#endif
+
+#if 1
+CheckTypeSize(SANE_Status,4, 40542, 1, 5.0, NULL, 40541, NULL)
+#endif
+
+#if 1
+CheckTypeSize(SANE_Value_Type,4, 40544, 1, 5.0, NULL, 40543, NULL)
+#endif
+
+#if 1
+CheckTypeSize(SANE_Unit,4, 40546, 1, 5.0, NULL, 40545, NULL)
+#endif
+
+#if defined __s390x__
+CheckTypeSize(SANE_Device,32, 40548, 12, 5.0, NULL, 40547, NULL)
+#elif defined __x86_64__
+CheckTypeSize(SANE_Device,32, 40548, 11, 5.0, NULL, 40547, NULL)
+#elif defined __s390__ && !defined __s390x__
+CheckTypeSize(SANE_Device,16, 40548, 10, 5.0, NULL, 40547, NULL)
+#elif defined __powerpc64__
+CheckTypeSize(SANE_Device,32, 40548, 9, 5.0, NULL, 40547, NULL)
+#elif defined __powerpc__ && !defined __powerpc64__
+CheckTypeSize(SANE_Device,16, 40548, 6, 5.0, NULL, 40547, NULL)
+#elif defined __ia64__
+CheckTypeSize(SANE_Device,32, 40548, 3, 5.0, NULL, 40547, NULL)
+#elif defined __i386__
+CheckTypeSize(SANE_Device,16, 40548, 2, 5.0, NULL, 40547, NULL)
+#else
+Msg("Find size of SANE_Device (40548)\n");
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""5.0""',NULL,40547,NULL);\n",architecture,40548,0);
+#endif
+
+#if 1
+CheckTypeSize(SANE_Constraint_Type,4, 40550, 1, 5.0, NULL, 40549, NULL)
+#endif
+
+#if 1
+CheckTypeSize(SANE_Range,12, 40552, 1, 5.0, NULL, 40551, NULL)
+#endif
+
+#if defined __s390x__
+CheckTypeSize(SANE_Option_Descriptor,56, 40561, 12, 5.0, NULL, 40560, NULL)
+#elif defined __x86_64__
+CheckTypeSize(SANE_Option_Descriptor,56, 40561, 11, 5.0, NULL, 40560, NULL)
+#elif defined __s390__ && !defined __s390x__
+CheckTypeSize(SANE_Option_Descriptor,36, 40561, 10, 5.0, NULL, 40560, NULL)
+#elif defined __powerpc64__
+CheckTypeSize(SANE_Option_Descriptor,56, 40561, 9, 5.0, NULL, 40560, NULL)
+#elif defined __powerpc__ && !defined __powerpc64__
+CheckTypeSize(SANE_Option_Descriptor,36, 40561, 6, 5.0, NULL, 40560, NULL)
+#elif defined __ia64__
+CheckTypeSize(SANE_Option_Descriptor,56, 40561, 3, 5.0, NULL, 40560, NULL)
+#elif defined __i386__
+CheckTypeSize(SANE_Option_Descriptor,36, 40561, 2, 5.0, NULL, 40560, NULL)
+#else
+Msg("Find size of SANE_Option_Descriptor (40561)\n");
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""5.0""',NULL,40560,NULL);\n",architecture,40561,0);
+#endif
+
+#if 1
+CheckTypeSize(SANE_Action,4, 40563, 1, 5.0, NULL, 40562, NULL)
+#endif
+
+#if 1
+CheckTypeSize(SANE_Frame,4, 40565, 1, 5.0, NULL, 40564, NULL)
+#endif
+
+#if 1
+CheckTypeSize(SANE_Parameters,24, 40567, 1, 5.0, NULL, 40566, NULL)
+#endif
+
+#if defined __s390x__
+CheckTypeSize(SANE_Auth_Callback,8, 40569, 12, 5.0, NULL, 40570, NULL)
+#elif defined __x86_64__
+CheckTypeSize(SANE_Auth_Callback,8, 40569, 11, 5.0, NULL, 40570, NULL)
+#elif defined __s390__ && !defined __s390x__
+CheckTypeSize(SANE_Auth_Callback,4, 40569, 10, 5.0, NULL, 40570, NULL)
+#elif defined __powerpc64__
+CheckTypeSize(SANE_Auth_Callback,8, 40569, 9, 5.0, NULL, 40570, NULL)
+#elif defined __powerpc__ && !defined __powerpc64__
+CheckTypeSize(SANE_Auth_Callback,4, 40569, 6, 5.0, NULL, 40570, NULL)
+#elif defined __ia64__
+CheckTypeSize(SANE_Auth_Callback,8, 40569, 3, 5.0, NULL, 40570, NULL)
+#elif defined __i386__
+CheckTypeSize(SANE_Auth_Callback,4, 40569, 2, 5.0, NULL, 40570, NULL)
+#else
+Msg("Find size of SANE_Auth_Callback (40569)\n");
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""5.0""',NULL,40570, NULL);\n",architecture,40569,0);
+#endif
+
+#if defined __s390x__
+/* S390X */
+typedef void (*SANE_Auth_Callback_db)(SANE_String_Const, SANE_Char *, SANE_Char *);
+CheckFunctionTypedef(SANE_Auth_Callback,SANE_Auth_Callback_db);
+#elif defined __x86_64__
+/* x86-64 */
+typedef void (*SANE_Auth_Callback_db)(SANE_String_Const, SANE_Char *, SANE_Char *);
+CheckFunctionTypedef(SANE_Auth_Callback,SANE_Auth_Callback_db);
+#elif defined __s390__ && !defined __s390x__
+/* S390 */
+typedef void (*SANE_Auth_Callback_db)(SANE_String_Const, SANE_Char *, SANE_Char *);
+CheckFunctionTypedef(SANE_Auth_Callback,SANE_Auth_Callback_db);
+#elif defined __powerpc64__
+/* PPC64 */
+typedef void (*SANE_Auth_Callback_db)(SANE_String_Const, SANE_Char *, SANE_Char *);
+CheckFunctionTypedef(SANE_Auth_Callback,SANE_Auth_Callback_db);
+#elif defined __powerpc__ && !defined __powerpc64__
+/* PPC32 */
+typedef void (*SANE_Auth_Callback_db)(SANE_String_Const, SANE_Char *, SANE_Char *);
+CheckFunctionTypedef(SANE_Auth_Callback,SANE_Auth_Callback_db);
+#elif defined __ia64__
+/* IA64 */
+typedef void (*SANE_Auth_Callback_db)(SANE_String_Const, SANE_Char *, SANE_Char *);
+CheckFunctionTypedef(SANE_Auth_Callback,SANE_Auth_Callback_db);
+#elif defined __i386__
+/* IA32 */
typedef void (*SANE_Auth_Callback_db)(SANE_String_Const, SANE_Char *, SANE_Char *);
CheckFunctionTypedef(SANE_Auth_Callback,SANE_Auth_Callback_db);
#endif
More information about the lsb-messages
mailing list