*** empty log message ***

[m17n/libotf.git] / src / otferror.c

diff --git a/src/otferror.c b/src/otferror.c
index aed9623..015ccc7 100644 (file)
--- a/src/otferror.c
+++ b/src/otferror.c
@@ -1,10 +1,34 @@
+/* otferror.c -- Error handling.
+
+Copyright (C) 2003, 2004
+  National Institute of Advanced Industrial Science and Technology (AIST)
+  Registration Number H15PRO167
+
+This file is part of libotf.
+
+Libotf is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published
+by the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+Libotf is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library, in a file named COPYING; if not,
+write to the Free Software Foundation, Inc., 59 Temple Place, Suite
+330, Boston, MA 02111-1307, USA.  */
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <config.h>
 
 #include "otf.h"
 
-static char *error_message;
+static char error_message[1024];
 int OTF_error;
 
 static char *error_string[] =
@@ -20,10 +44,8 @@ static char *error_string[] =
   };
 
 int
-otf__error (int err, char *fmt, void *arg)
+otf__error (int err, const char *fmt, const void *arg)
 {
-  if (! error_message)
-    error_message = (char *) malloc (256);
   sprintf (error_message, "OTF-Error (%s): ", error_string[err]);
   sprintf (error_message + strlen (error_message), fmt, arg);
   OTF_error = err;
@@ -31,10 +53,10 @@ otf__error (int err, char *fmt, void *arg)
 }
 
 void
-OTF_perror (char *prefix)
+OTF_perror (const char *prefix)
 {
   if (OTF_error == 0)
-    error_message = error_string[0];
+    sprintf (error_message, "%s", error_string[0]);
   if (prefix)
     fprintf (stderr, "%s: %s\n", prefix, error_message);
   else