summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--build/names.c4
-rw-r--r--build/rpmbuild.h4
-rw-r--r--lib/cpio.c2
-rw-r--r--lib/cpio.h2
-rw-r--r--lib/depends.c2
-rw-r--r--lib/fsm.c4
-rw-r--r--lib/fsm.h4
-rw-r--r--lib/psm.c4
-rw-r--r--lib/rpmfi.c4
-rw-r--r--lib/rpmfi.h2
-rw-r--r--lib/rpmlib.h2
-rw-r--r--rpmdb/dbconfig.c2
-rw-r--r--rpmdb/rpmdb.h2
-rw-r--r--rpmdb/tagname.c2
-rw-r--r--rpmio/argv.c4
-rw-r--r--rpmio/argv.h4
-rw-r--r--rpmio/rpmio.c2
-rw-r--r--rpmio/rpmio.h2
-rw-r--r--tools/rpmgraph.c2
19 files changed, 27 insertions, 27 deletions
diff --git a/build/names.c b/build/names.c
index d37591ac2..5ddcad97f 100644
--- a/build/names.c
+++ b/build/names.c
@@ -205,7 +205,7 @@ gid_t getGidS(const char *gname)
}
/*@=boundswrite@*/
-int_32 *const getBuildTime(void)
+int_32 * getBuildTime(void)
{
static int_32 buildTime[1];
@@ -217,7 +217,7 @@ int_32 *const getBuildTime(void)
}
/*@-boundswrite@*/
-const char *const buildHost(void)
+const char * buildHost(void)
{
static char hostname[1024];
static int oneshot = 0;
diff --git a/build/rpmbuild.h b/build/rpmbuild.h
index 5652ded2b..a33d44265 100644
--- a/build/rpmbuild.h
+++ b/build/rpmbuild.h
@@ -154,13 +154,13 @@ gid_t getGidS(const char * gname)
* Return build hostname.
* @return build hostname
*/
-extern /*@observer@*/ const char * const buildHost(void) /*@*/;
+extern /*@observer@*/ const char * buildHost(void) /*@*/;
/** \ingroup rpmbuild
* Return build time stamp.
* @return build time stamp
*/
-extern /*@observer@*/ int_32 * const getBuildTime(void) /*@*/;
+extern /*@observer@*/ int_32 * getBuildTime(void) /*@*/;
/** \ingroup rpmbuild
* Read next line from spec file.
diff --git a/lib/cpio.c b/lib/cpio.c
index cbd76d986..4c7a74a6e 100644
--- a/lib/cpio.c
+++ b/lib/cpio.c
@@ -193,7 +193,7 @@ int cpioHeaderRead(FSM_t fsm, struct stat * st)
return 0;
}
-const char *const cpioStrerror(int rc)
+const char * cpioStrerror(int rc)
{
static char msg[256];
char *s;
diff --git a/lib/cpio.h b/lib/cpio.h
index 46c6fdd62..0a683ced6 100644
--- a/lib/cpio.h
+++ b/lib/cpio.h
@@ -132,7 +132,7 @@ int cpioHeaderRead(FSM_t fsm, struct stat * st)
* @param rc error code
* @return formatted error string
*/
-/*@observer@*/ const char *const cpioStrerror(int rc)
+/*@observer@*/ const char * cpioStrerror(int rc)
/*@*/;
#ifdef __cplusplus
diff --git a/lib/depends.c b/lib/depends.c
index 13150daba..6ce2c3843 100644
--- a/lib/depends.c
+++ b/lib/depends.c
@@ -949,7 +949,7 @@ static void markLoop(/*@special@*/ tsortInfo tsi, rpmte q)
/*@=branchstate@*/
}
-static inline /*@observer@*/ const char * const identifyDepend(int_32 f)
+static inline /*@observer@*/ const char * identifyDepend(int_32 f)
/*@*/
{
if (isLegacyPreReq(f))
diff --git a/lib/fsm.c b/lib/fsm.c
index f52e40051..db227bbe2 100644
--- a/lib/fsm.c
+++ b/lib/fsm.c
@@ -2448,7 +2448,7 @@ if (!(fsm->mapFlags & CPIO_ALL_HARDLINKS)) break;
/*@=compmempass@*/
/*@=boundsread@*/
-/*@obserever@*/ const char *const fileActionString(fileAction a)
+/*@obserever@*/ const char * fileActionString(fileAction a)
{
switch (a) {
case FA_UNKNOWN: return "unknown";
@@ -2468,7 +2468,7 @@ if (!(fsm->mapFlags & CPIO_ALL_HARDLINKS)) break;
/*@notreached@*/
}
-/*@observer@*/ const char *const fileStageString(fileStage a) {
+/*@observer@*/ const char * fileStageString(fileStage a) {
switch(a) {
case FSM_UNKNOWN: return "unknown";
diff --git a/lib/fsm.h b/lib/fsm.h
index c37c8d11c..3c079a117 100644
--- a/lib/fsm.h
+++ b/lib/fsm.h
@@ -211,14 +211,14 @@ extern "C" {
* @param a file stage
* @return formatted string
*/
-/*@observer@*/ const char *const fileStageString(fileStage a) /*@*/;
+/*@observer@*/ const char * fileStageString(fileStage a) /*@*/;
/**
* Return formatted string representation of file disposition.
* @param a file dispostion
* @return formatted string
*/
-/*@observer@*/ const char *const fileActionString(fileAction a) /*@*/;
+/*@observer@*/ const char * fileActionString(fileAction a) /*@*/;
/*@=exportlocal@*/
/**
diff --git a/lib/psm.c b/lib/psm.c
index 6911ceab6..d606a1274 100644
--- a/lib/psm.c
+++ b/lib/psm.c
@@ -450,7 +450,7 @@ static char * SCRIPT_PATH = "PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin";
* @param tag scriptlet tag
* @return name of scriptlet
*/
-static /*@observer@*/ const char * const tag2sln(int tag)
+static /*@observer@*/ const char * tag2sln(int tag)
/*@*/
{
switch (tag) {
@@ -1207,7 +1207,7 @@ static rpmRC runImmedTriggers(rpmpsm psm)
return rc;
}
-/*@observer@*/ static const char *const pkgStageString(pkgStage a)
+/*@observer@*/ static const char * pkgStageString(pkgStage a)
/*@*/
{
switch(a) {
diff --git a/lib/rpmfi.c b/lib/rpmfi.c
index 3825f90d2..ef1860460 100644
--- a/lib/rpmfi.c
+++ b/lib/rpmfi.c
@@ -484,7 +484,7 @@ rpmfi rpmfiInitD(rpmfi fi, int dx)
* @return string to identify a file type
*/
static /*@observer@*/
-const char *const ftstring (fileTypes ft)
+const char * ftstring (fileTypes ft)
/*@*/
{
switch (ft) {
@@ -628,7 +628,7 @@ fileAction rpmfiDecideFate(const rpmfi ofi, rpmfi nfi, int skipMissing)
/*@=boundsread@*/
/*@observer@*/
-const char *const rpmfiTypeString(rpmfi fi)
+const char * rpmfiTypeString(rpmfi fi)
{
switch(rpmteType(fi->te)) {
case TR_ADDED: return " install";
diff --git a/lib/rpmfi.h b/lib/rpmfi.h
index 1c9bdfa3b..8a943d065 100644
--- a/lib/rpmfi.h
+++ b/lib/rpmfi.h
@@ -626,7 +626,7 @@ fileAction rpmfiDecideFate(const rpmfi ofi, rpmfi nfi, int skipMissing)
*/
/*@-redef@*/
/*@observer@*/
-const char *const rpmfiTypeString(rpmfi fi)
+const char * rpmfiTypeString(rpmfi fi)
/*@*/;
/*@=redef@*/
diff --git a/lib/rpmlib.h b/lib/rpmlib.h
index ade8120a0..6a4bfe86b 100644
--- a/lib/rpmlib.h
+++ b/lib/rpmlib.h
@@ -1081,7 +1081,7 @@ int tagType(int tag)
* @return tag name, "(unknown)" on not found
*/
/*@-redecl@*/
-/*@observer@*/ extern const char *const tagName(int tag)
+/*@observer@*/ extern const char * tagName(int tag)
/*@*/;
/*@=redecl@*/
diff --git a/rpmdb/dbconfig.c b/rpmdb/dbconfig.c
index 0f2229cc8..3d525ffb5 100644
--- a/rpmdb/dbconfig.c
+++ b/rpmdb/dbconfig.c
@@ -458,7 +458,7 @@ dbiIndex db3New(rpmdb rpmdb, rpmTag rpmtag)
/*@=bounds@*/
/*@-boundswrite@*/
-const char *const prDbiOpenFlags(int dbflags, int print_dbenv_flags)
+const char * prDbiOpenFlags(int dbflags, int print_dbenv_flags)
{
static char buf[256];
struct poptOption *opt;
diff --git a/rpmdb/rpmdb.h b/rpmdb/rpmdb.h
index d62b63770..2890c0364 100644
--- a/rpmdb/rpmdb.h
+++ b/rpmdb/rpmdb.h
@@ -482,7 +482,7 @@ dbiIndex db3Free( /*@only@*/ /*@null@*/ dbiIndex dbi)
*/
/*@-redecl@*/
/*@exposed@*/
-extern const char *const prDbiOpenFlags(int dbflags, int print_dbenv_flags)
+extern const char * prDbiOpenFlags(int dbflags, int print_dbenv_flags)
/*@*/;
/*@=redecl@*/
diff --git a/rpmdb/tagname.c b/rpmdb/tagname.c
index 042b89055..2b6fbe6b5 100644
--- a/rpmdb/tagname.c
+++ b/rpmdb/tagname.c
@@ -32,7 +32,7 @@ int tagType(int tag)
return tagtype;
}
-const char *const tagName(int tag)
+const char * tagName(int tag)
{
static char nameBuf[128]; /* XXX yuk */
char *s;
diff --git a/rpmio/argv.c b/rpmio/argv.c
index b29468fb0..cc1ec3f67 100644
--- a/rpmio/argv.c
+++ b/rpmio/argv.c
@@ -68,7 +68,7 @@ int argiCount(ARGI_t argi)
return nvals;
}
-const ARGint_t argiData(const ARGI_t argi)
+ARGint_t argiData(const ARGI_t argi)
{
ARGint_t vals = NULL;
if (argi && argi->nvals > 0)
@@ -85,7 +85,7 @@ int argvCount(const ARGV_t argv)
return argc;
}
-const ARGV_t argvData(const ARGV_t argv)
+ARGV_t argvData(const ARGV_t argv)
{
/*@-retalias -temptrans @*/
return argv;
diff --git a/rpmio/argv.h b/rpmio/argv.h
index 202aa4645..7cab8f23d 100644
--- a/rpmio/argv.h
+++ b/rpmio/argv.h
@@ -61,7 +61,7 @@ int argiCount(/*@null@*/ const ARGI_t argi)
* @return argi array data address
*/
/*@null@*/
-const ARGint_t argiData(/*@null@*/ const ARGI_t argi)
+ARGint_t argiData(/*@null@*/ const ARGI_t argi)
/*@*/;
/**
@@ -78,7 +78,7 @@ int argvCount(/*@null@*/ const ARGV_t argv)
* @return argv array data address
*/
/*@null@*/
-const ARGV_t argvData(/*@null@*/ const ARGV_t argv)
+ARGV_t argvData(/*@null@*/ const ARGV_t argv)
/*@*/;
/**
diff --git a/rpmio/rpmio.c b/rpmio/rpmio.c
index c6d3a9029..31ca058a1 100644
--- a/rpmio/rpmio.c
+++ b/rpmio/rpmio.c
@@ -687,7 +687,7 @@ fprintf(stderr, "*** read: fd %p rc %d EOF errno %d %s \"%s\"\n", fd, rc, errno,
/* =============================================================== */
/* Support for FTP/HTTP I/O.
*/
-const char *const ftpStrerror(int errorNumber)
+const char * ftpStrerror(int errorNumber)
{
switch (errorNumber) {
case 0:
diff --git a/rpmio/rpmio.h b/rpmio/rpmio.h
index 2d6a53135..9ae9aaf22 100644
--- a/rpmio/rpmio.h
+++ b/rpmio/rpmio.h
@@ -599,7 +599,7 @@ typedef enum ftperrCode_e {
/**
*/
/*@-redecl@*/
-/*@observer@*/ const char *const ftpStrerror(int errorNumber)
+/*@observer@*/ const char * ftpStrerror(int errorNumber)
/*@*/;
/*@=redecl@*/
diff --git a/tools/rpmgraph.c b/tools/rpmgraph.c
index 3b10335ed..b00c06956 100644
--- a/tools/rpmgraph.c
+++ b/tools/rpmgraph.c
@@ -19,7 +19,7 @@ static int noDeps = 1;
static rpmVSFlags vsflags = 0;
-static inline /*@observer@*/ const char * const identifyDepend(int_32 f)
+static inline /*@observer@*/ const char * identifyDepend(int_32 f)
/*@*/
{
if (isLegacyPreReq(f))
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-30 14:56:56 +0000