Use libutf8.

[gedcom-parse.git] / gedcom / message.c

diff --git a/gedcom/message.c b/gedcom/message.c
index 738bcd099bce23a58864841dcd3e51639edb9567..6943f6078c9b2b2fb6836eac1e25deaffc9cf159 100644 (file)
--- a/gedcom/message.c
+++ b/gedcom/message.c
@@ -23,11 +23,11 @@
 
 #include "gedcom_internal.h"
 #include "gedcom.h"
+#include "buffer.h"
 
-#define INITIAL_BUF_SIZE 256
-char *mess_buffer = NULL;
-size_t bufsize;
+void cleanup_mess_buffer();
 
+struct safe_buffer mess_buffer = { NULL, 0, cleanup_mess_buffer };
 Gedcom_msg_handler msg_handler = NULL;
 
 void gedcom_set_message_handler(Gedcom_msg_handler func)
@@ -35,63 +35,9 @@ void gedcom_set_message_handler(Gedcom_msg_handler func)
   msg_handler = func;
 }
 
-void reset_mess_buffer()
+void cleanup_mess_buffer()
 {
-  if (mess_buffer != NULL)
-    mess_buffer[0] = '\0';
-}
-
-void init_mess_buffer()
-{
-  if (mess_buffer == NULL) {
-    mess_buffer = (char *)malloc(INITIAL_BUF_SIZE);
-    if (mess_buffer) {
-      mess_buffer[0] = '\0';
-      bufsize = INITIAL_BUF_SIZE;
-    }
-    else {
-      fprintf(stderr, _("Could not allocate memory at %s, %d"),
-             __FILE__, __LINE__);
-      fprintf(stderr, "\n");
-    }
-  }
-}
-
-int safe_buf_vappend(const char *s, va_list ap)
-{
-  int res = 0;
-  int len;
-  init_mess_buffer();
-  if (mess_buffer) {
-    len = strlen(mess_buffer);
-    while (1) {
-      char *buf_ptr = mess_buffer + len;
-      int rest_size = bufsize - len;
-      
-      res = vsnprintf(buf_ptr, rest_size, s, ap);
-      
-      if (res > -1 && res < rest_size) {
-       break;
-      }
-      else  {
-       bufsize *= 2;
-       mess_buffer = realloc(mess_buffer, bufsize);
-      }
-    }
-  }
-  return res;
-}
-
-int safe_buf_append(const char *s, ...)
-{
-  int res;
-  va_list ap;
-  
-  va_start(ap, s);
-  res = safe_buf_vappend(s, ap);
-  va_end(ap);
-  
-  return res;
+  cleanup_buffer(&mess_buffer);
 }
 
 int gedcom_message(const char* s, ...)
@@ -100,11 +46,11 @@ int gedcom_message(const char* s, ...)
   va_list ap;
 
   va_start(ap, s);
-  reset_mess_buffer();
-  res = safe_buf_vappend(s, ap);
+  reset_buffer(&mess_buffer);
+  res = safe_buf_vappend(&mess_buffer, s, ap);
   va_end(ap);
   if (msg_handler)
-    (*msg_handler)(MESSAGE, mess_buffer);
+    (*msg_handler)(MESSAGE, get_buf_string(&mess_buffer));
   return res;
 }
 
@@ -113,13 +59,16 @@ int gedcom_warning(const char* s, ...)
   int res;
   va_list ap;
 
-  reset_mess_buffer();
-  safe_buf_append(_("Warning on line %d: "), line_no);
+  reset_buffer(&mess_buffer);
+  if (line_no != 0) 
+    safe_buf_append(&mess_buffer, _("Warning on line %d: "), line_no);
+  else
+    safe_buf_append(&mess_buffer, _("Warning: "));
   va_start(ap, s);
-  res = safe_buf_vappend(s, ap);
+  res = safe_buf_vappend(&mess_buffer, s, ap);
   va_end(ap);
   if (msg_handler)
-    (*msg_handler)(WARNING, mess_buffer);
+    (*msg_handler)(WARNING, get_buf_string(&mess_buffer));
   
   return res;
 }
@@ -129,13 +78,16 @@ int gedcom_error(const char* s, ...)
   int res;
   va_list ap;
 
-  reset_mess_buffer();
-  safe_buf_append(_("Error on line %d: "), line_no);
+  reset_buffer(&mess_buffer);
+  if (line_no != 0)
+    safe_buf_append(&mess_buffer, _("Error on line %d: "), line_no);
+  else
+    safe_buf_append(&mess_buffer, _("Error: "));
   va_start(ap, s);
-  res = safe_buf_vappend(s, ap);
+  res = safe_buf_vappend(&mess_buffer, s, ap);
   va_end(ap);
   if (msg_handler)
-    (*msg_handler)(ERROR, mess_buffer);
+    (*msg_handler)(ERROR, get_buf_string(&mess_buffer));
   
   return res;
 }