Guard macro unification/cleanup

lib/c/2014/labcomm_fd_reader.h

@@ -19,8 +19,8 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef _LABCOMM_FD_READER_H_
-#define _LABCOMM_FD_READER_H_
+#ifndef __LABCOMM_FD_READER_H__
+#define __LABCOMM_FD_READER_H__
 
 #include "labcomm.h"
 

lib/c/2014/labcomm_fd_writer.h

@@ -19,8 +19,8 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef _LABCOMM_FD_WRITER_H_
-#define _LABCOMM_FD_WRITER_H_
+#ifndef __LABCOMM_FD_WRITER_H__
+#define __LABCOMM_FD_WRITER_H__
 
 #include "labcomm.h"
 

lib/c/2014/labcomm_ioctl.h

@@ -19,8 +19,8 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef __LABCOMM_IOCTL_H__
-#define __LABCOMM_IOCTL_H__
+#ifndef __LABCOMM_IOCTL_H___
+#define __LABCOMM_IOCTL_H___
 
 #include "labcomm.h"
 

lib/c/2014/labcomm_private.h

@@ -20,8 +20,8 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef _LABCOMM_PRIVATE_H_
-#define _LABCOMM_PRIVATE_H_
+#ifndef __LABCOMM_PRIVATE_H__
+#define __LABCOMM_PRIVATE_H__
 
 #ifdef LABCOMM_COMPAT
   #include LABCOMM_COMPAT

lib/c/2014/labcomm_pthread_scheduler.h

@@ -19,8 +19,8 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef _LABCOMM_PTHREAD_SCHEDULER_H_
-#define _LABCOMM_PTHREAD_SCHEDULER_H_
+#ifndef __LABCOMM_PTHREAD_SCHEDULER_H__
+#define __LABCOMM_PTHREAD_SCHEDULER_H__
 
 #include "labcomm.h"
 

lib/c/2014/labcomm_scheduler.h

@@ -19,8 +19,8 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef _LABCOMM_SCHEDULER_H_
-#define _LABCOMM_SCHEDULER_H_
+#ifndef __LABCOMM_SCHEDULER_H__
+#define __LABCOMM_SCHEDULER_H__
 
 #ifdef LABCOMM_COMPAT
   #include LABCOMM_COMPAT

lib/c/2014/labcomm_scheduler_private.h

@@ -19,8 +19,8 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef _LABCOMM_SCHEDULER_PRIVATE_H_
-#define _LABCOMM_SCHEDULER_PRIVATE_H_
+#ifndef __LABCOMM_SCHEDULER_PRIVATE_H__
+#define __LABCOMM_SCHEDULER_PRIVATE_H__
 
 #ifdef LABCOMM_COMPAT
   #include LABCOMM_COMPAT

lib/c/version_compare.py

@@ -9,7 +9,7 @@ class File:
 
     def __init__(self, path, match, replacement):
         def replace(s):
-            return re.sub('[ \t]+', ' ', s).replace(match, replacement)
+            return re.sub('[ \t]+', ' ', s).replace(match, replacement).strip()
         self.name = path.replace(match, replacement)
         self.path = path
         with open(path) as f:
@@ -50,7 +50,7 @@ if __name__ == '__main__':
         else:
             equal = True
             for l in difflib.unified_diff(a.lines, b.lines, a.path, b.path):
-                print l,
+                print l
                 equal = False
             if equal:
                 print "Identical", a.path, b.path