From dd9099e721075856534d551184fb02023a463e1a Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 4 Oct 2004 04:27:58 +0000
Subject: [PATCH] (enum backuptype): Rename none -> no_backups, simple ->
 simple_backups, numbered_existing -> numbered_existing_backups, numbered ->
 numbered_backups to avoid shadowing problems.  All uses changed.

---
 lib/argmatch.c   | 18 +++++++++---------
 lib/backupfile.h | 13 +++++--------
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/lib/argmatch.c b/lib/argmatch.c
index 1a8ec2f54..ffc638c27 100644
--- a/lib/argmatch.c
+++ b/lib/argmatch.c
@@ -216,17 +216,17 @@ char *program_name;
 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
 };
 
 /* Two tables describing arguments (keys) and their corresponding
@@ -242,17 +242,17 @@ static const char *const backup_args[] =
 
 static const enum backup_type backup_vals[] =
 {
-  none, none, none,
-  simple, simple,
-  numbered_existing, numbered_existing,
-  numbered, numbered
+  no_backups, no_backups, no_backups,
+  simple_backups, simple_backups,
+  numbered_existing_backups, numbered_existing_backups,
+  numbered_backups, numbered_backups
 };
 
 int
 main (int argc, const char *const *argv)
 {
   const char *cp;
-  enum backup_type backup_type = none;
+  enum backup_type backup_type = no_backups;
 
   program_name = (char *) argv[0];
 
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;
 
-- 
2.11.0