From anholt at kemper.freedesktop.org Mon Oct 15 13:44:39 2007 From: anholt at kemper.freedesktop.org (Eric Anholt) Date: Mon, 15 Oct 2007 20:44:39 +0000 Subject: XtTestProto.h Message-ID: <20071015204439.A164A9E754@gabe.freedesktop.org> Update of /cvs/xtest/xtest/xts5/include In directory kemper:/tmp/cvs-serv28812/xts5/include Modified Files: XtTestProto.h Log Message: Bug #8081: Fix bad prototypes that broke xtest on I32LP64. While here, fix some printf formatting. Submitted by: Gordon Jin Index: XtTestProto.h =================================================================== RCS file: /cvs/xtest/xtest/xts5/include/XtTestProto.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- XtTestProto.h 3 Nov 2005 08:42:00 -0000 1.3 +++ XtTestProto.h 15 Oct 2007 20:44:37 -0000 1.4 @@ -36,6 +36,13 @@ * * Modifications: * $Log$ +* Revision 1.4 2007-10-15 20:44:37 anholt +* Bug #8081: Fix bad prototypes that broke xtest on I32LP64. +* +* While here, fix some printf formatting. +* +* Submitted by: Gordon Jin +* * Revision 1.3 2005-11-03 08:42:00 jmichael * clean up all vsw5 paths to use xts5 instead. * @@ -71,10 +78,6 @@ #ifndef _XTTESTPROTO_H #define _XTTESTPROTO_H -#ifdef MIXOLDANDNEW -/* -#if defined(FUNCPROTO) || defined(__STDC__) || defined(__cplusplus) || defined(c_plusplus) -*/ int avs_alloc_sem(void); void avs_free_sem(void); int avs_wait_event(int, int); @@ -129,9 +132,9 @@ Widget CreateMenuShellWidget(Widget); Widget CreateDialogShellWidget(Widget); Window avs_xext_init(void); -int avs_xext_close(void); -int check_dec(int, int, char*); -int check_not_dec(int, int, char*); +void avs_xext_close(void); +int check_dec(long, long, char*); +int check_not_dec(long, long, char*); int check_str(char *, char *, char *); int check_char(char, char, char *); int check_size(char *, char *, size_t, size_t); @@ -150,83 +153,5 @@ void report_purpose(int); void report_assertion(char *); void report_strategy(char *); -#else - -int avs_alloc_sem(); -void avs_free_sem(); -int avs_wait_event(); -int avs_post_event(); -int avs_get_event(); -int avs_set_event(); -char *err_lookup(); -void lsah(); -int wait_for(); -int avs_signal(); -int avs_set_alarm(); -int avs_clear_alarm(); -int avs_expect_alarm(); -int avs_ignore_alarm(); -int push_stdout(); -void pop_stdout(); -int push_stderr(); -void pop_stderr(); -void push_to_devnull(); -int restore_from_devnull(); -char *get_token(); -char *get_nth_token(); -void uwerrno(); -void fwerrno(); -void ferrno(); -void vsw_debug(); -void vsw_debug_enter(); -void vsw_debug_exit(); -Widget avs_xt_def(char *); -char *title(); -void PostMenu(); -void ConfigureDimension(); -void DestroyTree(); -size_t mem_limit(); -void alloc_handler(); -Widget avs_xt_hier_no_warn(); -Widget avs_xt_hier(); -Widget avs_xt_hier_args(); -Widget avs_xt_hier_def(); -Widget avs_xt_init(); -Widget avs_xt_tree(); -Widget CreateMainWidget(); -Widget CreateDrawWidget(); -Widget CreateFormWidget(); -Widget CreateScrollWidget(); -Widget CreateRowColWidget(); -Widget CreateFrameWidget(); -Widget CreatePanedWidget(); -Widget CreateBoxWidget(); -Widget CreateLabelWidget(); -Widget CreatePushButtonGadget(); -Widget CreateMenuShellWidget(); -Widget CreateDialogShellWidget(); -Window avs_xext_init(); -void avs_xext_close(); -int check_dec(); -int check_not_dec(); -int check_str(); -int check_char(); -int check_size(); -void x_event_name(); -void send_event_time(); -void send_event(); -void send_event_mask_time(); -void send_event_mask(); -int x_handler(); -void xt_handler(); -int x_unexperr(); -/*from xtest library*/ -void initconfig(); -void report(); -void trace(); -void report_purpose(); -void report_assertion(); -void report_strategy(); -#endif #endif /* _XTTESTPROTO_H */ From anholt at kemper.freedesktop.org Mon Oct 15 13:44:39 2007 From: anholt at kemper.freedesktop.org (Eric Anholt) Date: Mon, 15 Oct 2007 20:44:39 +0000 Subject: check.c Message-ID: <20071015204439.CB9329EB1F@gabe.freedesktop.org> Update of /cvs/xtest/xtest/xts5/src/libXtTest In directory kemper:/tmp/cvs-serv28812/xts5/src/libXtTest Modified Files: check.c Log Message: Bug #8081: Fix bad prototypes that broke xtest on I32LP64. While here, fix some printf formatting. Submitted by: Gordon Jin Index: check.c =================================================================== RCS file: /cvs/xtest/xtest/xts5/src/libXtTest/check.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- check.c 3 Nov 2005 08:42:02 -0000 1.2 +++ check.c 15 Oct 2007 20:44:37 -0000 1.3 @@ -35,6 +35,13 @@ * * Modifications: * $Log$ +* Revision 1.3 2007-10-15 20:44:37 anholt +* Bug #8081: Fix bad prototypes that broke xtest on I32LP64. +* +* While here, fix some printf formatting. +* +* Submitted by: Gordon Jin +* * Revision 1.2 2005-11-03 08:42:02 jmichael * clean up all vsw5 paths to use xts5 instead. * @@ -74,7 +81,7 @@ char *item_name; { if (goesin != shouldbe) { - sprintf(ebuf, "ERROR: Expected %s of %d, Received %d", item_name, goesin, shouldbe); + sprintf(ebuf, "ERROR: Expected %s of %ld, Received %ld", item_name, goesin, shouldbe); tet_infoline(ebuf); tet_result(TET_FAIL); return 1; @@ -88,7 +95,7 @@ char *item_name; { if (goesin == shouldnotbe) { - sprintf(ebuf, "ERROR: Expected %s not = %d, received %d", item_name, goesin, shouldnotbe); + sprintf(ebuf, "ERROR: Expected %s not = %ld, received %ld", item_name, goesin, shouldnotbe); tet_infoline(ebuf); tet_result(TET_FAIL); return 1;