dlugolecki.net.pl
Dziennik
Polecane
Software
projects
/
gedcom-parse.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Keep old encoding if new one cannot be created.
[gedcom-parse.git]
/
gedcom
/
message.c
diff --git
a/gedcom/message.c
b/gedcom/message.c
index 23d5c867a41abce99758334432e6997fabc77d30..213e0493126ec81184adcc895093ef209a2b6583 100644
(file)
--- a/
gedcom/message.c
+++ b/
gedcom/message.c
@@
-41,6
+41,12
@@
void reset_mess_buffer()
mess_buffer[0] = '\0';
}
mess_buffer[0] = '\0';
}
+void cleanup_mess_buffer()
+{
+ if (mess_buffer)
+ free(mess_buffer);
+}
+
void init_mess_buffer()
{
if (mess_buffer == NULL) {
void init_mess_buffer()
{
if (mess_buffer == NULL) {
@@
-48,14
+54,18
@@
void init_mess_buffer()
if (mess_buffer) {
mess_buffer[0] = '\0';
bufsize = INITIAL_BUF_SIZE;
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__);
__FILE__, __LINE__);
+ fprintf(stderr, "\n");
+ }
}
}
}
}
-int safe_buf_vappend(char *s, va_list ap)
+int safe_buf_vappend(c
onst c
har *s, va_list ap)
{
int res = 0;
int len;
{
int res = 0;
int len;
@@
-80,7
+90,7
@@
int safe_buf_vappend(char *s, va_list ap)
return res;
}
return res;
}
-int safe_buf_append(char *s, ...)
+int safe_buf_append(c
onst c
har *s, ...)
{
int res;
va_list ap;
{
int res;
va_list ap;
@@
-92,7
+102,7
@@
int safe_buf_append(char *s, ...)
return res;
}
return res;
}
-int gedcom_message(char* s, ...)
+int gedcom_message(c
onst c
har* s, ...)
{
int res;
va_list ap;
{
int res;
va_list ap;
@@
-106,13
+116,16
@@
int gedcom_message(char* s, ...)
return res;
}
return res;
}
-int gedcom_warning(char* s, ...)
+int gedcom_warning(c
onst c
har* s, ...)
{
int res;
va_list ap;
reset_mess_buffer();
{
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);
va_start(ap, s);
res = safe_buf_vappend(s, ap);
va_end(ap);
@@
-122,13
+135,16
@@
int gedcom_warning(char* s, ...)
return res;
}
return res;
}
-int gedcom_error(char* s, ...)
+int gedcom_error(c
onst c
har* s, ...)
{
int res;
va_list ap;
reset_mess_buffer();
{
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);
va_start(ap, s);
res = safe_buf_vappend(s, ap);
va_end(ap);
@@
-138,7
+154,7
@@
int gedcom_error(char* s, ...)
return res;
}
return res;
}
-void gedcom_mem_error(char *filename, int line)
+void gedcom_mem_error(c
onst c
har *filename, int line)
{
gedcom_error(_("Could not allocate memory at %s, %d"), filename, line);
}
{
gedcom_error(_("Could not allocate memory at %s, %d"), filename, line);
}