The following commit has been merged in the master branch:
commit 2efaf5ff4af2653bbb69d05568d8628d7cb0e97b
Author: Guillem Jover <[email protected]>
Date: Mon Jul 13 14:32:34 2009 +0200
Inline CONFFOPTCELLS into conffoptcells definition
The values in CONFFOPTCELLS are dpkg specific, and not to be found in
libdpkg so there's no much point in defining the macro there. Also this
makes for clearer code.
diff --git a/lib/dpkg.h b/lib/dpkg.h
index 3ebe394..c30e807 100644
--- a/lib/dpkg.h
+++ b/lib/dpkg.h
@@ -100,12 +100,6 @@ DPKG_BEGIN_DECLS
#define MD5HASHLEN 32
#define MAXTRIGDIRECTIVE 256
-#define CONFFOPTCELLS /* int conffoptcells[2] {* 1= user edited *}
\
- [2] {* 1= distributor edited *} =
*/ \
- /* dist not */ /* dist edited */
\
- /* user did not edit */ { cfo_keep, cfo_install },
\
- /* user did edit */ { cfo_keep, cfo_prompt_keep }
-
#define ARCHIVE_FILENAME_PATTERN "*.deb"
#define BACKEND "dpkg-deb"
diff --git a/src/configure.c b/src/configure.c
index cce7a0a..b827469 100644
--- a/src/configure.c
+++ b/src/configure.c
@@ -49,7 +49,11 @@
#include "filesdb.h"
#include "main.h"
-static int conffoptcells[2][2] = { CONFFOPTCELLS };
+static int conffoptcells[2][2] = {
+ /* Distro !edited. */ /* Distro edited. */
+ { cfo_keep, cfo_install }, /* User !edited. */
+ { cfo_keep, cfo_prompt_keep }, /* User edited. */
+};
static void md5hash(struct pkginfo *pkg, char **hashbuf, const char *fn);
static void copyfileperm(const char* source, const char* target);
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
