This commit was generated by cvs2svn to track changes on a CVS vendor

[binutils-gdb.git] / opcodes / dis-buf.c

diff --git a/opcodes/dis-buf.c b/opcodes/dis-buf.c
index 34384347f8ca368f684421ba4aae0cce2b36e381..c6e512122eb076568b8b8124b8dcc6a3c8de6d25 100644 (file)
--- a/opcodes/dis-buf.c
+++ b/opcodes/dis-buf.c
@@ -1,5 +1,5 @@
 /* Disassemble from a buffer, for GNU.
-   Copyright (C) 1993, 1994, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1994, 1998, 1999 Free Software Foundation, Inc.
 
 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
@@ -81,15 +81,15 @@ generic_strcat_address (addr, buf, len)
      int len;
 {
   if (buf != (char *)NULL && len > 0)
-  {
-    char tmpBuf[30];
+    {
+      char tmpBuf[30];
 
-    sprintf(tmpBuf, "0x%x", addr);
-    if ((strlen(buf) + strlen(tmpBuf)) <= len)
-      strcat(buf, tmpBuf);
-    else
-      strncat(buf, tmpBuf, (len - strlen(buf)));
-  }
+      sprintf_vma (tmpBuf, addr);
+      if ((strlen (buf) + strlen (tmpBuf)) <= (unsigned int) len)
+       strcat (buf, tmpBuf);
+      else
+       strncat (buf, tmpBuf, (len - strlen(buf)));
+    }
   return;
 }
 
@@ -97,8 +97,8 @@ generic_strcat_address (addr, buf, len)
 
 int
 generic_symbol_at_address (addr, info)
-     bfd_vma addr;
-     struct disassemble_info * info;
+     bfd_vma addr ATTRIBUTE_UNUSED;
+     struct disassemble_info *info ATTRIBUTE_UNUSED;
 {
   return 1;
 }