CVS: winex/dlls/dbghelp dbghelp_private.h, 1.5, 1.6 symbol.c, 1.7, 1.8

Subject: winex/dlls/dbghelp dbghelp_private.h,1.5,1.6 symbol.c,1.7,1.8Update of /var/lib/cvsd/cvsroot/winex/dlls/dbghelp
In directory agravaine:/tmp/cvs-serv14546/dlls/dbghelp

Modified Files:
	dbghelp_private.h symbol.c 
Log Message:
used debugstr_a() instead of a length limiting format string for function names
trac #2034

- reverted a previous change to limit function name lengths and opted to use the debugstr_a() function instead.  This was Ove's suggestion.


Index: dbghelp_private.h
===================================================================
RCS file: /var/lib/cvsd/cvsroot/winex/dlls/dbghelp/dbghelp_private.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- dbghelp_private.h	31 Aug 2007 12:55:39 -0000	1.5
+++ dbghelp_private.h	12 Sep 2007 12:49:03 -0000	1.6
@@ -37,7 +37,6 @@
 #include "wine-lgpl/cvconst.h"
 
 /* #define USE_STATS */
-#define FUNCTION_NAME_FORMAT    "%.256s"
 
 
 struct pool /* poor's man */

Index: symbol.c
===================================================================
RCS file: /var/lib/cvsd/cvsroot/winex/dlls/dbghelp/symbol.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- symbol.c	31 Aug 2007 12:55:39 -0000	1.7
+++ symbol.c	12 Sep 2007 12:49:03 -0000	1.8
@@ -221,8 +221,8 @@
     struct symt_public* sym;
     struct symt**       p;
 
-    TRACE_(dbghelp_symt)("Adding public symbol %s:" FUNCTION_NAME_FORMAT " {addr = 0x%lx - 0x%lx (size = 0x%x)}\n",
-                         debugstr_w(module->module.ModuleName), name, address, address + size, size);
+    TRACE_(dbghelp_symt)("Adding public symbol %s:%s {addr = 0x%lx - 0x%lx (size = 0x%x)}\n",
+                         debugstr_w(module->module.ModuleName), debugstr_a(name), address, address + size, size);
     if ((dbghelp_options & SYMOPT_AUTO_PUBLICS) &&
         symt_find_nearest(module, address) != NULL)
         return NULL;
@@ -293,8 +293,8 @@
     struct symt_function*       sym;
     struct symt**               p;
 
-    TRACE_(dbghelp_symt)("Adding global function %s:" FUNCTION_NAME_FORMAT " @%lx-%lx\n",
-                         debugstr_w(module->module.ModuleName), name, addr, addr + size - 1);
+    TRACE_(dbghelp_symt)("Adding global function %s:%s @%lx-%lx\n",
+                         debugstr_w(module->module.ModuleName), debugstr_a(name), addr, addr + size - 1);
 
     assert(!sig_type || sig_type->tag == SymTagFunctionType);
     if ((sym = pool_alloc(&module->pool, sizeof(*sym))))
@@ -327,8 +327,8 @@
 
     if (func == NULL || !(dbghelp_options & SYMOPT_LOAD_LINES)) return;
 
-    TRACE_(dbghelp_symt)("(%p)" FUNCTION_NAME_FORMAT ":%lx %s:%u\n", 
-                         func, func->hash_elt.name, offset, 
+    TRACE_(dbghelp_symt)("(%p) %s:%lx %s:%u\n", 
+                         func, debugstr_a(func->hash_elt.name), offset, 
                          source_get(module, source_idx), line_num);
 
     assert(func->symt.tag == SymTagFunction);
@@ -380,8 +380,8 @@
     struct symt_data*   locsym;
     struct symt**       p;
 
-    TRACE_(dbghelp_symt)("Adding local symbol (%s:" FUNCTION_NAME_FORMAT "): %s %p\n",
-                         debugstr_w(module->module.ModuleName), func->hash_elt.name,
+    TRACE_(dbghelp_symt)("Adding local symbol (%s:%s): %s %p\n",
+                         debugstr_w(module->module.ModuleName), debugstr_a(func->hash_elt.name),
                          name, type);
 
     assert(func);