X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=gedcom%2Fmessage.c;h=3fe288b079c993f155322718bc10e0edaf7de6af;hb=cb43a876495af794327ff515fb7c2d6a931605c1;hp=68a7c852e3f6dc3980f91920d8e4ff9ca084d659;hpb=77989125b676e463aa052e0fd22f5bcb98d0ff77;p=gedcom-parse.git

diff --git a/gedcom/message.c b/gedcom/message.c
index 68a7c85..3fe288b 100644
--- 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, NULL, 0, cleanup_mess_buffer };
 Gedcom_msg_handler msg_handler = NULL;
 
 void gedcom_set_message_handler(Gedcom_msg_handler func)
@@ -35,98 +35,64 @@ 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';
+  cleanup_buffer(&mess_buffer);
 }
 
-void init_mess_buffer()
-{
-  if (mess_buffer == NULL) {
-    mess_buffer = (char *)malloc(INITIAL_BUF_SIZE);
-    mess_buffer[0] = '\0';
-    bufsize = INITIAL_BUF_SIZE;
-  }
-}
-
-int safe_buf_vappend(char *s, va_list ap)
-{
-  int res;
-  int len;
-  init_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(char *s, ...)
-{
-  int res;
-  va_list ap;
-  
-  va_start(ap, s);
-  res = safe_buf_vappend(s, ap);
-  va_end(ap);
-  
-  return res;
-}
-
-int gedcom_message(char* s, ...)
+int gedcom_message(const char* s, ...)
 {
   int res;
   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;
 }
 
-int gedcom_warning(char* s, ...)
+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;
 }
 
-int gedcom_error(char* s, ...)
+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;
 }
+
+void gedcom_mem_error(const char *filename, int line)
+{
+  gedcom_error(_("Could not allocate memory at %s, %d"), filename, line);
+}