X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=format_check.c;h=359a7163df2e1e1ab7c200c65c908345eb32a177;hb=e8c3740ddabcf2da3a4b8ec022250be364668866;hp=4c1d6701f9067cfff8f4c8dcb01654c9de27383d;hpb=ff5b9dd9d29a3f0acdbfdd10f6d2eece471ed289;p=cparser

diff --git a/format_check.c b/format_check.c
index 4c1d670..359a716 100644
--- a/format_check.c
+++ b/format_check.c
@@ -1,21 +1,6 @@
 /*
  * This file is part of cparser.
- * 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
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Copyright (C) 2012 Matthias Braun <matze@braunis.de>
  */
 #include <config.h>
 
@@ -94,7 +79,7 @@ static const char* get_length_modifier_name(const format_length_modifier_t mod)
 	return names[mod];
 }
 
-static void warn_invalid_length_modifier(const source_position_t *pos,
+static void warn_invalid_length_modifier(const position_t *pos,
                                          const format_length_modifier_t mod,
                                          const utf32 conversion)
 {
@@ -134,7 +119,7 @@ static int internal_check_printf_format(const expression_t *fmt_expr,
 	size_t      size   = fmt_expr->string_literal.value.size;
 	const char *c      = string;
 
-	const source_position_t *pos = &fmt_expr->base.source_position;
+	const position_t *pos = &fmt_expr->base.pos;
 	unsigned num_fmt  = 0;
 	unsigned num_args = 0;
 	char     fmt;
@@ -532,8 +517,8 @@ too_few_args:
 				}
 			}
 			if (is_type_valid(arg_skip)) {
-				source_position_t const *const apos = &arg->expression->base.source_position;
-				char              const *const mod  = get_length_modifier_name(fmt_mod);
+				position_t const *const apos = &arg->expression->base.pos;
+				char       const *const mod  = get_length_modifier_name(fmt_mod);
 				warningf(WARN_FORMAT, apos, "conversion '%%%s%c' at position %u specifies type '%T' but the argument has type '%T'", mod, (char)fmt, num_fmt, expected_type, arg_type);
 			}
 		}
@@ -575,7 +560,7 @@ static void check_printf_format(call_argument_t const *arg,
 	for (; arg != NULL; arg = arg->next)
 		++num_args;
 	if (num_args > (size_t)num_fmt) {
-		source_position_t const *const pos = &fmt_expr->base.source_position;
+		position_t const *const pos = &fmt_expr->base.pos;
 		warningf(WARN_FORMAT, pos, "%u argument%s but only %u format specifier%s", num_args, num_args != 1 ? "s" : "", num_fmt,  num_fmt  != 1 ? "s" : "");
 	}
 }
@@ -610,7 +595,7 @@ static void check_scanf_format(const call_argument_t *arg,
 	for (; idx < spec->arg_idx && arg != NULL; ++idx)
 		arg = arg->next;
 
-	const source_position_t *pos = &fmt_expr->base.source_position;
+	const position_t *pos = &fmt_expr->base.pos;
 	unsigned num_fmt = 0;
 	char     fmt;
 	for (fmt = *c; fmt != '\0'; fmt = *(++c)) {
@@ -912,8 +897,8 @@ too_few_args:
 			}
 error_arg_type:
 			if (is_type_valid(arg_skip)) {
-				source_position_t const *const apos = &arg->expression->base.source_position;
-				char              const *const mod  = get_length_modifier_name(fmt_mod);
+				position_t const *const apos = &arg->expression->base.pos;
+				char       const *const mod  = get_length_modifier_name(fmt_mod);
 				warningf(WARN_FORMAT, apos, "conversion '%%%s%c' at position %u specifies type '%T*' but the argument has type '%T'", mod, (char)fmt, num_fmt, expected_type, arg_type);
 			}
 		}