[ltrace-commits] 17/40: import_DWARF_prototypes() now takes JUST a lib argument

[Petr Machata]

This is an automated email from the git hooks/post-receive script.

pmachata-guest pushed a commit to branch master
in repository ltrace.

commit 9c2376b57268d2f33fe4849af6d5653e70746290
Author: Dima Kogan <dima at secretsauce.net>
Date:   Wed Apr 23 03:41:55 2014 -0700

    import_DWARF_prototypes() now takes JUST a lib argument
---
 dwarf_prototypes.c | 12 +++++++++---
 dwarf_prototypes.h |  2 +-
 output.c           |  2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/dwarf_prototypes.c b/dwarf_prototypes.c
index f76dbed..24da288 100644
--- a/dwarf_prototypes.c
+++ b/dwarf_prototypes.c
@@ -779,9 +779,11 @@ static bool import(struct protolib* plib, struct library* lib, Dwfl* dwfl)
 	return true;
 }
 
-bool import_DWARF_prototypes(struct protolib* plib, struct library* lib,
-							 Dwfl *dwfl)
+bool import_DWARF_prototypes(struct library* lib)
 {
+	struct protolib*	plib = lib->protolib;
+	Dwfl*				dwfl = lib->dwfl;
+
 	if (plib == NULL) {
 		plib = protolib_cache_default(&g_protocache, lib->soname, 0);
 		if (plib == NULL) {
@@ -790,7 +792,11 @@ bool import_DWARF_prototypes(struct protolib* plib, struct library* lib,
 		}
 	}
 
-	return import(plib, lib, dwfl);
+	if (import(plib, lib, dwfl)) {
+		lib->protolib = plib;
+		return true;
+	}
+	return false;
 }
 
 /*
diff --git a/dwarf_prototypes.h b/dwarf_prototypes.h
index 02ebf3f..e0b7392 100644
--- a/dwarf_prototypes.h
+++ b/dwarf_prototypes.h
@@ -6,4 +6,4 @@
 #include "prototype.h"
 #include "library.h"
 
-bool import_DWARF_prototypes(struct protolib* plib, struct library* lib, Dwfl *dwfl);
+bool import_DWARF_prototypes(struct library* lib);
diff --git a/output.c b/output.c
index 5dcc475..f7d23ce 100644
--- a/output.c
+++ b/output.c
@@ -217,7 +217,7 @@ library_get_prototype(struct library *lib, const char *name)
 			(filter_matches_library(options.plt_filter,    lib ) ||
 			 filter_matches_library(options.static_filter, lib ) ||
 			 filter_matches_library(options.export_filter, lib )))
-			import_DWARF_prototypes(lib->protolib, lib, lib->dwfl);
+			import_DWARF_prototypes(lib);
 #endif
 
 		if (lib->protolib == NULL)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/ltrace.git