This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

GNU C Library master sources branch master updated. glibc-2.24-601-g26e21ad


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  26e21ad35db514c646e1491a414d45a47cb4a733 (commit)
      from  df19fdcfec7143073b50f9f01af712528bed6d26 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=26e21ad35db514c646e1491a414d45a47cb4a733

commit 26e21ad35db514c646e1491a414d45a47cb4a733
Author: Martin Galvan <omgalvan.86@gmail.com>
Date:   Mon Jan 2 11:35:14 2017 -0300

    Fix up tabs/spaces mismatches
    
    Mixing them up breaks the gdb pretty printer tests.
    
    ChangeLog:
    
    2017-01-02  Martin Galvan  <martingalvan@sourceware.org>
    
    	* nptl/nptl-printers.py: Fix tabs/spaces mismatches.

diff --git a/ChangeLog b/ChangeLog
index 4d0912a..2de8cd9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2017-01-03  Martin Galvan  <martingalvan@sourceware.org>
+
+	* nptl/nptl-printers.py: Fix tabs/spaces mismatches.
+
 2017-01-02  Joseph Myers  <joseph@codesourcery.com>
 
 	[BZ #21019]
diff --git a/nptl/nptl-printers.py b/nptl/nptl-printers.py
index 17463c4..77018e7 100644
--- a/nptl/nptl-printers.py
+++ b/nptl/nptl-printers.py
@@ -348,10 +348,10 @@ class ConditionVariablePrinter(object):
     def read_attributes(self):
         """Read the condvar's attributes."""
 
-	if (self.wrefs & PTHREAD_COND_CLOCK_MONOTONIC_MASK) != 0:
-		self.values.append(('Clock ID', 'CLOCK_MONOTONIC'))
-	else:
-		self.values.append(('Clock ID', 'CLOCK_REALTIME'))
+        if (self.wrefs & PTHREAD_COND_CLOCK_MONOTONIC_MASK) != 0:
+            self.values.append(('Clock ID', 'CLOCK_MONOTONIC'))
+        else:
+            self.values.append(('Clock ID', 'CLOCK_REALTIME'))
 
         if (self.wrefs & PTHREAD_COND_SHARED_MASK) != 0:
             self.values.append(('Shared', 'Yes'))
@@ -409,10 +409,10 @@ class ConditionVariableAttributesPrinter(object):
 
         clock_id = (self.condattr >> 1) & ((1 << COND_CLOCK_BITS) - 1)
 
-	if clock_id != 0:
-		self.values.append(('Clock ID', 'CLOCK_MONOTONIC'))
-	else:
-		self.values.append(('Clock ID', 'CLOCK_REALTIME'))
+        if clock_id != 0:
+            self.values.append(('Clock ID', 'CLOCK_MONOTONIC'))
+        else:
+            self.values.append(('Clock ID', 'CLOCK_REALTIME'))
 
         if self.condattr & 1:
             self.values.append(('Shared', 'Yes'))

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog             |    4 ++++
 nptl/nptl-printers.py |   16 ++++++++--------
 2 files changed, 12 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]