From 91bc4ab5dc38760864420a15b52808ab43a74f2f Mon Sep 17 00:00:00 2001
From: Peter Johnson <peter@tortall.net>
Date: Wed, 4 Jul 2001 20:57:53 +0000
Subject: [PATCH] Use %1 and %2 instead of %s and %d for "duplicate definition"
 error message (allows message to be arbitarily changed, including reversing
 order of %1 and %2 without having to change every location it's called from).

svn path=/trunk/yasm/; revision=88
---
 libyasm/errwarn.c | 4 ++--
 libyasm/symrec.c  | 4 ++--
 src/errwarn.c     | 4 ++--
 src/symrec.c      | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/libyasm/errwarn.c b/libyasm/errwarn.c
index d76a9748..807b90e1 100644
--- a/libyasm/errwarn.c
+++ b/libyasm/errwarn.c
@@ -1,4 +1,4 @@
-/* $Id: errwarn.c,v 1.13 2001/07/04 20:53:21 peter Exp $
+/* $Id: errwarn.c,v 1.14 2001/07/04 20:57:53 peter Exp $
  * Error and warning reporting and related functions.
  *
  *  Copyright (C) 2001  Peter Johnson
@@ -55,7 +55,7 @@ static char *err_msgs[] = {
     "invalid effective address",
     "label or instruction expected at start of line",
     "expression syntax error",
-    "duplicate definition of `%s'; previously defined line %d",
+    "duplicate definition of `%1'; previously defined line %2",
     "mismatch in operand sizes"
 };
 
diff --git a/libyasm/symrec.c b/libyasm/symrec.c
index 70637c98..b9a16db7 100644
--- a/libyasm/symrec.c
+++ b/libyasm/symrec.c
@@ -1,4 +1,4 @@
-/* $Id: symrec.c,v 1.3 2001/06/13 05:56:06 mu Exp $
+/* $Id: symrec.c,v 1.4 2001/07/04 20:57:53 peter Exp $
  * Symbol table handling
  *
  *  Copyright (C) 2001  Michael Urman
@@ -117,7 +117,7 @@ symrec *sym_def_get (char *name, SymType type)
     symtab *tab;
     tab = symtab_get_or_new (name, type);
     if (tab->rec.status & SYM_DECLARED)
-	Error (ERR_DUPLICATE_DEF, (char *)NULL, tab->rec.name, tab->rec.line);
+	Error (ERR_DUPLICATE_DEF, "%s%d", tab->rec.name, tab->rec.line);
     tab->rec.status |= SYM_DECLARED;
     return &(tab->rec);
 }
diff --git a/src/errwarn.c b/src/errwarn.c
index d76a9748..807b90e1 100644
--- a/src/errwarn.c
+++ b/src/errwarn.c
@@ -1,4 +1,4 @@
-/* $Id: errwarn.c,v 1.13 2001/07/04 20:53:21 peter Exp $
+/* $Id: errwarn.c,v 1.14 2001/07/04 20:57:53 peter Exp $
  * Error and warning reporting and related functions.
  *
  *  Copyright (C) 2001  Peter Johnson
@@ -55,7 +55,7 @@ static char *err_msgs[] = {
     "invalid effective address",
     "label or instruction expected at start of line",
     "expression syntax error",
-    "duplicate definition of `%s'; previously defined line %d",
+    "duplicate definition of `%1'; previously defined line %2",
     "mismatch in operand sizes"
 };
 
diff --git a/src/symrec.c b/src/symrec.c
index 70637c98..b9a16db7 100644
--- a/src/symrec.c
+++ b/src/symrec.c
@@ -1,4 +1,4 @@
-/* $Id: symrec.c,v 1.3 2001/06/13 05:56:06 mu Exp $
+/* $Id: symrec.c,v 1.4 2001/07/04 20:57:53 peter Exp $
  * Symbol table handling
  *
  *  Copyright (C) 2001  Michael Urman
@@ -117,7 +117,7 @@ symrec *sym_def_get (char *name, SymType type)
     symtab *tab;
     tab = symtab_get_or_new (name, type);
     if (tab->rec.status & SYM_DECLARED)
-	Error (ERR_DUPLICATE_DEF, (char *)NULL, tab->rec.name, tab->rec.line);
+	Error (ERR_DUPLICATE_DEF, "%s%d", tab->rec.name, tab->rec.line);
     tab->rec.status |= SYM_DECLARED;
     return &(tab->rec);
 }
-- 
2.40.0