Skip to content

Commit 3226a60

Browse files
committed
There is no change in logic here.
Corrected indents and removed trailing whitespace. Removed a couple if #if 0 #endif blocks where were leftovers, useless. modified: src/lib/libdwarf/dwarf_debugnames.c Removed trailing whitespace modified: src/lib/libdwarf/dwarf_debugnames.h
1 parent 98cda42 commit 3226a60

File tree

2 files changed

+10
-38
lines changed

2 files changed

+10
-38
lines changed

src/lib/libdwarf/dwarf_debugnames.c

Lines changed: 9 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -68,16 +68,16 @@ dump_bytes(char * msg,Dwarf_Small * start, long len)
6868
#endif /*0*/
6969
#if 0
7070
static void
71-
dump_abbrev_record(const char *msg,
71+
dump_abbrev_record(const char *msg,
7272
Dwarf_Unsigned abcode,
7373
struct Dwarf_D_Abbrev_s *abb,
7474
int line)
7575
{
7676
unsigned long i = 0;
77-
77+
7878
printf("%s: code %lu abpairs %lu line %d \n",
79-
msg,(unsigned long)abcode,
80-
(unsigned long)abb->da_pairs_count,line);
79+
msg,(unsigned long)abcode,
80+
(unsigned long)abb->da_pairs_count,line);
8181
for (i=0; i < abb->da_pairs_count ; ++i) {
8282
printf(" [%lu] 0x%02lx 0x%02lx\n",
8383
i,
@@ -215,11 +215,11 @@ fill_in_abbrevs_table(Dwarf_Dnames_Head dn,
215215
firstdab = 0;
216216
return res;
217217
}
218-
if ( curdab->da_pairs_count ==
218+
if ( curdab->da_pairs_count ==
219219
ABB_PAIRS_MAX) {
220220
free_temp_abbrevs(curdab);
221221
free_temp_abbrevs(firstdab);
222-
_dwarf_error_string(dbg,error,
222+
_dwarf_error_string(dbg,error,
223223
DW_DLE_DEBUG_NAMES_ABBREV_CORRUPTION,
224224
"DW_DLE_DEBUG_NAMES_ABBREV_CORRUPTION: "
225225
"Impossible: too many idxattr/form pairs"
@@ -680,19 +680,14 @@ read_a_name_table_header(Dwarf_Dnames_Head dn,
680680
error,endptr);
681681
dn->dn_single_cu = TRUE;
682682
dn->dn_single_cu_offset = offsetval;
683-
#if 0
684-
FIXME
685-
#endif
686-
}
687-
683+
}
688684
dn->dn_hash_table = curptr;
689685
dn->dn_hash_table_offset = usedspace;
690686
if (bucket_count) {
691687
curptr += SIZEOFT32 * name_count;
692688
usedspace += SIZEOFT32 * name_count;
693689
totaloffset += SIZEOFT32 * name_count;
694690
}
695-
696691
VALIDATEOFFSET(dn,totaloffset,"hashes array error");
697692

698693
dn->dn_string_offsets = curptr;
@@ -1100,26 +1095,10 @@ dwarf_dnames_cu_table(Dwarf_Dnames_Head dn,
11001095
ptr, unit_entry_size,
11011096
error,endptr);
11021097
if (offset) {
1103-
*offset = offsetval;
1098+
*offset = offsetval;
11041099
}
11051100
return DW_DLV_OK;
11061101
}
1107-
1108-
1109-
#if 0
1110-
FIXME
1111-
if (offset_case && dn->dn_single_cu) {
1112-
Dwarf_Unsigned offsetval = 0;
1113-
Dwarf_Small *ptr = dn->dn_cu_list;
1114-
Dwarf_Small *endptr = dn->dn_foreign_tu_list;
1115-
Dwarf_Unsigned unit_entry_size = dn->dn_offset_size;
1116-
1117-
READ_UNALIGNED_CK(dbg, offsetval, Dwarf_Unsigned,
1118-
ptr, unit_entry_size,
1119-
error,endptr);
1120-
dn->dn_single_cu_offset = offsetval;
1121-
}
1122-
#endif
11231102
{
11241103
Dwarf_Small *ptr = unit_ptr +
11251104
(index_number-1 -unit_count) *unit_entry_size;
@@ -1825,7 +1804,7 @@ isformrefval(Dwarf_Debug dbg,Dwarf_Half form,
18251804
While an array of structs would be easier for the caller
18261805
to allocate than parallel arrays, public structs have
18271806
turned out to be difficult to work with as interfaces
1828-
(as formats changever time).
1807+
(as formats change over time).
18291808
*/
18301809
int dwarf_dnames_entrypool_values(Dwarf_Dnames_Head dn,
18311810
Dwarf_Unsigned index_of_abbrev,
@@ -1837,10 +1816,6 @@ int dwarf_dnames_entrypool_values(Dwarf_Dnames_Head dn,
18371816
Dwarf_Sig8 * array_of_signatures,
18381817
Dwarf_Bool * single_cu,
18391818
Dwarf_Unsigned * single_cu_offset,
1840-
#if 0
1841-
FIXME
1842-
#endif
1843-
18441819
/* offset of the next entrypool entry. */
18451820
Dwarf_Unsigned * offset_of_next_entrypool,
18461821
Dwarf_Error * error)
@@ -1996,9 +1971,6 @@ int dwarf_dnames_entrypool_values(Dwarf_Dnames_Head dn,
19961971
return DW_DLV_ERROR;
19971972
}
19981973
if ( dn->dn_single_cu) {
1999-
#if 0
2000-
FIXME
2001-
#endif
20021974
if (single_cu && single_cu_offset) {
20031975
*single_cu = dn->dn_single_cu;
20041976
*single_cu_offset = dn->dn_single_cu_offset;

src/lib/libdwarf/dwarf_debugnames.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ struct Dwarf_D_Abbrev_s {
3535
Dwarf_Unsigned da_abbrev_offset;
3636
Dwarf_Unsigned da_abbrev_code;
3737
Dwarf_Unsigned da_tag;
38-
Dwarf_Unsigned da_pairs_count;
38+
Dwarf_Unsigned da_pairs_count;
3939
Dwarf_Half da_idxattr[ABB_PAIRS_MAX];
4040
Dwarf_Half da_form[ABB_PAIRS_MAX];
4141
};

0 commit comments

Comments
 (0)