Skip to content

Commit fd4e1fd

Browse files
committed
Added a sort after tar -tf because in Freebsd 13
64bit tar sometimes reports files in a different order. Causing a misleading miscompare. So we sort the output of tar -tf so if the lists are the same we pass. modified: scripts/buildandreleasetest.sh Fixed spelling mistakes in comments. modified: src/lib/libdwarf/libdwarf.h
1 parent 17e7fb2 commit fd4e1fd

File tree

2 files changed

+28
-29
lines changed

2 files changed

+28
-29
lines changed

scripts/buildandreleasetest.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,8 +189,9 @@ ls -l $brelgz
189189
# gzip does not build diffs quite identically to the byte.
190190
# Lots of diffs, So we do tar tf to get the file name list.
191191
echo "Now tar -tf on $arelgz and $brelgz "
192-
tar -tf $arelgz > $atfout
193-
tar -tf $brelgz > $btfout
192+
# Sort as freebsd64 manages a distinct order at times.
193+
tar -tf $arelgz | sort > $atfout
194+
tar -tf $brelgz | sort > $btfout
194195
echo "=========================diff make dist content========="
195196
echo "Now diff the tar tf from $arelgz and $brelgz"
196197
diff $atfout $btfout

src/lib/libdwarf/libdwarf.h

Lines changed: 25 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ extern "C" {
8989
/*! @section defines Defines and Types
9090
*/
9191

92-
/* Sematic Version identity for this libdwarf.h */
92+
/* Semantic Version identity for this libdwarf.h */
9393
#define DW_LIBDWARF_VERSION "0.3.3"
9494
#define DW_LIBDWARF_VERSION_MAJOR 0
9595
#define DW_LIBDWARF_VERSION_MINOR 3
@@ -150,7 +150,7 @@ extern "C" {
150150
#ifndef DW_FRAME_CFA_COL
151151
#define DW_FRAME_CFA_COL 12290
152152
#endif
153-
#define DW_FRAME_CFA_COL3 DW_FRAME_CFA_COL /*compatibiliity name*/
153+
#define DW_FRAME_CFA_COL3 DW_FRAME_CFA_COL /*compatibility name*/
154154
/* END FRAME special values */
155155

156156
/* dwarf_pcline function, slide arguments
@@ -567,11 +567,8 @@ struct Dwarf_Macro_Details_s {
567567
Dwarf_Signed dmd_lineno; /* the source line number where
568568
applicable and vend_def number if
569569
vendor_extension op */
570-
571-
Dwarf_Signed dmd_fileindex;/* the source file index:
572-
applies to define undef start_file */
573-
char * dmd_macro; /* macro name (with value for defineop)
574-
string from vendor ext */
570+
Dwarf_Signed dmd_fileindex;/* the source file index */
571+
char * dmd_macro; /* macro name string */
575572
};
576573
/*! @typedef Dwarf_Rnglists_Head
577574
Used for access to a set of DWARF5 debug_rnglists
@@ -652,7 +649,7 @@ struct Dwarf_Obj_Access_Section_a_s {
652649
compile time.
653650
654651
The om_get_filesize member is new September 4, 2021.
655-
Its postion is NOT at the end of the list.
652+
Its position is NOT at the end of the list.
656653
The member names all now have om_ prefix.
657654
*/
658655
/*
@@ -1481,7 +1478,7 @@ typedef struct Dwarf_Rnglists_Head_s * Dwarf_Rnglists_Head;
14811478
@param dw_errhand
14821479
Pass in NULL unless one wishes libdwarf to call
14831480
this error handling function (which you must write)
1484-
instead of passing meaningfull values to the
1481+
instead of passing meaningful values to the
14851482
dw_error argument.
14861483
@param dw_errarg
14871484
If dw_errorhand is non-null, then this value
@@ -1582,7 +1579,7 @@ DW_API int dwarf_init_path_dl(const char * dw_path,
15821579
@param dw_errhand
15831580
Pass in NULL unless one wishes libdwarf to call
15841581
this error handling function (which you must write)
1585-
instead of passing meaningfull values to the
1582+
instead of passing meaningful values to the
15861583
dw_error argument.
15871584
@param dw_errarg
15881585
If dw_errorhand is non-null, then this value
@@ -1713,7 +1710,7 @@ DW_API int dwarf_get_tied_dbg(Dwarf_Debug dw_dbg,
17131710
The library keeps track of where it is in the object file
17141711
and it knows where to find 'next'.
17151712
@param dw_dbg
1716-
The currend Dwarf_Debug of interest.
1713+
The Dwarf_Debug of interest.
17171714
@param dw_is_info
17181715
Pass in TRUE if reading through .debug_info
17191716
Pass in FALSE if reading through DWARF4
@@ -1740,7 +1737,7 @@ DW_API int dwarf_get_tied_dbg(Dwarf_Debug dw_dbg,
17401737
If the CU is DW_UT_skeleton DW_UT_split_compile,
17411738
DW_UT_split_type or DW_UT_type this is the
17421739
type signature from the CU_header
1743-
is compied into this field.
1740+
compiled into this field.
17441741
@param dw_typeoffset
17451742
For DW_UT_split_type or DW_UT_type this is the
17461743
type offset from the CU header.
@@ -1886,7 +1883,7 @@ DW_API void dwarf_dealloc_die( Dwarf_Die dw_die);
18861883
@param dw_sig_type
18871884
Valid type requests are "cu" and "tu"
18881885
@param dw_returned_CU_die
1889-
Returnes the found CU DIE if one is found.
1886+
Returns the found CU DIE if one is found.
18901887
@param dw_error
18911888
The usual Dwarf_Error*.
18921889
@return
@@ -2291,7 +2288,7 @@ DW_API int dwarf_hasattr(Dwarf_Die dw_die,
22912288
/*! @brief Returns an array of DIE children offsets
22922289
22932290
Given a DIE offset and dw_is_info,
2294-
returns an array of DIE offsets of the childred
2291+
returns an array of DIE offsets of the children
22952292
of DIE.
22962293
@param dw_dbg
22972294
The Dwarf_Debug of interest.
@@ -2693,7 +2690,7 @@ DW_API int dwarf_formref(Dwarf_Attribute dw_attr,
26932690
For references to DIEs this informs whether the target
26942691
DIE (the target the offset refers to) is in .debug_info
26952692
or .debug_types. For non-DIE targets this field
2696-
is not meaningful. Refer to the attribute FORM to determin
2693+
is not meaningful. Refer to the attribute FORM to determine
26972694
the target section of the offset.
26982695
@param dw_error
26992696
A place to return error details.
@@ -3263,15 +3260,15 @@ DW_API int dwarf_srclines_two_level_from_linecontext(
32633260
The way to deallocate (free) a Dwarf_Line_Context
32643261
32653262
@param dw_context
3266-
The context to be deallocd (freed).
3263+
The context to be dealloced (freed).
32673264
On return the pointer passed in is stale and
32683265
calling applications should zero the pointer.
32693266
*/
32703267
DW_API void dwarf_srclines_dealloc_b(Dwarf_Line_Context dw_context);
32713268

32723269
/*! @brief Srclines table offset
32733270
3274-
The offset is in the relevent .debug_line or .debug_line.dwo
3271+
The offset is in the relevant .debug_line or .debug_line.dwo
32753272
section (and in a split dwarf package file includes
32763273
the base line table offset).
32773274
@@ -3403,7 +3400,7 @@ DW_API int dwarf_srclines_files_indexes(
34033400
If dw_name non-null
34043401
on success returns
34053402
The file name in the line table header
3406-
throught the pointer.
3403+
through the pointer.
34073404
@param dw_directory_index
34083405
If dw_directory_index non-null
34093406
on success returns
@@ -4269,7 +4266,7 @@ DW_API int dwarf_get_locdesc_entry_d(Dwarf_Loc_Head_c dw_loclist_head,
42694266

42704267
/*! @brief Get the raw values from a single location operation
42714268
4272-
Some of the following (DW_raw?) appear completly
4269+
Some of the following (DW_raw?) appear completely
42734270
pointless - a mistake.
42744271
42754272
@param dw_locdesc
@@ -4482,7 +4479,7 @@ DW_API int dwarf_get_loclist_head_basics(Dwarf_Loc_Head_c dw_head,
44824479
Some of the same values as from
44834480
dwarf_get_loclist_head_basics
44844481
but here without any dependence on data
4485-
drived from a CU context.
4482+
derived from a CU context.
44864483
Useful to print raw loclist data.
44874484
*/
44884485
DW_API int dwarf_get_loclist_context_basics(Dwarf_Debug dw_dbg,
@@ -4754,7 +4751,7 @@ DW_API int dwarf_get_macro_defundef(
47544751
@param dw_line_number
47554752
If end_file nothing is returned here.
47564753
If start_file on success returns the line number
4757-
of the source line of the include direcive.
4754+
of the source line of the include directive.
47584755
@param dw_name_index_to_line_tab
47594756
If end_file nothing is returned here.
47604757
If start_file on success returns the file name
@@ -5416,8 +5413,9 @@ DW_API int dwarf_get_frame_instruction(
54165413
dw_u2 field which contains an address-space identifier
54175414
if the letter @c a appears in dw_fields_description.
54185415
The dw_u2 field is non-standard and only applies
5419-
to two Heterogenous Debugging
5420-
frame instructions defined by LLVM.
5416+
to Heterogeneous Debugging
5417+
frame instructions defined by LLVM
5418+
(DW_CFA_LLVM_def_aspace_cfa and DW_CFA_LLVM_def_aspace_cfa_sf)
54215419
54225420
The return values are the same except here we have:
54235421
an @c a in fields[2] means dw_u2 is an address-space
@@ -5790,7 +5788,7 @@ DW_API int dwarf_open_str_offsets_table_access(Dwarf_Debug dw_dbg,
57905788
If there is no .debug_str_offsets section it returns
57915789
DW_DLV_NO_ENTRY
57925790
If it returns DW_DLV_ERROR there is nothing you can do
5793-
except reportthe error and, optionally,
5791+
except report the error and, optionally,
57945792
call dwarf_dealloc_error to dealloc the error content
57955793
(and then set the dw_error to NULL as after the dealloc
57965794
the pointer is stale)..
@@ -5926,7 +5924,7 @@ DW_API char* dwarf_errmsg_by_number(Dwarf_Unsigned dw_errornum);
59265924
DW_DLV_ERROR to your caller when your intent
59275925
is to let your caller clean up whatever seems wrong.
59285926
@param dw_dbg
5929-
The relevant Dwarf_Debugr.
5927+
The relevant Dwarf_Debug.
59305928
@param dw_error
59315929
a Dwarf_Error is returned through this pointer.
59325930
@param dw_errmsg
@@ -6020,7 +6018,7 @@ DW_API int dwarf_get_debug_sup(Dwarf_Debug dw_dbg,
60206018
/*! @defgroup debugnames Fast Access-Access to .debug_names DWARF5
60216019
@{
60226020
6023-
The section is new in DWARF5 supercedes .debug_pubnames and
6021+
The section is new in DWARF5 supersedes .debug_pubnames and
60246022
.debug_pubtypes in DWARF2, DWARF3, and DWARF4.
60256023
60266024
The code is incomplete . We have no examples
@@ -6166,7 +6164,7 @@ DW_API int dwarf_dnames_bucket(Dwarf_Dnames_Head dw_dn,
61666164
Returned from entrypool abbrev data
61676165
@param dw_array_size
61686166
Size of array you provide (even number).
6169-
Possibly 20 to 40 suffices for pracical purposes.
6167+
Possibly 20 to 40 suffices for practical purposes.
61706168
@param dw_attr_array
61716169
Array you provide, for attribute numbers, form numbers.
61726170
(function will initialize it).

0 commit comments

Comments
 (0)