Re: [PATCH] Fix GCC6 -Wmisleading-indentation warnings.

Re: [PATCH] Fix GCC6 -Wmisleading-indentation warnings.

[Dodji Seketeli]

Mark Wielaard <mjw@redhat.com> a écrit:

> These two issues pointed out by GCC6 are harmless, but might confuse
> a reader of the code. Just properly indent the code.
>
> 	* src/abg-dwarf-reader.cc (find_import_unit_point_before_die):
> 	Properly indent code after if clause.
> 	* src/abg-ini.cc (write_property_value): Properly indent return
> 	statement after else clause.

Committed to master, thanks!

Cheers,

-- 
		Dodji

[PATCH] Fix GCC6 -Wmisleading-indentation warnings.

[Mark Wielaard]

These two issues pointed out by GCC6 are harmless, but might confuse
a reader of the code. Just properly indent the code.

	* src/abg-dwarf-reader.cc (find_import_unit_point_before_die):
	Properly indent code after if clause.
	* src/abg-ini.cc (write_property_value): Properly indent return
	statement after else clause.

Signed-off-by: Mark Wielaard <mjw@redhat.com>
---
 src/abg-dwarf-reader.cc | 8 ++++----
 src/abg-ini.cc          | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/abg-dwarf-reader.cc b/src/abg-dwarf-reader.cc
index d6a68a5..175922b 100644
--- a/src/abg-dwarf-reader.cc
+++ b/src/abg-dwarf-reader.cc
@@ -6142,11 +6142,11 @@ find_import_unit_point_before_die(read_context&	ctxt,
 		  &first_die_of_tu) != 0)
     return false;
 
-    Dwarf_Die cu_die_memory;
-    Dwarf_Die *cu_die;
+  Dwarf_Die cu_die_memory;
+  Dwarf_Die *cu_die;
 
-    cu_die = dwarf_diecu(const_cast<Dwarf_Die*>(&first_die_of_tu),
-			 &cu_die_memory, 0, 0);
+  cu_die = dwarf_diecu(const_cast<Dwarf_Die*>(&first_die_of_tu),
+		       &cu_die_memory, 0, 0);
 
   if (find_import_unit_point_between_dies(ctxt, partial_unit_offset,
 					  dwarf_dieoffset(&first_die_of_tu),
diff --git a/src/abg-ini.cc b/src/abg-ini.cc
index b09342d..a902e2e 100644
--- a/src/abg-ini.cc
+++ b/src/abg-ini.cc
@@ -1761,7 +1761,7 @@ write_property_value(const property_sptr& prop)
   else
     // This new kind of property is not yet supported!
     abort();
-    return result;
+  return result;
 }
 
 /// Serialize an ini property to an output stream.
-- 
2.5.0