diff mbox

[01/12] src/lib/*.h: remove extraneous , at end of enum lists

Message ID 1402245742-744-2-git-send-email-colin.king@canonical.com
State Accepted
Headers show

Commit Message

Colin Ian King June 8, 2014, 4:42 p.m. UTC 
From: Colin Ian King <colin.king@canonical.com>

The trailing , is extraneous in enums, so remove it.

Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 src/lib/include/fwts_acpi_tables.h | 2 +-
 src/lib/include/fwts_acpica_mode.h | 2 +-
 src/lib/include/fwts_firmware.h    | 2 +-
 src/lib/include/fwts_framework.h   | 2 +-
 src/lib/include/fwts_klog.h        | 2 +-
 src/lib/include/fwts_log.h         | 8 ++++----
 src/lib/include/fwts_smbios.h      | 2 +-
 src/lib/include/fwts_types.h       | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

Comments

Jeremy Kerr June 9, 2014, 1:27 p.m. UTC | #1 
Hi Colin,

> The trailing , is extraneous in enums, so remove it.

Why though? This means that any patch that subsequently adds an enum
member has to modify the last item, rather than just adding a line.

Cheers,


Jeremy
Colin Ian King June 9, 2014, 1:33 p.m. UTC | #2 
On 09/06/14 14:27, Jeremy Kerr wrote:
> Hi Colin,
> 
>> The trailing , is extraneous in enums, so remove it.
> 
> Why though? This means that any patch that subsequently adds an enum
> member has to modify the last item, rather than just adding a line.

Style more than anything else:

1. it was not being used consistently, so I wanted some form of style to
be used across fwts, so I aligned it with what ACPICA is using.
2. it's less warning noise when I add in some very pedantic flags with
various compilers I test fwts builds with
3. i like being anal.

Colin

> 
> Cheers,
> 
> 
> Jeremy
>
Alex Hung June 10, 2014, 5:34 p.m. UTC | #3 
On 06/08/2014 09:42 AM, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
> 
> The trailing , is extraneous in enums, so remove it.
> 
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>  src/lib/include/fwts_acpi_tables.h | 2 +-
>  src/lib/include/fwts_acpica_mode.h | 2 +-
>  src/lib/include/fwts_firmware.h    | 2 +-
>  src/lib/include/fwts_framework.h   | 2 +-
>  src/lib/include/fwts_klog.h        | 2 +-
>  src/lib/include/fwts_log.h         | 8 ++++----
>  src/lib/include/fwts_smbios.h      | 2 +-
>  src/lib/include/fwts_types.h       | 2 +-
>  8 files changed, 11 insertions(+), 11 deletions(-)
> 
> diff --git a/src/lib/include/fwts_acpi_tables.h b/src/lib/include/fwts_acpi_tables.h
> index 6db784d..6977e87 100644
> --- a/src/lib/include/fwts_acpi_tables.h
> +++ b/src/lib/include/fwts_acpi_tables.h
> @@ -25,7 +25,7 @@
>  typedef enum {
>  	FWTS_ACPI_TABLE_FROM_FIRMWARE,	/* directly from firmware */
>  	FWTS_ACPI_TABLE_FROM_FILE,	/* loaded from file, e.g. from acpidump */
> -	FWTS_ACPI_TABLE_FROM_FIXUP,	/* auto-generated fixup by fwts */
> +	FWTS_ACPI_TABLE_FROM_FIXUP	/* auto-generated fixup by fwts */
>  } fwts_acpi_table_provenance;
>  
>  typedef struct {
> diff --git a/src/lib/include/fwts_acpica_mode.h b/src/lib/include/fwts_acpica_mode.h
> index 173c9d6..e8cbcc2 100644
> --- a/src/lib/include/fwts_acpica_mode.h
> +++ b/src/lib/include/fwts_acpica_mode.h
> @@ -24,7 +24,7 @@ typedef enum {
>  	FWTS_ACPICA_MODE_SERIALIZED		= 0x00000001,
>  	FWTS_ACPICA_MODE_SLACK			= 0x00000002,
>  	FWTS_ACPICA_MODE_IGNORE_ERRORS		= 0x00000004,
> -	FWTS_ACPICA_MODE_DISABLE_AUTO_REPAIR	= 0x00000008,
> +	FWTS_ACPICA_MODE_DISABLE_AUTO_REPAIR	= 0x00000008
>  } fwts_acpica_mode;
>  
>  #endif
> diff --git a/src/lib/include/fwts_firmware.h b/src/lib/include/fwts_firmware.h
> index 7688d5e..8a6dc14 100644
> --- a/src/lib/include/fwts_firmware.h
> +++ b/src/lib/include/fwts_firmware.h
> @@ -23,7 +23,7 @@ enum {
>  	FWTS_FIRMWARE_UNKNOWN = 0,
>  	FWTS_FIRMWARE_BIOS = 1,
>  	FWTS_FIRMWARE_UEFI = 2,
> -	FWTS_FIRMWARE_OTHER = 100,
> +	FWTS_FIRMWARE_OTHER = 100
>  };
>  
>  int fwts_firmware_detect(void);
> diff --git a/src/lib/include/fwts_framework.h b/src/lib/include/fwts_framework.h
> index 713371b..8af8bbe 100644
> --- a/src/lib/include/fwts_framework.h
> +++ b/src/lib/include/fwts_framework.h
> @@ -50,7 +50,7 @@ typedef enum {
>  	FWTS_FLAG_TEST_ACPI			= 0x04000000,
>  	FWTS_FLAG_UTILS				= 0x08000000,
>  	FWTS_FLAG_QUIET				= 0x10000000,
> -	FWTS_FLAG_SHOW_TESTS_FULL		= 0x20000000,
> +	FWTS_FLAG_SHOW_TESTS_FULL		= 0x20000000
>  } fwts_framework_flags;
>  
>  #define FWTS_FLAG_TEST_MASK		\
> diff --git a/src/lib/include/fwts_klog.h b/src/lib/include/fwts_klog.h
> index 83ee61b..7524170 100644
> --- a/src/lib/include/fwts_klog.h
> +++ b/src/lib/include/fwts_klog.h
> @@ -34,7 +34,7 @@
>  typedef enum {
>  	FWTS_COMPARE_REGEX = 'r',
>  	FWTS_COMPARE_STRING = 's',
> -	FWTS_COMPARE_UNKNOWN = 'u',
> +	FWTS_COMPARE_UNKNOWN = 'u'
>  } fwts_compare_mode;
>  
>  typedef struct {
> diff --git a/src/lib/include/fwts_log.h b/src/lib/include/fwts_log.h
> index f27404d..6ae9bef 100644
> --- a/src/lib/include/fwts_log.h
> +++ b/src/lib/include/fwts_log.h
> @@ -48,7 +48,7 @@ typedef enum {
>  	LOG_FIELD_MASK	    = 0x0000ffff,
>  
>  	LOG_VERBATUM	    = 0x10000000,
> -	LOG_NO_FIELDS	    = 0x20000000,
> +	LOG_NO_FIELDS	    = 0x20000000
>  } fwts_log_field;
>  
>  typedef enum {
> @@ -57,7 +57,7 @@ typedef enum {
>  	LOG_LEVEL_HIGH      = 0x00000002,
>  	LOG_LEVEL_MEDIUM    = 0x00000004,
>  	LOG_LEVEL_LOW       = 0x00000008,
> -	LOG_LEVEL_INFO      = 0x00000010,
> +	LOG_LEVEL_INFO      = 0x00000010
>  } fwts_log_level;
>  
>  /*
> @@ -68,7 +68,7 @@ typedef enum {
>  	LOG_TYPE_PLAINTEXT  = 0x00000001,
>  	LOG_TYPE_JSON       = 0x00000002,
>  	LOG_TYPE_XML        = 0x00000004,
> -	LOG_TYPE_HTML       = 0x00000008,
> +	LOG_TYPE_HTML       = 0x00000008
>  } fwts_log_type;
>  
>  /*
> @@ -77,7 +77,7 @@ typedef enum {
>  typedef enum {
>  	LOG_FILENAME_TYPE_STDOUT = 0x00000001,	/* log output to stdout */
>  	LOG_FILENAME_TYPE_STDERR = 0x00000002,	/* log output to stderr */
> -	LOG_FILENAME_TYPE_FILE   = 0x00000003,	/* log output to a file */
> +	LOG_FILENAME_TYPE_FILE   = 0x00000003	/* log output to a file */
>  } fwts_log_filename_type;
>  
>  /*
> diff --git a/src/lib/include/fwts_smbios.h b/src/lib/include/fwts_smbios.h
> index 328a089..395ddb1 100644
> --- a/src/lib/include/fwts_smbios.h
> +++ b/src/lib/include/fwts_smbios.h
> @@ -61,7 +61,7 @@
>  typedef enum {
>  	FWTS_SMBIOS_UNKNOWN = -1,
>  	FWTS_SMBIOS_DMI_LEGACY = 0,
> -	FWTS_SMBIOS = 1,
> +	FWTS_SMBIOS = 1
>  } fwts_smbios_type;
>  
>  typedef struct {
> diff --git a/src/lib/include/fwts_types.h b/src/lib/include/fwts_types.h
> index 0ee10cc..f4b67d0 100644
> --- a/src/lib/include/fwts_types.h
> +++ b/src/lib/include/fwts_types.h
> @@ -34,7 +34,7 @@ typedef enum {
>  	FWTS_NOT_EXIST = -7,
>  	FWTS_COMPLETE = -8,
>  	FWTS_OUT_OF_MEMORY = -9,
> -	FWTS_NO_EBDA = -10,
> +	FWTS_NO_EBDA = -10
>  } fwts_status;
>  
>  #define	FWTS_MAP_FAILED 	((void *)-1)
> 

Acked-by: Alex Hung <alex.hung@canonical.com>
Ivan Hu June 12, 2014, 2:05 a.m. UTC | #4 
On 06/09/2014 12:42 AM, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> The trailing , is extraneous in enums, so remove it.
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>   src/lib/include/fwts_acpi_tables.h | 2 +-
>   src/lib/include/fwts_acpica_mode.h | 2 +-
>   src/lib/include/fwts_firmware.h    | 2 +-
>   src/lib/include/fwts_framework.h   | 2 +-
>   src/lib/include/fwts_klog.h        | 2 +-
>   src/lib/include/fwts_log.h         | 8 ++++----
>   src/lib/include/fwts_smbios.h      | 2 +-
>   src/lib/include/fwts_types.h       | 2 +-
>   8 files changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/src/lib/include/fwts_acpi_tables.h b/src/lib/include/fwts_acpi_tables.h
> index 6db784d..6977e87 100644
> --- a/src/lib/include/fwts_acpi_tables.h
> +++ b/src/lib/include/fwts_acpi_tables.h
> @@ -25,7 +25,7 @@
>   typedef enum {
>   	FWTS_ACPI_TABLE_FROM_FIRMWARE,	/* directly from firmware */
>   	FWTS_ACPI_TABLE_FROM_FILE,	/* loaded from file, e.g. from acpidump */
> -	FWTS_ACPI_TABLE_FROM_FIXUP,	/* auto-generated fixup by fwts */
> +	FWTS_ACPI_TABLE_FROM_FIXUP	/* auto-generated fixup by fwts */
>   } fwts_acpi_table_provenance;
>
>   typedef struct {
> diff --git a/src/lib/include/fwts_acpica_mode.h b/src/lib/include/fwts_acpica_mode.h
> index 173c9d6..e8cbcc2 100644
> --- a/src/lib/include/fwts_acpica_mode.h
> +++ b/src/lib/include/fwts_acpica_mode.h
> @@ -24,7 +24,7 @@ typedef enum {
>   	FWTS_ACPICA_MODE_SERIALIZED		= 0x00000001,
>   	FWTS_ACPICA_MODE_SLACK			= 0x00000002,
>   	FWTS_ACPICA_MODE_IGNORE_ERRORS		= 0x00000004,
> -	FWTS_ACPICA_MODE_DISABLE_AUTO_REPAIR	= 0x00000008,
> +	FWTS_ACPICA_MODE_DISABLE_AUTO_REPAIR	= 0x00000008
>   } fwts_acpica_mode;
>
>   #endif
> diff --git a/src/lib/include/fwts_firmware.h b/src/lib/include/fwts_firmware.h
> index 7688d5e..8a6dc14 100644
> --- a/src/lib/include/fwts_firmware.h
> +++ b/src/lib/include/fwts_firmware.h
> @@ -23,7 +23,7 @@ enum {
>   	FWTS_FIRMWARE_UNKNOWN = 0,
>   	FWTS_FIRMWARE_BIOS = 1,
>   	FWTS_FIRMWARE_UEFI = 2,
> -	FWTS_FIRMWARE_OTHER = 100,
> +	FWTS_FIRMWARE_OTHER = 100
>   };
>
>   int fwts_firmware_detect(void);
> diff --git a/src/lib/include/fwts_framework.h b/src/lib/include/fwts_framework.h
> index 713371b..8af8bbe 100644
> --- a/src/lib/include/fwts_framework.h
> +++ b/src/lib/include/fwts_framework.h
> @@ -50,7 +50,7 @@ typedef enum {
>   	FWTS_FLAG_TEST_ACPI			= 0x04000000,
>   	FWTS_FLAG_UTILS				= 0x08000000,
>   	FWTS_FLAG_QUIET				= 0x10000000,
> -	FWTS_FLAG_SHOW_TESTS_FULL		= 0x20000000,
> +	FWTS_FLAG_SHOW_TESTS_FULL		= 0x20000000
>   } fwts_framework_flags;
>
>   #define FWTS_FLAG_TEST_MASK		\
> diff --git a/src/lib/include/fwts_klog.h b/src/lib/include/fwts_klog.h
> index 83ee61b..7524170 100644
> --- a/src/lib/include/fwts_klog.h
> +++ b/src/lib/include/fwts_klog.h
> @@ -34,7 +34,7 @@
>   typedef enum {
>   	FWTS_COMPARE_REGEX = 'r',
>   	FWTS_COMPARE_STRING = 's',
> -	FWTS_COMPARE_UNKNOWN = 'u',
> +	FWTS_COMPARE_UNKNOWN = 'u'
>   } fwts_compare_mode;
>
>   typedef struct {
> diff --git a/src/lib/include/fwts_log.h b/src/lib/include/fwts_log.h
> index f27404d..6ae9bef 100644
> --- a/src/lib/include/fwts_log.h
> +++ b/src/lib/include/fwts_log.h
> @@ -48,7 +48,7 @@ typedef enum {
>   	LOG_FIELD_MASK	    = 0x0000ffff,
>
>   	LOG_VERBATUM	    = 0x10000000,
> -	LOG_NO_FIELDS	    = 0x20000000,
> +	LOG_NO_FIELDS	    = 0x20000000
>   } fwts_log_field;
>
>   typedef enum {
> @@ -57,7 +57,7 @@ typedef enum {
>   	LOG_LEVEL_HIGH      = 0x00000002,
>   	LOG_LEVEL_MEDIUM    = 0x00000004,
>   	LOG_LEVEL_LOW       = 0x00000008,
> -	LOG_LEVEL_INFO      = 0x00000010,
> +	LOG_LEVEL_INFO      = 0x00000010
>   } fwts_log_level;
>
>   /*
> @@ -68,7 +68,7 @@ typedef enum {
>   	LOG_TYPE_PLAINTEXT  = 0x00000001,
>   	LOG_TYPE_JSON       = 0x00000002,
>   	LOG_TYPE_XML        = 0x00000004,
> -	LOG_TYPE_HTML       = 0x00000008,
> +	LOG_TYPE_HTML       = 0x00000008
>   } fwts_log_type;
>
>   /*
> @@ -77,7 +77,7 @@ typedef enum {
>   typedef enum {
>   	LOG_FILENAME_TYPE_STDOUT = 0x00000001,	/* log output to stdout */
>   	LOG_FILENAME_TYPE_STDERR = 0x00000002,	/* log output to stderr */
> -	LOG_FILENAME_TYPE_FILE   = 0x00000003,	/* log output to a file */
> +	LOG_FILENAME_TYPE_FILE   = 0x00000003	/* log output to a file */
>   } fwts_log_filename_type;
>
>   /*
> diff --git a/src/lib/include/fwts_smbios.h b/src/lib/include/fwts_smbios.h
> index 328a089..395ddb1 100644
> --- a/src/lib/include/fwts_smbios.h
> +++ b/src/lib/include/fwts_smbios.h
> @@ -61,7 +61,7 @@
>   typedef enum {
>   	FWTS_SMBIOS_UNKNOWN = -1,
>   	FWTS_SMBIOS_DMI_LEGACY = 0,
> -	FWTS_SMBIOS = 1,
> +	FWTS_SMBIOS = 1
>   } fwts_smbios_type;
>
>   typedef struct {
> diff --git a/src/lib/include/fwts_types.h b/src/lib/include/fwts_types.h
> index 0ee10cc..f4b67d0 100644
> --- a/src/lib/include/fwts_types.h
> +++ b/src/lib/include/fwts_types.h
> @@ -34,7 +34,7 @@ typedef enum {
>   	FWTS_NOT_EXIST = -7,
>   	FWTS_COMPLETE = -8,
>   	FWTS_OUT_OF_MEMORY = -9,
> -	FWTS_NO_EBDA = -10,
> +	FWTS_NO_EBDA = -10
>   } fwts_status;
>
>   #define	FWTS_MAP_FAILED 	((void *)-1)
>

Acked-by: Ivan Hu <ivan.hu@canonical.com>
diff mbox

Patch

diff --git a/src/lib/include/fwts_acpi_tables.h b/src/lib/include/fwts_acpi_tables.h
index 6db784d..6977e87 100644
--- a/src/lib/include/fwts_acpi_tables.h
+++ b/src/lib/include/fwts_acpi_tables.h
@@ -25,7 +25,7 @@ 
 typedef enum {
 	FWTS_ACPI_TABLE_FROM_FIRMWARE,	/* directly from firmware */
 	FWTS_ACPI_TABLE_FROM_FILE,	/* loaded from file, e.g. from acpidump */
-	FWTS_ACPI_TABLE_FROM_FIXUP,	/* auto-generated fixup by fwts */
+	FWTS_ACPI_TABLE_FROM_FIXUP	/* auto-generated fixup by fwts */
 } fwts_acpi_table_provenance;
 
 typedef struct {
diff --git a/src/lib/include/fwts_acpica_mode.h b/src/lib/include/fwts_acpica_mode.h
index 173c9d6..e8cbcc2 100644
--- a/src/lib/include/fwts_acpica_mode.h
+++ b/src/lib/include/fwts_acpica_mode.h
@@ -24,7 +24,7 @@  typedef enum {
 	FWTS_ACPICA_MODE_SERIALIZED		= 0x00000001,
 	FWTS_ACPICA_MODE_SLACK			= 0x00000002,
 	FWTS_ACPICA_MODE_IGNORE_ERRORS		= 0x00000004,
-	FWTS_ACPICA_MODE_DISABLE_AUTO_REPAIR	= 0x00000008,
+	FWTS_ACPICA_MODE_DISABLE_AUTO_REPAIR	= 0x00000008
 } fwts_acpica_mode;
 
 #endif
diff --git a/src/lib/include/fwts_firmware.h b/src/lib/include/fwts_firmware.h
index 7688d5e..8a6dc14 100644
--- a/src/lib/include/fwts_firmware.h
+++ b/src/lib/include/fwts_firmware.h
@@ -23,7 +23,7 @@  enum {
 	FWTS_FIRMWARE_UNKNOWN = 0,
 	FWTS_FIRMWARE_BIOS = 1,
 	FWTS_FIRMWARE_UEFI = 2,
-	FWTS_FIRMWARE_OTHER = 100,
+	FWTS_FIRMWARE_OTHER = 100
 };
 
 int fwts_firmware_detect(void);
diff --git a/src/lib/include/fwts_framework.h b/src/lib/include/fwts_framework.h
index 713371b..8af8bbe 100644
--- a/src/lib/include/fwts_framework.h
+++ b/src/lib/include/fwts_framework.h
@@ -50,7 +50,7 @@  typedef enum {
 	FWTS_FLAG_TEST_ACPI			= 0x04000000,
 	FWTS_FLAG_UTILS				= 0x08000000,
 	FWTS_FLAG_QUIET				= 0x10000000,
-	FWTS_FLAG_SHOW_TESTS_FULL		= 0x20000000,
+	FWTS_FLAG_SHOW_TESTS_FULL		= 0x20000000
 } fwts_framework_flags;
 
 #define FWTS_FLAG_TEST_MASK		\
diff --git a/src/lib/include/fwts_klog.h b/src/lib/include/fwts_klog.h
index 83ee61b..7524170 100644
--- a/src/lib/include/fwts_klog.h
+++ b/src/lib/include/fwts_klog.h
@@ -34,7 +34,7 @@ 
 typedef enum {
 	FWTS_COMPARE_REGEX = 'r',
 	FWTS_COMPARE_STRING = 's',
-	FWTS_COMPARE_UNKNOWN = 'u',
+	FWTS_COMPARE_UNKNOWN = 'u'
 } fwts_compare_mode;
 
 typedef struct {
diff --git a/src/lib/include/fwts_log.h b/src/lib/include/fwts_log.h
index f27404d..6ae9bef 100644
--- a/src/lib/include/fwts_log.h
+++ b/src/lib/include/fwts_log.h
@@ -48,7 +48,7 @@  typedef enum {
 	LOG_FIELD_MASK	    = 0x0000ffff,
 
 	LOG_VERBATUM	    = 0x10000000,
-	LOG_NO_FIELDS	    = 0x20000000,
+	LOG_NO_FIELDS	    = 0x20000000
 } fwts_log_field;
 
 typedef enum {
@@ -57,7 +57,7 @@  typedef enum {
 	LOG_LEVEL_HIGH      = 0x00000002,
 	LOG_LEVEL_MEDIUM    = 0x00000004,
 	LOG_LEVEL_LOW       = 0x00000008,
-	LOG_LEVEL_INFO      = 0x00000010,
+	LOG_LEVEL_INFO      = 0x00000010
 } fwts_log_level;
 
 /*
@@ -68,7 +68,7 @@  typedef enum {
 	LOG_TYPE_PLAINTEXT  = 0x00000001,
 	LOG_TYPE_JSON       = 0x00000002,
 	LOG_TYPE_XML        = 0x00000004,
-	LOG_TYPE_HTML       = 0x00000008,
+	LOG_TYPE_HTML       = 0x00000008
 } fwts_log_type;
 
 /*
@@ -77,7 +77,7 @@  typedef enum {
 typedef enum {
 	LOG_FILENAME_TYPE_STDOUT = 0x00000001,	/* log output to stdout */
 	LOG_FILENAME_TYPE_STDERR = 0x00000002,	/* log output to stderr */
-	LOG_FILENAME_TYPE_FILE   = 0x00000003,	/* log output to a file */
+	LOG_FILENAME_TYPE_FILE   = 0x00000003	/* log output to a file */
 } fwts_log_filename_type;
 
 /*
diff --git a/src/lib/include/fwts_smbios.h b/src/lib/include/fwts_smbios.h
index 328a089..395ddb1 100644
--- a/src/lib/include/fwts_smbios.h
+++ b/src/lib/include/fwts_smbios.h
@@ -61,7 +61,7 @@ 
 typedef enum {
 	FWTS_SMBIOS_UNKNOWN = -1,
 	FWTS_SMBIOS_DMI_LEGACY = 0,
-	FWTS_SMBIOS = 1,
+	FWTS_SMBIOS = 1
 } fwts_smbios_type;
 
 typedef struct {
diff --git a/src/lib/include/fwts_types.h b/src/lib/include/fwts_types.h
index 0ee10cc..f4b67d0 100644
--- a/src/lib/include/fwts_types.h
+++ b/src/lib/include/fwts_types.h
@@ -34,7 +34,7 @@  typedef enum {
 	FWTS_NOT_EXIST = -7,
 	FWTS_COMPLETE = -8,
 	FWTS_OUT_OF_MEMORY = -9,
-	FWTS_NO_EBDA = -10,
+	FWTS_NO_EBDA = -10
 } fwts_status;
 
 #define	FWTS_MAP_FAILED 	((void *)-1)