projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
work toward better error reporting
[pspp]
/
src
/
libpspp
/
message.h
diff --git
a/src/libpspp/message.h
b/src/libpspp/message.h
index 6cfbde7c5019ba2740a01c80bde5266edc7b06fc..fdb5a535600cbed7f9a1f111072363dd9d1708bd 100644
(file)
--- a/
src/libpspp/message.h
+++ b/
src/libpspp/message.h
@@
-85,6
+85,8
@@
void msg_location_uninit (struct msg_location *);
void msg_location_destroy (struct msg_location *);
struct msg_location *msg_location_dup (const struct msg_location *);
void msg_location_destroy (struct msg_location *);
struct msg_location *msg_location_dup (const struct msg_location *);
+void msg_location_merge (struct msg_location **, const struct msg_location *);
+
bool msg_location_is_empty (const struct msg_location *);
void msg_location_format (const struct msg_location *, struct string *);
bool msg_location_is_empty (const struct msg_location *);
void msg_location_format (const struct msg_location *, struct string *);
@@
-119,10
+121,14
@@
void msg_destroy(struct msg *);
char *msg_to_string (const struct msg *);
/* Emitting messages. */
char *msg_to_string (const struct msg *);
/* Emitting messages. */
-void vmsg (enum msg_class class, const char *format, va_list args)
- PRINTF_FORMAT (2, 0);
+void vmsg (enum msg_class, const struct msg_location *,
+ const char *format, va_list args)
+ PRINTF_FORMAT (3, 0);
void msg (enum msg_class, const char *format, ...)
PRINTF_FORMAT (2, 3);
void msg (enum msg_class, const char *format, ...)
PRINTF_FORMAT (2, 3);
+void msg_at (enum msg_class, const struct msg_location *,
+ const char *format, ...)
+ PRINTF_FORMAT (3, 4);
void msg_emit (struct msg *);
void msg_error (int errnum, const char *format, ...)
void msg_emit (struct msg *);
void msg_error (int errnum, const char *format, ...)