diff options
| author | Mark Doffman <mark.doffman@codethink.co.uk> | 2014-03-27 20:50:21 +0000 |
|---|---|---|
| committer | Mark Doffman <mark.doffman@codethink.co.uk> | 2014-03-27 20:50:21 +0000 |
| commit | 68ff94340891f1ae4ea24546acdbbc39c4dcbcd0 (patch) | |
| tree | 46f02cba671bcb321482c7961acd91aeee57ced5 /girepository/gdump.c | |
| parent | 19da3f81593614198206c45527f973a22cdd621e (diff) | |
| parent | 89e84d06dffbc732bac26a105244b7270c42e3ec (diff) | |
| download | gobject-introspection-baserock/markdoffman/1_39_90-merge.tar.gz | |
Merge tag 'GOBJECT_INTROSPECTION_1_39_90' into baserock/markdoffman/1_39_90-mergebaserock/markdoffman/1_39_90-merge
Tag 1_39_90
Conflicts:
autogen.sh
configure.ac
Diffstat (limited to 'girepository/gdump.c')
| -rw-r--r-- | girepository/gdump.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/girepository/gdump.c b/girepository/gdump.c index 7e02d391..a72841fe 100644 --- a/girepository/gdump.c +++ b/girepository/gdump.c @@ -38,6 +38,9 @@ #include <string.h> static void +escaped_printf (GOutputStream *out, const char *fmt, ...) G_GNUC_PRINTF (2, 3); + +static void escaped_printf (GOutputStream *out, const char *fmt, ...) { char *str; @@ -422,8 +425,10 @@ dump_error_quark (GQuark quark, const char *symbol, GOutputStream *out) * * Argument specified is a comma-separated pair of filenames; i.e. of * the form "input.txt,output.xml". The input file should be a - * UTF-8 Unix-line-ending text file, with each line containing the name - * of a GType _get_type function. + * UTF-8 Unix-line-ending text file, with each line containing either + * "get-type:" followed by the name of a GType _get_type function, or + * "error-quark:" followed by the name of an error quark function. No + * extra whitespace is allowed. * * The output file should already exist, but be empty. This function will * overwrite its contents. |