system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-20 22:44:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

dbghelp: Assorted fixes for shadow variables.

Browse source
This commit is contained in:
André Hentschel 2012-04-19 23:22:33 +02:00 committed by Alexandre Julliard
parent acea60ca85
commit 89cb501927
4 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dlls/dbghelp/dwarf.c
View file

@ -2188,7 +2188,7 @@ static BOOL dwarf2_parse_line_numbers(const dwarf2_section_t* sections,
vector_init(&files, sizeof(unsigned), 16);
while (*traverse.data)
{
unsigned int dir_index, mod_time, length;
unsigned int dir_index, mod_time;
const char* name;
const char* dir;
unsigned* psrc;
@ -2199,7 +2199,7 @@ static BOOL dwarf2_parse_line_numbers(const dwarf2_section_t* sections,
mod_time = dwarf2_leb128_as_unsigned(&traverse);
length = dwarf2_leb128_as_unsigned(&traverse);
dir = *(const char**)vector_at(&dirs, dir_index);
TRACE("Got file %s/%s (%u,%u)\n", dir, name, mod_time, length);
TRACE("Got file %s/%s (%u,%lu)\n", dir, name, mod_time, length);
psrc = vector_add(&files, &ctx->pool);
*psrc = source_new(ctx->module, dir, name);
}

11
dlls/dbghelp/msc.c
View file

@ -1551,7 +1551,6 @@ static int codeview_snarf(const struct msc_debug_info* msc_dbg, const BYTE* root
int i, length;
struct symt_block* block = NULL;
struct symt* symt;
const char* name;
struct symt_compiland* compiland = NULL;
struct location loc;
@ -1947,9 +1946,13 @@ static int codeview_snarf(const struct msc_debug_info* msc_dbg, const BYTE* root
case S_PROCREF_V1:
case S_DATAREF_V1:
case S_LPROCREF_V1:
name = (const char*)sym + length;
length += (*name + 1 + 3) & ~3;
break;
{
const char* name;
name = (const char*)sym + length;
length += (*name + 1 + 3) & ~3;
break;
}
case S_MSTOOL_V3: /* just to silence a few warnings */
case S_MSTOOLINFO_V3:

1
dlls/dbghelp/path.c
View file

@ -479,7 +479,6 @@ static BOOL CALLBACK module_find_cb(PCWSTR buffer, PVOID user)
{
HANDLE hFile, hMap;
void* mapping;
DWORD timestamp;
timestamp = ~mf->dw1;
size = ~mf->dw2;

1
dlls/dbghelp/stabs.c
View file

@ -604,7 +604,6 @@ static inline int stabs_pts_read_method_info(struct ParseTypedefData* ptd)
if (mthd == '*')
{
long int ofs;
struct symt* dt;
PTS_ABORTIF(ptd, stabs_pts_read_number(ptd, &ofs) == -1);
PTS_ABORTIF(ptd, *ptd->ptr++ != ';');