From 365ffe20a4f7a3bc3a25f313075f70233f854b6b Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Thu, 24 Apr 2008 15:08:09 +0300 Subject: [PATCH] Remove meaningless extern on function declarations in headers --- build/rpmbuild.h | 12 ++++++------ lib/rpmds.h | 6 +++--- lib/rpmfi.h | 18 +++++++++--------- lib/rpmps.h | 2 +- lib/rpmte.h | 22 +++++++++++----------- lib/rpmts.h | 4 ++-- rpmdb/rpmdb_internal.h | 2 +- rpmio/rpmio.h | 6 +++--- 8 files changed, 36 insertions(+), 36 deletions(-) diff --git a/build/rpmbuild.h b/build/rpmbuild.h index d582e3b..90e6ad2 100644 --- a/build/rpmbuild.h +++ b/build/rpmbuild.h @@ -91,7 +91,7 @@ void freeNames(void); * @param uid user id * @return cached user name */ -extern const char * getUname(uid_t uid); +const char * getUname(uid_t uid); /** \ingroup rpmbuild * Return cached user name. @@ -99,7 +99,7 @@ extern const char * getUname(uid_t uid); * @param uname user name * @return cached user name */ -extern const char * getUnameS(const char * uname); +const char * getUnameS(const char * uname); /** \ingroup rpmbuild * Return cached user id. @@ -115,7 +115,7 @@ uid_t getUidS(const char * uname); * @param gid group id * @return cached group name */ -extern const char * getGname(gid_t gid); +const char * getGname(gid_t gid); /** \ingroup rpmbuild * Return cached group name. @@ -123,7 +123,7 @@ extern const char * getGname(gid_t gid); * @param gname group name * @return cached group name */ -extern const char * getGnameS(const char * gname); +const char * getGnameS(const char * gname); /** \ingroup rpmbuild * Return cached group id. @@ -137,13 +137,13 @@ gid_t getGidS(const char * gname); * Return build hostname. * @return build hostname */ -extern const char * buildHost(void) ; +const char * buildHost(void) ; /** \ingroup rpmbuild * Return build time stamp. * @return build time stamp */ -extern rpm_time_t * getBuildTime(void) ; +rpm_time_t * getBuildTime(void) ; /** \ingroup rpmbuild * Read next line from spec file. diff --git a/lib/rpmds.h b/lib/rpmds.h index 64fda9a..22969e6 100644 --- a/lib/rpmds.h +++ b/lib/rpmds.h @@ -177,21 +177,21 @@ int rpmdsSetIx(rpmds ds, int ix); * @param ds dependency set * @return current dependency DNEVR, NULL on invalid */ -extern const char * rpmdsDNEVR(const rpmds ds); +const char * rpmdsDNEVR(const rpmds ds); /** \ingroup rpmds * Return current dependency name. * @param ds dependency set * @return current dependency name, NULL on invalid */ -extern const char * rpmdsN(const rpmds ds); +const char * rpmdsN(const rpmds ds); /** \ingroup rpmds * Return current dependency epoch-version-release. * @param ds dependency set * @return current dependency EVR, NULL on invalid */ -extern const char * rpmdsEVR(const rpmds ds); +const char * rpmdsEVR(const rpmds ds); /** \ingroup rpmds * Return current dependency flags. diff --git a/lib/rpmfi.h b/lib/rpmfi.h index 6c6abea..bc1eab8 100644 --- a/lib/rpmfi.h +++ b/lib/rpmfi.h @@ -161,21 +161,21 @@ int rpmfiSetDX(rpmfi fi, int dx); * @param fi file info set * @return current base name, NULL on invalid */ -extern const char * rpmfiBN(rpmfi fi); +const char * rpmfiBN(rpmfi fi); /** \ingroup rpmfi * Return current directory name from file info set. * @param fi file info set * @return current directory, NULL on invalid */ -extern const char * rpmfiDN(rpmfi fi); +const char * rpmfiDN(rpmfi fi); /** \ingroup rpmfi * Return current file name from file info set. * @param fi file info set * @return current file name */ -extern const char * rpmfiFN(rpmfi fi); +const char * rpmfiFN(rpmfi fi); /** \ingroup rpmfi * Return current file flags from file info set. @@ -210,14 +210,14 @@ rpmfileState rpmfiFState(rpmfi fi); * @param fi file info set * @return current file md5 digest, NULL on invalid */ -extern const unsigned char * rpmfiMD5(rpmfi fi); +const unsigned char * rpmfiMD5(rpmfi fi); /** \ingroup rpmfi * Return current file linkto (i.e. symlink(2) target) from file info set. * @param fi file info set * @return current file linkto, NULL on invalid */ -extern const char * rpmfiFLink(rpmfi fi); +const char * rpmfiFLink(rpmfi fi); /** \ingroup rpmfi * Return current file size from file info set. @@ -259,14 +259,14 @@ rpm_color_t rpmfiFColor(rpmfi fi); * @param fi file info set * @return current file class, 0 on invalid */ -extern const char * rpmfiFClass(rpmfi fi); +const char * rpmfiFClass(rpmfi fi); /** \ingroup rpmfi * Return current file security context from file info set. * @param fi file info set * @return current file context, 0 on invalid */ -extern const char * rpmfiFContext(rpmfi fi); +const char * rpmfiFContext(rpmfi fi); /** \ingroup rpmfi * Return current file depends dictionary from file info set. @@ -296,14 +296,14 @@ rpm_time_t rpmfiFMtime(rpmfi fi); * @param fi file info set * @return current file owner, NULL on invalid */ -extern const char * rpmfiFUser(rpmfi fi); +const char * rpmfiFUser(rpmfi fi); /** \ingroup rpmfi * Return current file group from file info set. * @param fi file info set * @return current file group, NULL on invalid */ -extern const char * rpmfiFGroup(rpmfi fi); +const char * rpmfiFGroup(rpmfi fi); /** \ingroup rpmfi * Return next file iterator index. diff --git a/lib/rpmps.h b/lib/rpmps.h index be1ce41..f0d5783 100644 --- a/lib/rpmps.h +++ b/lib/rpmps.h @@ -133,7 +133,7 @@ unsigned long rpmProblemGetLong(const rpmProblem prob); * @param prob rpm problem * @return formatted string (malloc'd) */ -extern char * rpmProblemString(const rpmProblem prob); +char * rpmProblemString(const rpmProblem prob); /** \ingroup rpmps * Unreference a problem set instance. diff --git a/lib/rpmte.h b/lib/rpmte.h index d735281..bd78828 100644 --- a/lib/rpmte.h +++ b/lib/rpmte.h @@ -63,7 +63,7 @@ rpmte rpmteNew(const rpmts ts, Header h, rpmElementType type, * @param te transaction element * @return header */ -extern Header rpmteHeader(rpmte te); +Header rpmteHeader(rpmte te); /** \ingroup rpmte * Save header into transaction element. @@ -71,7 +71,7 @@ extern Header rpmteHeader(rpmte te); * @param h header * @return NULL always */ -extern Header rpmteSetHeader(rpmte te, Header h); +Header rpmteSetHeader(rpmte te, Header h); /** \ingroup rpmte * Retrieve type of transaction element. @@ -85,49 +85,49 @@ rpmElementType rpmteType(rpmte te); * @param te transaction element * @return name string */ -extern const char * rpmteN(rpmte te); +const char * rpmteN(rpmte te); /** \ingroup rpmte * Retrieve epoch string of transaction element. * @param te transaction element * @return epoch string */ -extern const char * rpmteE(rpmte te); +const char * rpmteE(rpmte te); /** \ingroup rpmte * Retrieve version string of transaction element. * @param te transaction element * @return version string */ -extern const char * rpmteV(rpmte te); +const char * rpmteV(rpmte te); /** \ingroup rpmte * Retrieve release string of transaction element. * @param te transaction element * @return release string */ -extern const char * rpmteR(rpmte te); +const char * rpmteR(rpmte te); /** \ingroup rpmte * Retrieve arch string of transaction element. * @param te transaction element * @return arch string */ -extern const char * rpmteA(rpmte te); +const char * rpmteA(rpmte te); /** \ingroup rpmte * Retrieve os string of transaction element. * @param te transaction element * @return os string */ -extern const char * rpmteO(rpmte te); +const char * rpmteO(rpmte te); /** \ingroup rpmte * Retrieve isSource attribute of transaction element. * @param te transaction element * @return isSource attribute */ -extern int rpmteIsSource(rpmte te); +int rpmteIsSource(rpmte te); /** \ingroup rpmte * Retrieve color bits of transaction element. @@ -324,14 +324,14 @@ const char * rpmteEVR(rpmte te); * @param te transaction element * @return name-version-release string */ -extern const char * rpmteNEVR(rpmte te); +const char * rpmteNEVR(rpmte te); /** \ingroup rpmte * Retrieve name-version-release.arch string from transaction element. * @param te transaction element * @return name-version-release.arch string */ -extern const char * rpmteNEVRA(rpmte te); +const char * rpmteNEVRA(rpmte te); /** \ingroup rpmte * Retrieve file handle from transaction element. diff --git a/lib/rpmts.h b/lib/rpmts.h index 1a51562..5d8928a 100644 --- a/lib/rpmts.h +++ b/lib/rpmts.h @@ -412,7 +412,7 @@ int rpmtsUnorderedSuccessors(rpmts ts, int first); * @param ts transaction set * @return transaction rootDir */ -extern const char * rpmtsRootDir(rpmts ts); +const char * rpmtsRootDir(rpmts ts); /** \ingroup rpmts * Set transaction rootDir, i.e. path to chroot(2). @@ -427,7 +427,7 @@ void rpmtsSetRootDir(rpmts ts, const char * rootDir); * @param ts transaction set * @return transaction currDir */ -extern const char * rpmtsCurrDir(rpmts ts); +const char * rpmtsCurrDir(rpmts ts); /** \ingroup rpmts * Set transaction currDir, i.e. current directory before chroot(2). diff --git a/rpmdb/rpmdb_internal.h b/rpmdb/rpmdb_internal.h index bbec856..89bd4ee 100644 --- a/rpmdb/rpmdb_internal.h +++ b/rpmdb/rpmdb_internal.h @@ -373,7 +373,7 @@ dbiIndex db3Free( dbiIndex dbi); * @param print_dbenv_flags format db env flags instead? * @return formatted flags (static buffer) */ -extern const char * prDbiOpenFlags(int dbflags, int print_dbenv_flags); +const char * prDbiOpenFlags(int dbflags, int print_dbenv_flags); /** \ingroup dbi * Return handle for an index database. diff --git a/rpmio/rpmio.h b/rpmio/rpmio.h index d08c1c1..5c124c6 100644 --- a/rpmio/rpmio.h +++ b/rpmio/rpmio.h @@ -119,15 +119,15 @@ FILE * fdGetFILE(FD_t fd); /** \ingroup rpmio */ -extern FD_t fdLink (void * cookie, const char * msg); +FD_t fdLink (void * cookie, const char * msg); /** \ingroup rpmio */ -extern FD_t fdFree(FD_t fd, const char * msg); +FD_t fdFree(FD_t fd, const char * msg); /** \ingroup rpmio */ -extern FD_t fdNew (const char * msg); +FD_t fdNew (const char * msg); /** \ingroup rpmio */ -- 2.7.4