diff options
| author | Guillem Jover <guillem@debian.org> | 2008-09-08 02:29:20 +0300 |
|---|---|---|
| committer | Guillem Jover <guillem@debian.org> | 2008-09-14 05:57:39 +0300 |
| commit | 405accb78561ac2205b33627f2809a7f10e93ee6 (patch) | |
| tree | fc28c01dfe5165fae91b549984f863eb5ba4968b /lib | |
| parent | c47003c7b240b4f295e4555794835e6a0aeddfe0 (diff) | |
| download | dpkg-405accb78561ac2205b33627f2809a7f10e93ee6.tar.gz | |
libdpkg: Move myopt from standard_startup to each program main
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/dpkg.h | 5 | ||||
| -rw-r--r-- | lib/myopt-util.c | 1 |
2 files changed, 2 insertions, 4 deletions
diff --git a/lib/dpkg.h b/lib/dpkg.h index ab9ed22e0..58ce20e64 100644 --- a/lib/dpkg.h +++ b/lib/dpkg.h @@ -32,8 +32,6 @@ DPKG_BEGIN_DECLS #include <stdio.h> #include <sys/types.h> -#include <myopt.h> - #ifdef HAVE_SYS_CDEFS_H #include <sys/cdefs.h> #endif @@ -154,7 +152,7 @@ extern const char printforhelp[]; /*** from startup.c ***/ -#define standard_startup(ejbuf, argc, argv, prog, loadcfg, cmdinfos) do {\ +#define standard_startup(ejbuf, prog, loadcfg, cmdinfos) do {\ if (setjmp(*ejbuf)) { /* expect warning about possible clobbering of argv */\ error_unwind(ehflag_bombout); exit(2);\ }\ @@ -162,7 +160,6 @@ extern const char printforhelp[]; umask(022); /* Make sure all our status databases are readable. */\ if (loadcfg)\ loadcfgfile(prog, cmdinfos);\ - myopt(argv,cmdinfos);\ } while (0) #define standard_shutdown() do { \ diff --git a/lib/myopt-util.c b/lib/myopt-util.c index 2e9c8256f..592f7f4f3 100644 --- a/lib/myopt-util.c +++ b/lib/myopt-util.c @@ -22,6 +22,7 @@ #include <compat.h> #include <dpkg-i18n.h> +#include <myopt.h> #include <stdlib.h> #include <unistd.h> |