[src/pkgviews]: src/usr.sbin/pkg_install/lib Move the DEF_LOG_DIR and PKG_DBD...

[jlam <jlam%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f6c756f78fdd
branches:  pkgviews
changeset: 534281:f6c756f78fdd
user:      jlam <jlam%NetBSD.org@localhost>
date:      Mon Sep 01 12:14:24 2003 +0000

description:
Move the DEF_LOG_DIR and PKG_DBDIR definitions from lib/lib.h into
lib/pkgdb.c.  That's the only file that uses those macros.

diffstat:

 usr.sbin/pkg_install/lib/lib.h   |  12 +-----------
 usr.sbin/pkg_install/lib/pkgdb.c |  14 ++++++++++++--
 2 files changed, 13 insertions(+), 13 deletions(-)

diffs (57 lines):

diff -r 84cbc0439691 -r f6c756f78fdd usr.sbin/pkg_install/lib/lib.h
--- a/usr.sbin/pkg_install/lib/lib.h    Mon Sep 01 07:35:35 2003 +0000
+++ b/usr.sbin/pkg_install/lib/lib.h    Mon Sep 01 12:14:24 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: lib.h,v 1.43.2.9 2003/08/30 12:09:15 jlam Exp $ */
+/* $NetBSD: lib.h,v 1.43.2.10 2003/09/01 12:14:24 jlam Exp $ */
 
 /* from FreeBSD Id: lib.h,v 1.25 1997/10/08 07:48:03 charnier Exp */
 
@@ -89,16 +89,6 @@
 #define CHGRP_CMD "chgrp"
 #endif
 
-/*
- * Where we put logging information by default if PKG_DBDIR is unset.
- */
-#ifndef DEF_LOG_DIR
-#define DEF_LOG_DIR            "/var/db/pkg"
-#endif
-
-/* just in case we change the environment variable name */
-#define PKG_DBDIR              "PKG_DBDIR"
-
 /* The names of our "special" files */
 #define CONTENTS_FNAME         "+CONTENTS"
 #define COMMENT_FNAME          "+COMMENT"
diff -r 84cbc0439691 -r f6c756f78fdd usr.sbin/pkg_install/lib/pkgdb.c
--- a/usr.sbin/pkg_install/lib/pkgdb.c  Mon Sep 01 07:35:35 2003 +0000
+++ b/usr.sbin/pkg_install/lib/pkgdb.c  Mon Sep 01 12:14:24 2003 +0000
@@ -1,8 +1,8 @@
-/*     $NetBSD: pkgdb.c,v 1.9.4.4 2003/08/30 12:09:16 jlam Exp $       */
+/*     $NetBSD: pkgdb.c,v 1.9.4.5 2003/09/01 12:14:25 jlam Exp $       */
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: pkgdb.c,v 1.9.4.4 2003/08/30 12:09:16 jlam Exp $");
+__RCSID("$NetBSD: pkgdb.c,v 1.9.4.5 2003/09/01 12:14:25 jlam Exp $");
 #endif
 
 /*
@@ -46,6 +46,16 @@
 
 #define PKGDB_FILE     "pkgdb.byfile.db"       /* indexed by filename */
 
+/*
+ * Where we put logging information by default if PKG_DBDIR is unset.
+ */
+#ifndef DEF_LOG_DIR
+#define DEF_LOG_DIR            "/var/db/pkg"
+#endif
+
+/* just in case we change the environment variable name */
+#define PKG_DBDIR              "PKG_DBDIR"
+
 static DB   *pkgdbp;
 static char *pkgdb_dir = NULL;
 static char  pkgdb_cache[FILENAME_MAX];