Removed newlines from error strings.

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

diff --git a/gedcom/message.c b/gedcom/message.c
index 68a7c852e3f6dc3980f91920d8e4ff9ca084d659..c3a5abf1ab642502f9639edda1997d9cfb9cf082 100644 (file)
--- a/gedcom/message.c
+++ b/gedcom/message.c
@@ -45,32 +45,41 @@ void init_mess_buffer()
 {
   if (mess_buffer == NULL) {
     mess_buffer = (char *)malloc(INITIAL_BUF_SIZE);
-    mess_buffer[0] = '\0';
-    bufsize = 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(char *s, va_list ap)
 {
-  int res;
+  int res = 0;
   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);
+  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;  
+  return res;
 }
 
 int safe_buf_append(char *s, ...)
@@ -130,3 +139,8 @@ int gedcom_error(char* s, ...)
   
   return res;
 }
+
+void gedcom_mem_error(char *filename, int line)
+{
+  gedcom_error(_("Could not allocate memory at %s, %d"), filename, line);
+}