Eric Pouech : dbghelp: Removed unneeded code from rewrite of . gnu_link handling.

Alexandre Julliard julliard at wine.codeweavers.com
Mon Jan 15 07:43:10 CST 2007


Module: wine
Branch: master
Commit: 2e34ea4e01a50596d887f1a126cd7dd42b109de7
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=2e34ea4e01a50596d887f1a126cd7dd42b109de7

Author: Eric Pouech <eric.pouech at wanadoo.fr>
Date:   Sun Jan 14 14:29:12 2007 +0100

dbghelp: Removed unneeded code from rewrite of .gnu_link handling.

---

 dlls/dbghelp/elf_module.c |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c
index a06e926..9b6b458 100644
--- a/dlls/dbghelp/elf_module.c
+++ b/dlls/dbghelp/elf_module.c
@@ -800,7 +800,7 @@ static BOOL elf_debuglink_parse (struct
      * 2/ padding on 4 byte boundary
      * 3/ CRC of the linked ELF file
      */
-    BOOL ret = FALSE, lret;
+    BOOL ret = FALSE;
     const char* dbg_link = (char*)debuglink;
     struct elf_file_map fmap_link;
 
@@ -808,13 +808,12 @@ static BOOL elf_debuglink_parse (struct
     {
 	fmap_link.crc = *(const DWORD*)(dbg_link + ((DWORD_PTR)(strlen(dbg_link) + 4) & ~3));
 	fmap_link.with_crc = 1;
-	lret = elf_load_debug_info_from_map(module, &fmap_link, pool,
-					    ht_symtab);
-	if (lret)
+	ret = elf_load_debug_info_from_map(module, &fmap_link, pool,
+                                           ht_symtab);
+	if (ret)
 	    strcpy(module->module.LoadedPdbName, dbg_link);
 	else
 	    WARN("Couldn't load debug information from %s\n", dbg_link);
-	ret = ret || lret;
 	elf_unmap_file(&fmap_link);
     }
     else




More information about the wine-cvs mailing list