(enum backuptype): Rename none -> no_backups,

simple -> simple_backups, numbered_existing ->
numbered_existing_backups, numbered -> numbered_backups
to avoid shadowing problems.  All uses changed.
(VALID_BACKUP_TYPE): Don't evaluate arg more than once.

1 files changed, 5 insertions, 8 deletions

diff --git a/lib/backupfile.h b/lib/backupfile.h
index 346b60c3e..d217bca00 100644
--- a/lib/backupfile.h
+++ b/lib/backupfile.h
@@ -30,24 +30,21 @@ extern "C" {
 enum backup_type
 {
   /* Never make backups. */
-  none,
+  no_backups,
 
   /* Make simple backups of every file. */
-  simple,
+  simple_backups,
 
   /* Make numbered backups of files that already have numbered backups,
      and simple backups of the others. */
-  numbered_existing,
+  numbered_existing_backups,
 
   /* Make numbered backups of every file. */
-  numbered
+  numbered_backups
 };
 
 # define VALID_BACKUP_TYPE(Type)	\
-  ((Type) == none			\
-   || (Type) == simple			\
-   || (Type) == numbered_existing	\
-   || (Type) == numbered)
+  ((unsigned int) (Type) <= numbered_backups)
 
 extern char const *simple_backup_suffix;