From 9bf0b5bcc29dca312f4888532d67671a54fda180 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Mon, 8 Sep 2008 03:09:49 +0300
Subject: libdpkg: Move loadcfgfile from standard_startup to its callers

---
 lib/dpkg.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/dpkg.h b/lib/dpkg.h
index 58ce20e64..59148e7f0 100644
--- a/lib/dpkg.h
+++ b/lib/dpkg.h
@@ -152,14 +152,12 @@ extern const char printforhelp[];
 
 /*** from startup.c ***/
 
-#define standard_startup(ejbuf, prog, loadcfg, cmdinfos) do {\
+#define standard_startup(ejbuf) do {\
   if (setjmp(*ejbuf)) { /* expect warning about possible clobbering of argv */\
     error_unwind(ehflag_bombout); exit(2);\
   }\
   push_error_handler(ejbuf, print_error_fatal, NULL); \
   umask(022); /* Make sure all our status databases are readable. */\
-  if (loadcfg)\
-    loadcfgfile(prog, cmdinfos);\
 } while (0)
 
 #define standard_shutdown() do { \
-- 
cgit v1.2.3