summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillem Jover <guillem@debian.org>2014-05-28 00:51:46 +0200
committerGuillem Jover <guillem@debian.org>2014-05-28 00:51:46 +0200
commit670c99fbcd993f1e3a8236bd38ac664f8b5658dd (patch)
treeb3d766c3e82caef7376e73667e90214322b2cb1f
parent0bac29bc7ceb5e8eb7816a61720dc7ae1e4fe693 (diff)
downloaddpkg-670c99fbcd993f1e3a8236bd38ac664f8b5658dd.tar.gz
libdpkg: Uppercase and expand atomic_file_flags enum values
-rw-r--r--lib/dpkg/atomic-file.c4
-rw-r--r--lib/dpkg/atomic-file.h4
-rw-r--r--lib/dpkg/dump.c2
-rw-r--r--src/divertcmd.c2
-rw-r--r--src/statcmd.c4
5 files changed, 8 insertions, 8 deletions
diff --git a/lib/dpkg/atomic-file.c b/lib/dpkg/atomic-file.c
index 078b47835..07ab49c08 100644
--- a/lib/dpkg/atomic-file.c
+++ b/lib/dpkg/atomic-file.c
@@ -2,7 +2,7 @@
* libdpkg - Debian packaging suite library routines
* atomic-file.c - atomic file helper functions
*
- * Copyright © 2011 Guillem Jover <guillem@debian.org>
+ * Copyright © 2011-2014 Guillem Jover <guillem@debian.org>
*
* This is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -108,7 +108,7 @@ atomic_file_remove(struct atomic_file *file)
void
atomic_file_commit(struct atomic_file *file)
{
- if (file->flags & aff_backup)
+ if (file->flags & ATOMIC_FILE_BACKUP)
atomic_file_backup(file);
if (rename(file->name_new, file->name))
diff --git a/lib/dpkg/atomic-file.h b/lib/dpkg/atomic-file.h
index 0602d2bab..50c1b7ed8 100644
--- a/lib/dpkg/atomic-file.h
+++ b/lib/dpkg/atomic-file.h
@@ -2,7 +2,7 @@
* libdpkg - Debian packaging suite library routines
* atomic-file.h - atomic file helper functions
*
- * Copyright © 2011 Guillem Jover <guillem@debian.org>
+ * Copyright © 2011-2014 Guillem Jover <guillem@debian.org>
*
* This is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -34,7 +34,7 @@ DPKG_BEGIN_DECLS
*/
enum atomic_file_flags {
- aff_backup = DPKG_BIT(0),
+ ATOMIC_FILE_BACKUP = DPKG_BIT(0),
};
struct atomic_file {
diff --git a/lib/dpkg/dump.c b/lib/dpkg/dump.c
index 5267af5c9..15b55128f 100644
--- a/lib/dpkg/dump.c
+++ b/lib/dpkg/dump.c
@@ -480,7 +480,7 @@ writedb(const char *filename, enum writedb_flags flags)
which = (flags & wdb_dump_available) ? "available" : "status";
- file = atomic_file_new(filename, aff_backup);
+ file = atomic_file_new(filename, ATOMIC_FILE_BACKUP);
atomic_file_open(file);
if (setvbuf(file->fp, writebuf, _IOFBF, sizeof(writebuf)))
ohshite(_("unable to set buffering on %s database file"), which);
diff --git a/src/divertcmd.c b/src/divertcmd.c
index f4a268c89..759ce26e9 100644
--- a/src/divertcmd.c
+++ b/src/divertcmd.c
@@ -361,7 +361,7 @@ divertdb_write(void)
dbname = dpkg_db_get_path(DIVERSIONSFILE);
- file = atomic_file_new(dbname, aff_backup);
+ file = atomic_file_new(dbname, ATOMIC_FILE_BACKUP);
atomic_file_open(file);
iter = files_db_iter_new();
diff --git a/src/statcmd.c b/src/statcmd.c
index 64e924d9d..a29d9a5e3 100644
--- a/src/statcmd.c
+++ b/src/statcmd.c
@@ -2,7 +2,7 @@
* dpkg-statoverride - override ownership and mode of files
*
* Copyright © 2000, 2001 Wichert Akkerman <wakkerma@debian.org>
- * Copyright © 2006-2012 Guillem Jover <guillem@debian.org>
+ * Copyright © 2006-2014 Guillem Jover <guillem@debian.org>
*
* This is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -195,7 +195,7 @@ statdb_write(void)
struct filenamenode *file;
dbname = dpkg_db_get_path(STATOVERRIDEFILE);
- dbfile = atomic_file_new(dbname, aff_backup);
+ dbfile = atomic_file_new(dbname, ATOMIC_FILE_BACKUP);
atomic_file_open(dbfile);
iter = files_db_iter_new();