summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorGuillem Jover <guillem@debian.org>2008-09-08 03:09:49 +0300
committerGuillem Jover <guillem@debian.org>2008-09-14 05:57:44 +0300
commit9bf0b5bcc29dca312f4888532d67671a54fda180 (patch)
tree2a884db4ca1fc2e2534e4475fbd94fa4a69a213f /lib
parent405accb78561ac2205b33627f2809a7f10e93ee6 (diff)
downloaddpkg-9bf0b5bcc29dca312f4888532d67671a54fda180.tar.gz
libdpkg: Move loadcfgfile from standard_startup to its callers
Diffstat (limited to 'lib')
-rw-r--r--lib/dpkg.h4
1 files changed, 1 insertions, 3 deletions
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 { \