21 files changed, 87 insertions, 68 deletions
diff --git a/cgpt/cgpt.h b/cgpt/cgpt.h
index 6cf58998..2cf9ef5a 100644
--- a/cgpt/cgpt.h
+++ b/cgpt/cgpt.h
@@ -1,9 +1,10 @@
-// Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
+/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 
-#ifndef VBOOT_REFERENCE_UTILITY_CGPT_CGPT_H_
-#define VBOOT_REFERENCE_UTILITY_CGPT_CGPT_H_
+#ifndef VBOOT_REFERENCE_CGPT_H_
+#define VBOOT_REFERENCE_CGPT_H_
 
 #include <fcntl.h>
 #ifndef HAVE_MACOS
@@ -207,4 +208,4 @@ const char *GptError(int errnum);
     exit(1); } \
   } while (0)
 
-#endif  // VBOOT_REFERENCE_UTILITY_CGPT_CGPT_H_
+#endif  /* VBOOT_REFERENCE_CGPT_H_ */
diff --git a/cgpt/cgpt_add.c b/cgpt/cgpt_add.c
index 786f2bc5..95815db8 100644
--- a/cgpt/cgpt_add.c
+++ b/cgpt/cgpt_add.c
@@ -1,6 +1,7 @@
-// Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
+/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 
 #include <string.h>
 
diff --git a/cgpt/cgpt_boot.c b/cgpt/cgpt_boot.c
index d8976c42..932cd457 100644
--- a/cgpt/cgpt_boot.c
+++ b/cgpt/cgpt_boot.c
@@ -1,6 +1,7 @@
-// Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
+/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/cgpt/cgpt_create.c b/cgpt/cgpt_create.c
index 77980bfc..fac89925 100644
--- a/cgpt/cgpt_create.c
+++ b/cgpt/cgpt_create.c
@@ -1,7 +1,7 @@
-// Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
+/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 
 #include <string.h>
 
diff --git a/cgpt/cgpt_edit.c b/cgpt/cgpt_edit.c
index c7781ffc..e0d32f48 100644
--- a/cgpt/cgpt_edit.c
+++ b/cgpt/cgpt_edit.c
@@ -1,6 +1,7 @@
-// Copyright 2018 The Chromium OS Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
+/* Copyright 2018 The Chromium OS Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 
 #include "cgpt.h"
 #include "cgpt_params.h"
diff --git a/cgpt/cgpt_endian.h b/cgpt/cgpt_endian.h
index 49439ccf..a40b2c18 100644
--- a/cgpt/cgpt_endian.h
+++ b/cgpt/cgpt_endian.h
@@ -3,8 +3,8 @@
  * found in the LICENSE file.
  */
 
-#ifndef VBOOT_REFERENCE_UTILITY_CGPT_ENDIAN_H_
-#define VBOOT_REFERENCE_UTILITY_CGPT_ENDIAN_H_
+#ifndef VBOOT_REFERENCE_CGPT_ENDIAN_H_
+#define VBOOT_REFERENCE_CGPT_ENDIAN_H_
 
 // Newer distros already have this. For those that don't, we add it here.
 #ifndef HAVE_MACOS
@@ -50,4 +50,5 @@
 # endif
 
 #endif
-#endif  // VBOOT_REFERENCE_UTILITY_CGPT_ENDIAN_H_
+
+#endif  /* VBOOT_REFERENCE_CGPT_ENDIAN_H_ */
diff --git a/cgpt/cgpt_find.c b/cgpt/cgpt_find.c
index 9cf87dd2..1c8c72dc 100644
--- a/cgpt/cgpt_find.c
+++ b/cgpt/cgpt_find.c
@@ -1,6 +1,7 @@
-// Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
+/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 
 #include <ctype.h>
 #include <string.h>
diff --git a/cgpt/cgpt_legacy.c b/cgpt/cgpt_legacy.c
index cf84821c..e51495ad 100644
--- a/cgpt/cgpt_legacy.c
+++ b/cgpt/cgpt_legacy.c
@@ -1,6 +1,7 @@
-// Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
+/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 
 #include <string.h>
 
diff --git a/cgpt/cgpt_nor.h b/cgpt/cgpt_nor.h
index b01f88d8..47460895 100644
--- a/cgpt/cgpt_nor.h
+++ b/cgpt/cgpt_nor.h
@@ -6,8 +6,8 @@
  * and write to NOR flash.
  */
 
-#ifndef VBOOT_REFERCENCE_CGPT_CGPT_NOR_H_
-#define VBOOT_REFERCENCE_CGPT_CGPT_NOR_H_
+#ifndef VBOOT_REFERENCE_CGPT_NOR_H_
+#define VBOOT_REFERENCE_CGPT_NOR_H_
 
 // Obtain the MTD size from its sysfs node. |mtd_device| should point to
 // a dev node such as /dev/mtd0. This function returns 0 on success.
@@ -31,4 +31,4 @@ int ReadNorFlash(char *temp_dir_template);
 // Write "rw_gpt" back to NOR flash. We write the file in two parts for safety.
 int WriteNorFlash(const char *dir);
 
-#endif  // VBOOT_REFERCENCE_CGPT_CGPT_NOR_H_
+#endif  /* VBOOT_REFERENCE_CGPT_NOR_H_ */
diff --git a/cgpt/cgpt_prioritize.c b/cgpt/cgpt_prioritize.c
index b59005f7..f81ca8a2 100644
--- a/cgpt/cgpt_prioritize.c
+++ b/cgpt/cgpt_prioritize.c
@@ -1,6 +1,7 @@
-// Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
+/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 
 #include <string.h>
 
diff --git a/cgpt/cgpt_repair.c b/cgpt/cgpt_repair.c
index ebe034b1..fc650883 100644
--- a/cgpt/cgpt_repair.c
+++ b/cgpt/cgpt_repair.c
@@ -1,7 +1,7 @@
-// Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
+/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 
 #include <string.h>
 
diff --git a/cgpt/cgpt_show.c b/cgpt/cgpt_show.c
index 5f20988b..af4d88fa 100644
--- a/cgpt/cgpt_show.c
+++ b/cgpt/cgpt_show.c
@@ -1,6 +1,7 @@
-// Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
+/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 
 #define __STDC_FORMAT_MACROS
 
diff --git a/cgpt/cmd_add.c b/cgpt/cmd_add.c
index f10489ac..ef6f729d 100644
--- a/cgpt/cmd_add.c
+++ b/cgpt/cmd_add.c
@@ -1,6 +1,7 @@
-// Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
+/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 
 #include <getopt.h>
 #include <string.h>
diff --git a/cgpt/cmd_boot.c b/cgpt/cmd_boot.c
index a556b53b..07cf5b4d 100644
--- a/cgpt/cmd_boot.c
+++ b/cgpt/cmd_boot.c
@@ -1,6 +1,7 @@
-// Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
+/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 
 #include <getopt.h>
 #include <string.h>
diff --git a/cgpt/cmd_create.c b/cgpt/cmd_create.c
index d4ef44c7..22d49568 100644
--- a/cgpt/cmd_create.c
+++ b/cgpt/cmd_create.c
@@ -1,6 +1,7 @@
-// Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
+/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 
 #include <getopt.h>
 #include <string.h>
diff --git a/cgpt/cmd_edit.c b/cgpt/cmd_edit.c
index fb4d9192..3daf3895 100644
--- a/cgpt/cmd_edit.c
+++ b/cgpt/cmd_edit.c
@@ -1,6 +1,7 @@
-// Copyright 2018 The Chromium OS Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
+/* Copyright 2018 The Chromium OS Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 
 #include <getopt.h>
 
diff --git a/cgpt/cmd_find.c b/cgpt/cmd_find.c
index 511518d5..bf7c3953 100644
--- a/cgpt/cmd_find.c
+++ b/cgpt/cmd_find.c
@@ -1,6 +1,7 @@
-// Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
+/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 
 #include <getopt.h>
 #include <string.h>
diff --git a/cgpt/cmd_legacy.c b/cgpt/cmd_legacy.c
index 911384d6..5468e8a9 100644
--- a/cgpt/cmd_legacy.c
+++ b/cgpt/cmd_legacy.c
@@ -1,6 +1,7 @@
-// Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
+/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 
 #include <getopt.h>
 #include <string.h>
diff --git a/cgpt/cmd_prioritize.c b/cgpt/cmd_prioritize.c
index 006f1f12..92d1debe 100644
--- a/cgpt/cmd_prioritize.c
+++ b/cgpt/cmd_prioritize.c
@@ -1,6 +1,7 @@
-// Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
+/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 
 #include <getopt.h>
 #include <stdio.h>
diff --git a/cgpt/cmd_repair.c b/cgpt/cmd_repair.c
index f2534a17..18e79ca2 100644
--- a/cgpt/cmd_repair.c
+++ b/cgpt/cmd_repair.c
@@ -1,6 +1,7 @@
-// Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
+/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 
 #include <getopt.h>
 #include <string.h>
diff --git a/cgpt/cmd_show.c b/cgpt/cmd_show.c
index 6f31b3b5..22d31841 100644
--- a/cgpt/cmd_show.c
+++ b/cgpt/cmd_show.c
@@ -1,8 +1,10 @@
-// Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
+/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 
 #define __STDC_FORMAT_MACROS
+
 #include <getopt.h>
 #include <inttypes.h>
 #include <string.h>