option was parsed twice

[cparser] / diagnostic.c

diff --git a/diagnostic.c b/diagnostic.c
index 7d8c0ab..01773f3 100644 (file)
--- a/diagnostic.c
+++ b/diagnostic.c
@@ -1,6 +1,6 @@
 /*
  * This file is part of cparser.
- * Copyright (C) 2007-2008 Matthias Braun <matze@braunis.de>
+ * Copyright (C) 2007-2009 Matthias Braun <matze@braunis.de>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -67,12 +67,6 @@ static void diagnosticvf(const char *const fmt, va_list ap)
                                        fputc(*f, stderr);
                                        break;
 
-                               case 'C': {
-                                       const wint_t val = va_arg(ap, wint_t);
-                                       fprintf(stderr, "%lc", val);
-                                       break;
-                               }
-
                                case 'c': {
                                        const unsigned char val = (unsigned char) va_arg(ap, int);
                                        fputc(val, stderr);
@@ -91,6 +85,14 @@ static void diagnosticvf(const char *const fmt, va_list ap)
                                        break;
                                }
 
+                               case 'S': {
+                                       const string_t *str = va_arg(ap, const string_t*);
+                                       for (size_t i = 0; i < str->size; ++i) {
+                                               fputc(str->begin[i], stderr);
+                                       }
+                                       break;
+                               }
+
                                case 'u': {
                                        const unsigned int val = va_arg(ap, unsigned int);
                                        fprintf(stderr, "%u", val);
@@ -114,7 +116,7 @@ static void diagnosticvf(const char *const fmt, va_list ap)
 
                                case 'Q': {
                                        const unsigned qualifiers = va_arg(ap, unsigned);
-                                       print_type_qualifiers(qualifiers);
+                                       print_type_qualifiers(qualifiers, QUAL_SEP_NONE);
                                        break;
                                }