RepoMirrors/libabigail
1
0
Fork 0
mirror of git://sourceware.org/git/libabigail.git synced 2025-02-13 03:57:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not imply private access when building a struct from ABIXML.

Browse Source 
* src/abg-reader.cc (read_context): Abort if we run into an
	unsupported access specifier.
	(build_class_decl) Default to public access for the children
	of a struct.

Signed-off-by: Ondrej Oprala <ooprala@redhat.com>
This commit is contained in:
Ondrej Oprala 2015-10-05 15:01:04 +02:00
parent 5115d16241
commit 81b028641a
1 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/abg-reader.cc
View File

@ -1727,7 +1727,9 @@ read_access(xmlNodePtr node, access_specifier& access)
else if (a == "public")
access = public_access;
else
access = private_access;
/// If there is an access specifier of an unsupported value,
/// we should not assume anything and abort.
abort();
return true;
}
@ -3435,7 +3437,10 @@ build_class_decl(read_context& ctxt,
if (xmlStrEqual(n->name, BAD_CAST("base-class")))
{
access_specifier access = private_access;
access_specifier access =
is_struct
? public_access
: private_access;
read_access(n, access);
string type_id;
@ -3462,7 +3467,10 @@ build_class_decl(read_context& ctxt,
}
else if (xmlStrEqual(n->name, BAD_CAST("member-type")))
{
access_specifier access = private_access;
access_specifier access =
is_struct
? public_access
: private_access;
read_access(n, access);
ctxt.map_xml_node_to_decl(n, decl);
@ -3493,7 +3501,10 @@ build_class_decl(read_context& ctxt,
{
ctxt.map_xml_node_to_decl(n, decl);
access_specifier access = private_access;
access_specifier access =
is_struct
? public_access
: private_access;
read_access(n, access);
bool is_laid_out = false;
@ -3523,7 +3534,10 @@ build_class_decl(read_context& ctxt,
{
ctxt.map_xml_node_to_decl(n, decl);
access_specifier access = private_access;
access_specifier access =
is_struct
? public_access
: private_access;
read_access(n, access);
bool is_virtual = false;
@ -3568,7 +3582,10 @@ build_class_decl(read_context& ctxt,
{
ctxt.map_xml_node_to_decl(n, decl);
access_specifier access = private_access;
access_specifier access =
is_struct
? public_access
: private_access;
read_access(n, access);
bool is_static = false;