[uim-commit] r1370 - branches/r5rs/sigscheme

[kzk at freedesktop.org]

Author: kzk
Date: 2005-08-31 15:34:23 -0700 (Wed, 31 Aug 2005)
New Revision: 1370

Modified:
   branches/r5rs/sigscheme/error.c
Log:
* sigscheme/error.c
  - (SigScm_Die, SigScm_Error, SigScm_ErrorObj): show "Error: "
    before error message.
    


Modified: branches/r5rs/sigscheme/error.c
===================================================================
--- branches/r5rs/sigscheme/error.c	2005-08-31 22:03:35 UTC (rev 1369)
+++ branches/r5rs/sigscheme/error.c	2005-08-31 22:34:23 UTC (rev 1370)
@@ -37,10 +37,6 @@
  * - support SIOD compatible verbose level sensitive behavior. For example,
  *   verbose level 1 must not print backtrace
  * - provide SRFI-23 "Error reporting mechanism" compatible 'error' procedure
- * - prepend SIOD compatible "ERROR: " header for each messages when
- *   SCM_COMPAT_SIOD is true. But even if SCM_COMPAT_SIOD is false, some error
- *   indicator header such as "Error: " should be prepended. This is required
- *   to run GaUnit-based unit test for uim
  */
 
 /*=======================================
@@ -77,7 +73,7 @@
 =======================================*/
 int SigScm_Die(const char *msg, const char *filename, int line) {
     /* show message */
-    printf("SigScheme Died : %s (file : %s, line : %d)\n", msg, filename, line);
+    printf("Error: SigScheme Died : %s (file : %s, line : %d)\n", msg, filename, line);
 
     /* show backtrace */
     SigScm_ShowBacktrace();
@@ -92,6 +88,9 @@
 {
     va_list va;
 
+    /* prepend message */
+    fprintf(SCM_PORTINFO_FILE(scm_current_error_port), "Error: ");
+
     /* show message */
     va_start(va, msg);
     vfprintf(SCM_PORTINFO_FILE(scm_current_error_port), msg, va);
@@ -106,6 +105,9 @@
 
 void SigScm_ErrorObj(const char *msg, ScmObj obj)
 {
+    /* prepend header */
+    fprintf(SCM_PORTINFO_FILE(scm_current_error_port), "Error: ");
+
     /* print msg */
     fprintf(SCM_PORTINFO_FILE(scm_current_error_port), "%s", msg);