diff options
| -rw-r--r-- | autodeps/linux.prov | 6 | ||||
| -rw-r--r-- | rpmio/rpmio_internal.h | 4 | ||||
| -rw-r--r-- | rpmio/rpmrpc.c | 8 | ||||
| -rw-r--r-- | rpmio/tdir.c | 5 | ||||
| -rw-r--r-- | rpmio/tfts.c | 4 | ||||
| -rw-r--r-- | rpmio/tglob.c | 5 |
6 files changed, 7 insertions, 25 deletions
diff --git a/autodeps/linux.prov b/autodeps/linux.prov index 9e821782e..8547dc3dd 100644 --- a/autodeps/linux.prov +++ b/autodeps/linux.prov @@ -46,16 +46,16 @@ done | sort -u # # --- Perl modules. [ -x /usr/lib/rpm/perl.prov ] && - echo $filelist | tr [:blank:] \\n | grep '\.pm$' | /usr/lib/rpm/perl.prov | sort -u + echo $filelist | tr '[:blank:]' \\n | grep '\.pm$' | /usr/lib/rpm/perl.prov | sort -u # # --- Python modules. [ -x /usr/lib/rpm/python.prov -a -n "$pythonlist" ] && - echo $pythonlist | tr [:blank:] \\n | /usr/lib/rpm/python.prov | sort -u + echo $pythonlist | tr '[:blank:]' \\n | /usr/lib/rpm/python.prov | sort -u # # --- Tcl modules. [ -x /usr/lib/rpm/tcl.prov -a -n "$tcllist" ] && - echo $tcllist | tr [:blank:] \\n | /usr/lib/rpm/tcl.prov | sort -u + echo $tcllist | tr '[:blank:]' \\n | /usr/lib/rpm/tcl.prov | sort -u exit 0 diff --git a/rpmio/rpmio_internal.h b/rpmio/rpmio_internal.h index f3da01017..78838be14 100644 --- a/rpmio/rpmio_internal.h +++ b/rpmio/rpmio_internal.h @@ -150,6 +150,10 @@ struct _FD_s { extern int _rpmio_debug; /*@=redecl@*/ +/*@-redecl@*/ +extern int _ftp_debug; +/*@=redecl@*/ + #define DBG(_f, _m, _x) \ if ((_rpmio_debug | ((_f) ? ((FD_t)(_f))->flags : 0)) & (_m)) fprintf _x diff --git a/rpmio/rpmrpc.c b/rpmio/rpmrpc.c index f1f2bc30d..95e895108 100644 --- a/rpmio/rpmrpc.c +++ b/rpmio/rpmrpc.c @@ -17,14 +17,6 @@ /*@access FD_t@*/ /*@access urlinfo@*/ -/*@-redecl@*/ -extern int _ftp_debug; -/*@=redecl@*/ - -/*@-redecl@*/ -extern int _rpmio_debug; -/*@=redecl@*/ - /* =============================================================== */ static int ftpMkdir(const char * path, /*@unused@*/ mode_t mode) /*@globals fileSystem @*/ diff --git a/rpmio/tdir.c b/rpmio/tdir.c index 2795b33cc..6c592eba4 100644 --- a/rpmio/tdir.c +++ b/rpmio/tdir.c @@ -9,11 +9,6 @@ static int _debug = 0; -/*@unchecked@*/ -extern int _ftp_debug; -/*@unchecked@*/ -extern int _rpmio_debug; - #define FTPPATH "ftp://porkchop/mnt/redhat/beehive/comps/dist/7.2-rpm" #define DIRPATH "/mnt/redhat/beehive/comps/dist/7.2-rpm" static char * dirpath = DIRPATH; diff --git a/rpmio/tfts.c b/rpmio/tfts.c index ec97a5e28..ac822202c 100644 --- a/rpmio/tfts.c +++ b/rpmio/tfts.c @@ -10,10 +10,6 @@ /*@unchecked@*/ static int _fts_debug = 0; -/*@unchecked@*/ -extern int _ftp_debug; -/*@unchecked@*/ -extern int _rpmio_debug; #define FTPPATH "ftp://porkchop/mnt/redhat/beehive/comps/dist/7.2-rpm" #define DIRPATH "/mnt/redhat/beehive/comps/dist/7.2-rpm" diff --git a/rpmio/tglob.c b/rpmio/tglob.c index 2dabc1f5c..ba38eb4db 100644 --- a/rpmio/tglob.c +++ b/rpmio/tglob.c @@ -9,11 +9,6 @@ static int _debug = 0; -/*@unchecked@*/ -extern int _ftp_debug; -/*@unchecked@*/ -extern int _rpmio_debug; - #define FTPPATH "ftp://porkchop/mnt/redhat/beehive/comps/dist/[78]*/rpm*" #define DIRPATH "/mnt/redhat/beehive/comps/dist/[78]*/rpm*" static char * dirpath = DIRPATH; |