[PATCH v2 1/7] dbghelp: Rename struct internal_line into lineinfo.

[Eric Pouech]

From: Eric Pouech

Used in next patches as the structure & helpers are going
to be used in other CUs.

Signed-off-by: Eric Pouech 
---
 dlls/dbghelp/symbol.c | 208 +++++++++++++++++++++---------------------
 1 file changed, 104 insertions(+), 104 deletions(-)

diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c
index 7edf11a19b9..52c284f2c1e 100644
--- a/dlls/dbghelp/symbol.c
+++ b/dlls/dbghelp/symbol.c
@@ -1754,7 +1754,7 @@ BOOL WINAPI SymGetSymFromName(HANDLE hProcess, PCSTR Name, PIMAGEHLP_SYMBOL Symb
     return TRUE;
 }

-struct internal_line_t
+struct lineinfo_t
 {
     BOOL                        unicode;
     PVOID                       key;
@@ -1767,95 +1767,95 @@ struct internal_line_t
     DWORD64                     address;
 };

-static void init_internal_line(struct internal_line_t* intl, BOOL unicode)
+static void init_lineinfo(struct lineinfo_t* line_info, BOOL unicode)
 {
-    intl->unicode = unicode;
-    intl->key = NULL;
-    intl->line_number = 0;
-    intl->file_nameA = NULL;
-    intl->address = 0;
+    line_info->unicode = unicode;
+    line_info->key = NULL;
+    line_info->line_number = 0;
+    line_info->file_nameA = NULL;
+    line_info->address = 0;
 }

-static BOOL internal_line_copy_toA32(const struct internal_line_t* intl, IMAGEHLP_LINE* l32)
+static BOOL lineinfo_copy_toA32(const struct lineinfo_t* line_info, IMAGEHLP_LINE* l32)
 {
-    if (intl->unicode) return FALSE;
-    l32->Key = intl->key;
-    l32->LineNumber = intl->line_number;
-    l32->FileName = intl->file_nameA;
-    l32->Address = intl->address;
+    if (line_info->unicode) return FALSE;
+    l32->Key = line_info->key;
+    l32->LineNumber = line_info->line_number;
+    l32->FileName = line_info->file_nameA;
+    l32->Address = line_info->address;
     return TRUE;
 }

-static BOOL internal_line_copy_toA64(const struct internal_line_t* intl, IMAGEHLP_LINE64* l64)
+static BOOL lineinfo_copy_toA64(const struct lineinfo_t* line_info, IMAGEHLP_LINE64* l64)
 {
-    if (intl->unicode) return FALSE;
-    l64->Key = intl->key;
-    l64->LineNumber = intl->line_number;
-    l64->FileName = intl->file_nameA;
-    l64->Address = intl->address;
+    if (line_info->unicode) return FALSE;
+    l64->Key = line_info->key;
+    l64->LineNumber = line_info->line_number;
+    l64->FileName = line_info->file_nameA;
+    l64->Address = line_info->address;
     return TRUE;
 }

-static BOOL internal_line_copy_toW64(const struct internal_line_t* intl, IMAGEHLP_LINEW64* l64)
+static BOOL lineinfo_copy_toW64(const struct lineinfo_t* line_info, IMAGEHLP_LINEW64* l64)
 {
-    if (!intl->unicode) return FALSE;
-    l64->Key = intl->key;
-    l64->LineNumber = intl->line_number;
-    l64->FileName = intl->file_nameW;
-    l64->Address = intl->address;
+    if (!line_info->unicode) return FALSE;
+    l64->Key = line_info->key;
+    l64->LineNumber = line_info->line_number;
+    l64->FileName = line_info->file_nameW;
+    l64->Address = line_info->address;
     return TRUE;
 }

-static BOOL internal_line_set_nameA(struct process* pcs, struct internal_line_t* intl, char* str, BOOL copy)
+static BOOL lineinfo_set_nameA(struct process* pcs, struct lineinfo_t* line_info, char* str, BOOL copy)
 {
     DWORD len;

-    if (intl->unicode)
+    if (line_info->unicode)
     {
         len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0);
-        if (!(intl->file_nameW = fetch_buffer(pcs, len * sizeof(WCHAR)))) return FALSE;
-        MultiByteToWideChar(CP_ACP, 0, str, -1, intl->file_nameW, len);
+        if (!(line_info->file_nameW = fetch_buffer(pcs, len * sizeof(WCHAR)))) return FALSE;
+        MultiByteToWideChar(CP_ACP, 0, str, -1, line_info->file_nameW, len);
     }
     else
     {
         if (copy)
         {
             len = strlen(str) + 1;
-            if (!(intl->file_nameA = fetch_buffer(pcs, len))) return FALSE;
-            memcpy(intl->file_nameA, str, len);
+            if (!(line_info->file_nameA = fetch_buffer(pcs, len))) return FALSE;
+            memcpy(line_info->file_nameA, str, len);
         }
         else
-            intl->file_nameA = str;
+            line_info->file_nameA = str;
     }
     return TRUE;
 }

-static BOOL internal_line_set_nameW(struct process* pcs, struct internal_line_t* intl, WCHAR* wstr, BOOL copy)
+static BOOL lineinfo_set_nameW(struct process* pcs, struct lineinfo_t* line_info, WCHAR* wstr, BOOL copy)
 {
     DWORD len;

-    if (intl->unicode)
+    if (line_info->unicode)
     {
         if (copy)
         {
             len = (lstrlenW(wstr) + 1) * sizeof(WCHAR);
-            if (!(intl->file_nameW = fetch_buffer(pcs, len))) return FALSE;
-            memcpy(intl->file_nameW, wstr, len);
+            if (!(line_info->file_nameW = fetch_buffer(pcs, len))) return FALSE;
+            memcpy(line_info->file_nameW, wstr, len);
         }
         else
-            intl->file_nameW = wstr;
+            line_info->file_nameW = wstr;
     }
     else
     {
         DWORD len = WideCharToMultiByte(CP_ACP, 0, wstr, -1, NULL, 0, NULL, NULL);
-        if (!(intl->file_nameA = fetch_buffer(pcs, len))) return FALSE;
-        WideCharToMultiByte(CP_ACP, 0, wstr, -1, intl->file_nameA, len, NULL, NULL);
+        if (!(line_info->file_nameA = fetch_buffer(pcs, len))) return FALSE;
+        WideCharToMultiByte(CP_ACP, 0, wstr, -1, line_info->file_nameA, len, NULL, NULL);
     }
     return TRUE;
 }

static BOOL get_line_from_function(struct module_pair* pair, struct symt_function* func, DWORD64 addr,
-                                   PDWORD pdwDisplacement, struct internal_line_t* intl)
+                                   PDWORD pdwDisplacement, struct lineinfo_t* line_info)
 {
     struct line_info*           dli = NULL;
     struct line_info*           found_dli = NULL;
@@ -1867,9 +1867,9 @@ static BOOL get_line_from_function(struct module_pair* pair, struct symt_functio
         if (!dli->is_source_file)
         {
             if (found_dli || dli->u.address > addr) continue;
-            intl->line_number = dli->line_number;
-            intl->address     = dli->u.address;
-            intl->key         = dli;
+            line_info->line_number = dli->line_number;
+            line_info->address     = dli->u.address;
+            line_info->key         = dli;
             found_dli = dli;
             continue;
         }
@@ -1879,12 +1879,12 @@ static BOOL get_line_from_function(struct module_pair* pair, struct symt_functio
             if (dbghelp_opt_source_actual_path)
             {
                 /* Return native file paths when using winedbg */
-                ret = internal_line_set_nameA(pair->pcs, intl, (char*)source_get(pair->effective, dli->u.source_file), FALSE);
+                ret = lineinfo_set_nameA(pair->pcs, line_info, (char*)source_get(pair->effective, dli->u.source_file), FALSE);
             }
             else
             {
                 WCHAR *dospath = wine_get_dos_file_name(source_get(pair->effective, dli->u.source_file));
-                ret = internal_line_set_nameW(pair->pcs, intl, dospath, TRUE);
+                ret = lineinfo_set_nameW(pair->pcs, line_info, dospath, TRUE);
                 HeapFree( GetProcessHeap(), 0, dospath );
             }
             if (ret && pdwDisplacement) *pdwDisplacement = addr - found_dli->u.address;
@@ -1900,7 +1900,7 @@ static BOOL get_line_from_function(struct module_pair* pair, struct symt_functio
  * fills source file information from an address
  */
 static BOOL get_line_from_addr(HANDLE hProcess, DWORD64 addr,
-                               PDWORD pdwDisplacement, struct internal_line_t* intl)
+                               PDWORD pdwDisplacement, struct lineinfo_t* line_info)
 {
     struct module_pair          pair;
     struct symt_ht*             symt;
@@ -1909,7 +1909,7 @@ static BOOL get_line_from_addr(HANDLE hProcess, DWORD64 addr,
     symt = symt_find_symbol_at(pair.effective, addr);

if (!symt_check_tag(&symt->symt, SymTagFunction)) return FALSE;
-    return get_line_from_function(&pair, (struct symt_function*)symt, addr, pdwDisplacement, intl);
+    return get_line_from_function(&pair, (struct symt_function*)symt, addr, pdwDisplacement, line_info);
 }

/***********************************************************************
@@ -1965,14 +1965,14 @@ BOOL WINAPI SymGetSymPrev(HANDLE hProcess, PIMAGEHLP_SYMBOL Symbol)
 BOOL WINAPI SymGetLineFromAddr(HANDLE hProcess, DWORD dwAddr,
                                PDWORD pdwDisplacement, PIMAGEHLP_LINE Line)
 {
-    struct internal_line_t intl;
+    struct lineinfo_t line_info;

TRACE("(%p %p)\n", hProcess, Line);

if (Line->SizeOfStruct < sizeof(*Line)) return FALSE;
-    init_internal_line(&intl, FALSE);
-    if (!get_line_from_addr(hProcess, dwAddr, pdwDisplacement, &intl)) return FALSE;
-    return internal_line_copy_toA32(&intl, Line);
+    init_lineinfo(&line_info, FALSE);
+    if (!get_line_from_addr(hProcess, dwAddr, pdwDisplacement, &line_info)) return FALSE;
+    return lineinfo_copy_toA32(&line_info, Line);
 }

/******************************************************************
@@ -1982,14 +1982,14 @@ BOOL WINAPI SymGetLineFromAddr(HANDLE hProcess, DWORD dwAddr,
 BOOL WINAPI SymGetLineFromAddr64(HANDLE hProcess, DWORD64 dwAddr, 
                                  PDWORD pdwDisplacement, PIMAGEHLP_LINE64 Line)
 {
-    struct internal_line_t intl;
+    struct lineinfo_t line_info;

TRACE("(%p %p)\n", hProcess, Line);

if (Line->SizeOfStruct < sizeof(*Line)) return FALSE;
-    init_internal_line(&intl, FALSE);
-    if (!get_line_from_addr(hProcess, dwAddr, pdwDisplacement, &intl)) return FALSE;
-    return internal_line_copy_toA64(&intl, Line);
+    init_lineinfo(&line_info, FALSE);
+    if (!get_line_from_addr(hProcess, dwAddr, pdwDisplacement, &line_info)) return FALSE;
+    return lineinfo_copy_toA64(&line_info, Line);
 }

/******************************************************************
@@ -1999,17 +1999,17 @@ BOOL WINAPI SymGetLineFromAddr64(HANDLE hProcess, DWORD64 dwAddr,
 BOOL WINAPI SymGetLineFromAddrW64(HANDLE hProcess, DWORD64 dwAddr, 
                                   PDWORD pdwDisplacement, PIMAGEHLP_LINEW64 Line)
 {
-    struct internal_line_t intl;
+    struct lineinfo_t line_info;

TRACE("(%p %p)\n", hProcess, Line);

if (Line->SizeOfStruct < sizeof(*Line)) return FALSE;
-    init_internal_line(&intl, TRUE);
-    if (!get_line_from_addr(hProcess, dwAddr, pdwDisplacement, &intl)) return FALSE;
-    return internal_line_copy_toW64(&intl, Line);
+    init_lineinfo(&line_info, TRUE);
+    if (!get_line_from_addr(hProcess, dwAddr, pdwDisplacement, &line_info)) return FALSE;
+    return lineinfo_copy_toW64(&line_info, Line);
 }

-static BOOL symt_get_func_line_prev(HANDLE hProcess, struct internal_line_t* intl, void* key, DWORD64 addr)
+static BOOL symt_get_func_line_prev(HANDLE hProcess, struct lineinfo_t* line_info, void* key, DWORD64 addr)
 {
     struct module_pair  pair;
     struct line_info*   li;
@@ -2026,13 +2026,13 @@ static BOOL symt_get_func_line_prev(HANDLE hProcess, struct internal_line_t* int
         li--;
         if (!li->is_source_file)
         {
-            intl->line_number = li->line_number;
-            intl->address     = li->u.address;
-            intl->key         = li;
+            line_info->line_number = li->line_number;
+            line_info->address     = li->u.address;
+            line_info->key         = li;
             /* search source file */
             for (srcli = li; !srcli->is_source_file; srcli--);

-            return internal_line_set_nameA(pair.pcs, intl, (char*)source_get(pair.effective, srcli->u.source_file), FALSE);
+            return lineinfo_set_nameA(pair.pcs, line_info, (char*)source_get(pair.effective, srcli->u.source_file), FALSE);
         }
     }
     SetLastError(ERROR_NO_MORE_ITEMS); /* FIXME */
@@ -2045,14 +2045,14 @@ static BOOL symt_get_func_line_prev(HANDLE hProcess, struct internal_line_t* int
  */
 BOOL WINAPI SymGetLinePrev64(HANDLE hProcess, PIMAGEHLP_LINE64 Line)
 {
-    struct internal_line_t intl;
+    struct lineinfo_t line_info;

TRACE("(%p %p)\n", hProcess, Line);

if (Line->SizeOfStruct < sizeof(*Line)) return FALSE;
-    init_internal_line(&intl, FALSE);
-    if (!symt_get_func_line_prev(hProcess, &intl, Line->Key, Line->Address)) return FALSE;
-    return internal_line_copy_toA64(&intl, Line);
+    init_lineinfo(&line_info, FALSE);
+    if (!symt_get_func_line_prev(hProcess, &line_info, Line->Key, Line->Address)) return FALSE;
+    return lineinfo_copy_toA64(&line_info, Line);
 }

/******************************************************************
@@ -2061,14 +2061,14 @@ BOOL WINAPI SymGetLinePrev64(HANDLE hProcess, PIMAGEHLP_LINE64 Line)
  */
 BOOL WINAPI SymGetLinePrev(HANDLE hProcess, PIMAGEHLP_LINE Line)
 {
-    struct internal_line_t intl;
+    struct lineinfo_t line_info;

TRACE("(%p %p)\n", hProcess, Line);

if (Line->SizeOfStruct < sizeof(*Line)) return FALSE;
-    init_internal_line(&intl, FALSE);
-    if (!symt_get_func_line_prev(hProcess, &intl, Line->Key, Line->Address)) return FALSE;
-    return internal_line_copy_toA32(&intl, Line);
+    init_lineinfo(&line_info, FALSE);
+    if (!symt_get_func_line_prev(hProcess, &line_info, Line->Key, Line->Address)) return FALSE;
+    return lineinfo_copy_toA32(&line_info, Line);
 }

/******************************************************************
@@ -2077,17 +2077,17 @@ BOOL WINAPI SymGetLinePrev(HANDLE hProcess, PIMAGEHLP_LINE Line)
  */
 BOOL WINAPI SymGetLinePrevW64(HANDLE hProcess, PIMAGEHLP_LINEW64 Line)
 {
-    struct internal_line_t intl;
+    struct lineinfo_t line_info;

TRACE("(%p %p)\n", hProcess, Line);

if (Line->SizeOfStruct < sizeof(*Line)) return FALSE;
-    init_internal_line(&intl, TRUE);
-    if (!symt_get_func_line_prev(hProcess, &intl, Line->Key, Line->Address)) return FALSE;
-    return internal_line_copy_toW64(&intl, Line);
+    init_lineinfo(&line_info, TRUE);
+    if (!symt_get_func_line_prev(hProcess, &line_info, Line->Key, Line->Address)) return FALSE;
+    return lineinfo_copy_toW64(&line_info, Line);
 }

-static BOOL symt_get_func_line_next(HANDLE hProcess, struct internal_line_t* intl, void* key, DWORD64 addr)
+static BOOL symt_get_func_line_next(HANDLE hProcess, struct lineinfo_t* line_info, void* key, DWORD64 addr)
 {
     struct module_pair  pair;
     struct line_info*   li;
@@ -2105,10 +2105,10 @@ static BOOL symt_get_func_line_next(HANDLE hProcess, struct internal_line_t* int
         li++;
         if (!li->is_source_file)
         {
-            intl->line_number = li->line_number;
-            intl->address     = li->u.address;
-            intl->key         = li;
-            return internal_line_set_nameA(pair.pcs, intl, (char*)source_get(pair.effective, srcli->u.source_file), FALSE);
+            line_info->line_number = li->line_number;
+            line_info->address     = li->u.address;
+            line_info->key         = li;
+            return lineinfo_set_nameA(pair.pcs, line_info, (char*)source_get(pair.effective, srcli->u.source_file), FALSE);
         }
         srcli = li;
     }
@@ -2122,14 +2122,14 @@ static BOOL symt_get_func_line_next(HANDLE hProcess, struct internal_line_t* int
  */
 BOOL WINAPI SymGetLineNext64(HANDLE hProcess, PIMAGEHLP_LINE64 Line)
 {
-    struct internal_line_t intl;
+    struct lineinfo_t line_info;

TRACE("(%p %p)\n", hProcess, Line);

if (Line->SizeOfStruct < sizeof(*Line)) return FALSE;
-    init_internal_line(&intl, FALSE);
-    if (!symt_get_func_line_next(hProcess, &intl, Line->Key, Line->Address)) return FALSE;
-    return internal_line_copy_toA64(&intl, Line);
+    init_lineinfo(&line_info, FALSE);
+    if (!symt_get_func_line_next(hProcess, &line_info, Line->Key, Line->Address)) return FALSE;
+    return lineinfo_copy_toA64(&line_info, Line);
 }

/******************************************************************
@@ -2138,14 +2138,14 @@ BOOL WINAPI SymGetLineNext64(HANDLE hProcess, PIMAGEHLP_LINE64 Line)
  */
 BOOL WINAPI SymGetLineNext(HANDLE hProcess, PIMAGEHLP_LINE Line)
 {
-    struct internal_line_t intl;
+    struct lineinfo_t line_info;

TRACE("(%p %p)\n", hProcess, Line);

if (Line->SizeOfStruct < sizeof(*Line)) return FALSE;
-    init_internal_line(&intl, FALSE);
-    if (!symt_get_func_line_next(hProcess, &intl, Line->Key, Line->Address)) return FALSE;
-    return internal_line_copy_toA32(&intl, Line);
+    init_lineinfo(&line_info, FALSE);
+    if (!symt_get_func_line_next(hProcess, &line_info, Line->Key, Line->Address)) return FALSE;
+    return lineinfo_copy_toA32(&line_info, Line);
 }

/******************************************************************
@@ -2154,14 +2154,14 @@ BOOL WINAPI SymGetLineNext(HANDLE hProcess, PIMAGEHLP_LINE Line)
  */
 BOOL WINAPI SymGetLineNextW64(HANDLE hProcess, PIMAGEHLP_LINEW64 Line)
 {
-    struct internal_line_t intl;
+    struct lineinfo_t line_info;

TRACE("(%p %p)\n", hProcess, Line);

if (Line->SizeOfStruct < sizeof(*Line)) return FALSE;
-    init_internal_line(&intl, TRUE);
-    if (!symt_get_func_line_next(hProcess, &intl, Line->Key, Line->Address)) return FALSE;
-    return internal_line_copy_toW64(&intl, Line);
+    init_lineinfo(&line_info, TRUE);
+    if (!symt_get_func_line_next(hProcess, &line_info, Line->Key, Line->Address)) return FALSE;
+    return lineinfo_copy_toW64(&line_info, Line);
 }

/***********************************************************************
@@ -2727,7 +2727,7 @@ BOOL WINAPI SymFromInlineContextW(HANDLE hProcess, DWORD64 addr, ULONG inline_ct
 }

static BOOL get_line_from_inline_context(HANDLE hProcess, DWORD64 addr, ULONG inline_ctx, DWORD64 mod_addr, PDWORD disp,
-                                         struct internal_line_t* intl)
+                                         struct lineinfo_t* line_info)
 {
     struct module_pair pair;
     struct symt_function* inlined;
@@ -2737,12 +2737,12 @@ static BOOL get_line_from_inline_context(HANDLE hProcess, DWORD64 addr, ULONG in
     {
     case IFC_MODE_INLINE:
         inlined = symt_find_inlined_site(pair.effective, addr, inline_ctx);
-        if (inlined && get_line_from_function(&pair, inlined, addr, disp, intl))
+        if (inlined && get_line_from_function(&pair, inlined, addr, disp, line_info))
             return TRUE;
         /* fall through: check if we can find line info at top function level */
     case IFC_MODE_IGNORE:
     case IFC_MODE_REGULAR:
-        return get_line_from_addr(hProcess, addr, disp, intl);
+        return get_line_from_addr(hProcess, addr, disp, line_info);
     default:
         SetLastError(ERROR_INVALID_PARAMETER);
         return FALSE;
@@ -2755,16 +2755,16 @@ static BOOL get_line_from_inline_context(HANDLE hProcess, DWORD64 addr, ULONG in
  */
 BOOL WINAPI SymGetLineFromInlineContext(HANDLE hProcess, DWORD64 addr, ULONG inline_ctx, DWORD64 mod_addr, PDWORD disp, PIMAGEHLP_LINE64 line)
 {
-    struct internal_line_t intl;
+    struct lineinfo_t line_info;

TRACE("(%p, %#I64x, 0x%lx, %#I64x, %p, %p)\n",
           hProcess, addr, inline_ctx, mod_addr, disp, line);

if (line->SizeOfStruct < sizeof(*line)) return FALSE;
-    init_internal_line(&intl, FALSE);
+    init_lineinfo(&line_info, FALSE);

-    if (!get_line_from_inline_context(hProcess, addr, inline_ctx, mod_addr, disp, &intl)) return FALSE;
-    return internal_line_copy_toA64(&intl, line);
+    if (!get_line_from_inline_context(hProcess, addr, inline_ctx, mod_addr, disp, &line_info)) return FALSE;
+    return lineinfo_copy_toA64(&line_info, line);
 }

/******************************************************************
@@ -2773,16 +2773,16 @@ BOOL WINAPI SymGetLineFromInlineContext(HANDLE hProcess, DWORD64 addr, ULONG inl
  */
 BOOL WINAPI SymGetLineFromInlineContextW(HANDLE hProcess, DWORD64 addr, ULONG inline_ctx, DWORD64 mod_addr, PDWORD disp, PIMAGEHLP_LINEW64 line)
 {
-    struct internal_line_t intl;
+    struct lineinfo_t line_info;

TRACE("(%p, %#I64x, 0x%lx, %#I64x, %p, %p)\n",
           hProcess, addr, inline_ctx, mod_addr, disp, line);

if (line->SizeOfStruct < sizeof(*line)) return FALSE;
-    init_internal_line(&intl, TRUE);
+    init_lineinfo(&line_info, TRUE);

-    if (!get_line_from_inline_context(hProcess, addr, inline_ctx, mod_addr, disp, &intl)) return FALSE;
-    return internal_line_copy_toW64(&intl, line);
+    if (!get_line_from_inline_context(hProcess, addr, inline_ctx, mod_addr, disp, &line_info)) return FALSE;
+    return lineinfo_copy_toW64(&line_info, line);
 }

/******************************************************************