mess_buffer[0] = '\0';
}
+void cleanup_mess_buffer()
+{
+ if (mess_buffer)
+ free(mess_buffer);
+}
+
void init_mess_buffer()
{
if (mess_buffer == NULL) {
if (mess_buffer) {
mess_buffer[0] = '\0';
bufsize = INITIAL_BUF_SIZE;
+ if (atexit(cleanup_mess_buffer) != 0)
+ gedcom_warning(_("Could not register buffer cleanup function"));
}
- else
- fprintf(stderr, _("Could not allocate memory at %s, %d\n"),
+ 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 safe_buf_vappend(const char *s, va_list ap)
{
int res = 0;
int len;
return res;
}
-int safe_buf_append(char *s, ...)
+int safe_buf_append(const char *s, ...)
{
int res;
va_list ap;
return res;
}
-int gedcom_message(char* s, ...)
+int gedcom_message(const char* s, ...)
{
int res;
va_list ap;
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);
+ if (line_no != 0)
+ safe_buf_append(_("Warning on line %d: "), line_no);
+ else
+ safe_buf_append(_("Warning: "));
va_start(ap, s);
res = safe_buf_vappend(s, ap);
va_end(ap);
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);
+ if (line_no != 0)
+ safe_buf_append(_("Error on line %d: "), line_no);
+ else
+ safe_buf_append(_("Error: "));
va_start(ap, s);
res = safe_buf_vappend(s, ap);
va_end(ap);
return res;
}
-void gedcom_mem_error(char *filename, int line)
+void gedcom_mem_error(const char *filename, int line)
{
gedcom_error(_("Could not allocate memory at %s, %d"), filename, line);
}