Better symbol retrieval function interface. Allow larger output buffers.

3 files changed, 13 insertions, 7 deletions

diff --git a/libasm/ChangeLog b/libasm/ChangeLog
index 1fe67565..2894970e 100644
--- a/libasm/ChangeLog
+++ b/libasm/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-11  Ulrich Drepper  <drepper@redhat.com>
+
+	* libasm.h (DisasmGetSymCB_t): Change type of fourth and fifth
+	parameter.
+	* disasm_cb.c: Adjust accordingly.
+
 2008-01-08  Roland McGrath  <roland@redhat.com>
 
 	* Makefile.am (euinclude): Variable removed.
diff --git a/libasm/disasm_cb.c b/libasm/disasm_cb.c
index a0441621..56101258 100644
--- a/libasm/disasm_cb.c
+++ b/libasm/disasm_cb.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005, 2007 Red Hat, Inc.
+/* Copyright (C) 2005, 2007, 2008 Red Hat, Inc.
    This file is part of Red Hat elfutils.
    Written by Ulrich Drepper <drepper@redhat.com>, 2005.
 
@@ -42,7 +42,7 @@ struct symtoken
 
 static int
 default_elf_getsym (GElf_Addr addr, Elf32_Word scnndx, GElf_Addr value,
-		    char *buf, size_t buflen, void *arg)
+		    char **buf, size_t *buflen, void *arg)
 {
   struct symtoken *symtoken = (struct symtoken *) arg;
 
@@ -140,8 +140,8 @@ static int
 null_elf_getsym (GElf_Addr addr __attribute__ ((unused)),
 		 Elf32_Word scnndx __attribute__ ((unused)),
 		 GElf_Addr value __attribute__ ((unused)),
-		 char *buf __attribute__ ((unused)),
-		 size_t buflen __attribute__ ((unused)),
+		 char **buf __attribute__ ((unused)),
+		 size_t *buflen __attribute__ ((unused)),
 		 void *arg __attribute__ ((unused)))
 {
   return -1;
diff --git a/libasm/libasm.h b/libasm/libasm.h
index 8a005f1c..307c7349 100644
--- a/libasm/libasm.h
+++ b/libasm/libasm.h
@@ -1,5 +1,5 @@
 /* Interface for libasm.
-   Copyright (C) 2002, 2005 Red Hat, Inc.
+   Copyright (C) 2002, 2005, 2008 Red Hat, Inc.
    This file is part of Red Hat elfutils.
 
    Red Hat elfutils is free software; you can redistribute it and/or modify
@@ -52,8 +52,8 @@ typedef struct DisasmCtx DisasmCtx_t;
    symbol reference is in the section designated by the second parameter
    at an offset described by the first parameter.  The value is the
    third parameter.  */
-typedef int (*DisasmGetSymCB_t) (GElf_Addr, Elf32_Word, GElf_Addr, char *,
-				 size_t, void *);
+typedef int (*DisasmGetSymCB_t) (GElf_Addr, Elf32_Word, GElf_Addr, char **,
+				 size_t *, void *);
 
 /* Output function callback.  */
 typedef int (*DisasmOutputCB_t) (char *, size_t, void *);