[Crash-utility] [PATCH 3/4] Rename convert() to converts() to avoid conflit with gdb

[Rabin Vincent]

There's a function called convert() in MIPS gdb which conflicts with
crash's.
---
 defs.h   | 2 +-
 kernel.c | 6 +++---
 tools.c  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/defs.h b/defs.h
index 9d44fbc..c48e32a 100644
--- a/defs.h
+++ b/defs.h
@@ -4415,7 +4415,7 @@ ulonglong dtoll(char *, int, int *);
 int decimal(char *, int);
 int hexadecimal(char *, int);
 int hexadecimal_only(char *, int);
-ulong convert(char *, int, int *, ulong);
+ulong converts(char *, int, int *, ulong);
 void pad_line(FILE *, int, char);
 #define INDENT(x)  pad_line(fp, x, ' ')
 char *mkstring(char *, int, ulong, const char *);
diff --git a/kernel.c b/kernel.c
index cca7f06..01d9d1c 100644
--- a/kernel.c
+++ b/kernel.c
@@ -2105,7 +2105,7 @@ cmd_bt(void)
 
 		case 'I':
 			bt->hp = &hook;
-			hook.eip = convert(optarg, FAULT_ON_ERROR, 
+			hook.eip = converts(optarg, FAULT_ON_ERROR,
 				NULL, NUM_HEX|NUM_EXPR);
 			break;
 
@@ -2205,7 +2205,7 @@ cmd_bt(void)
 		if (machdep->flags & FRAMESIZE_DEBUG) {
 			while (args[optind]) {
 				if (!hook.eip)
-                       			hook.eip = convert(args[optind], 
+					hook.eip = converts(args[optind],
 						FAULT_ON_ERROR, NULL, 
 						NUM_HEX|NUM_EXPR);
 				else {
@@ -2250,7 +2250,7 @@ cmd_bt(void)
 		} else {
 			if (args[optind]) {
 				fake_tc.task = xen_hyper_pcpu_to_active_vcpu(
-				    convert(args[optind], 0, NULL, NUM_DEC | NUM_HEX));
+				    converts(args[optind], 0, NULL, NUM_DEC | NUM_HEX));
 			} else {
 				fake_tc.task = XEN_HYPER_VCPU_LAST_CONTEXT()->vcpu;
 			}
diff --git a/tools.c b/tools.c
index 15ee483..e769224 100644
--- a/tools.c
+++ b/tools.c
@@ -645,7 +645,7 @@ ordinal(ulong val, char *buf)
  *  If HEX_BIAS is set, pass the value on to htol().
  */
 ulong
-convert(char *s, int flags, int *errptr, ulong numflag)
+converts(char *s, int flags, int *errptr, ulong numflag)
 {
 	struct syment *sp;
 
-- 
2.1.4