Mercurial > hg > octave-nkf > gnulib-hg
changeset 5305:077fc6e8f1ce
(enum backuptype): Rename none -> no_backups,
simple -> simple_backups, numbered_existing ->
numbered_existing_backups, numbered -> numbered_backups
to avoid shadowing problems. All uses changed.
author | Paul Eggert <eggert@cs.ucla.edu> |
---|---|
date | Mon, 04 Oct 2004 04:27:58 +0000 |
parents | 707482f5c106 |
children | 0c7b3a1e0e4b |
files | lib/argmatch.c lib/backupfile.h |
diffstat | 2 files changed, 14 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/lib/argmatch.c +++ b/lib/argmatch.c @@ -216,17 +216,17 @@ 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 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];
--- a/lib/backupfile.h +++ b/lib/backupfile.h @@ -30,24 +30,21 @@ 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;