projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
render: Fix typo in comment.
[pspp]
/
src
/
libpspp
/
message.h
diff --git
a/src/libpspp/message.h
b/src/libpspp/message.h
index 8ed284413398fdeeb0e2810a1dcf9b1258b4072f..f2ec23c2c331c8b4007cbecf5cb545179a2191dd 100644
(file)
--- a/
src/libpspp/message.h
+++ b/
src/libpspp/message.h
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2006, 2010, 2011 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2006, 2010, 2011
, 2014
Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-39,6
+39,8
@@
enum msg_severity
MSG_N_SEVERITIES
};
MSG_N_SEVERITIES
};
+const char *msg_severity_to_string (enum msg_severity);
+
/* Combination of a category and a severity for convenience. */
enum msg_class
{
/* Combination of a category and a severity for convenience. */
enum msg_class
{
@@
-78,6
+80,7
@@
struct msg
int first_column; /* 1-based first column, or 0 if none. */
int last_column; /* 1-based exclusive last column (0=none). */
char *text; /* Error text. */
int first_column; /* 1-based first column, or 0 if none. */
int last_column; /* 1-based exclusive last column (0=none). */
char *text; /* Error text. */
+ bool shipped; /* True if this message has been emitted */
};
/* Initialization. */
};
/* Initialization. */
@@
-90,10
+93,15
@@
void msg_destroy(struct msg *);
char *msg_to_string (const struct msg *, const char *command_name);
/* Emitting messages. */
char *msg_to_string (const struct msg *, const char *command_name);
/* Emitting messages. */
+void vmsg (enum msg_class class, const char *format, va_list args)
+ PRINTF_FORMAT (2, 0);
void msg (enum msg_class, const char *format, ...)
PRINTF_FORMAT (2, 3);
void msg_emit (struct msg *);
void msg (enum msg_class, const char *format, ...)
PRINTF_FORMAT (2, 3);
void msg_emit (struct msg *);
+void msg_error (int errnum, const char *format, ...);
+
+
/* Enable and disable messages. */
void msg_enable (void);
void msg_disable (void);
/* Enable and disable messages. */
void msg_enable (void);
void msg_disable (void);