sinjuginas/rpm-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed "type qualifiers ignored on function return type" issue.

Browse Source
This commit is contained in:
Дмитрий Левин 2006-05-15 02:48:59 +04:00
parent f431605c03
commit 8787ee5d55
17 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/names.c
View File

@ -176,7 +176,7 @@ int_32 *const getBuildTime(void)
return buildTime;
}
const char *const buildHost(void)
const char * buildHost(void)
{
static char hostname[1024];
static int gotit = 0;

2
build/rpmbuild.h
View File

@ -140,7 +140,7 @@ 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.

2
lib/cpio.c
View File

@ -177,7 +177,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;

2
lib/cpio.h
View File

@ -131,7 +131,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
}

2
lib/depends.c
View File

@ -1668,7 +1668,7 @@ static void markLoop(/*@special@*/ tsortInfo tsi,
}
}
static inline /*@observer@*/ const char * const identifyDepend(int_32 f)
static inline /*@observer@*/ const char * identifyDepend(int_32 f)
{
if (isLegacyPreReq(f))
return "PreReq:";

4
lib/fsm.c
View File

@ -2128,7 +2128,7 @@ if (!(fsm->mapFlags & CPIO_ALL_HARDLINKS)) break;
}
/*@=compmempass@*/
/*@obserever@*/ const char *const fileActionString(fileAction a)
/*@obserever@*/ const char * fileActionString(fileAction a)
{
switch (a) {
case FA_UNKNOWN: return "unknown";
@ -2148,7 +2148,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";

4
lib/fsm.h
View File

@ -178,14 +178,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@*/
/**

6
lib/psm.c
View File

@ -281,7 +281,7 @@ void freeFi(TFI_t fi)
/*@=nullstate@*/
}
/*@observer@*/ const char *const fiTypeString(TFI_t fi)
/*@observer@*/ const char * fiTypeString(TFI_t fi)
{
switch(fi->type) {
case TR_ADDED: return " install";
@ -840,7 +840,7 @@ static char * SCRIPT_PATH =
* @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) {
@ -1362,7 +1362,7 @@ static int runImmedTriggers(PSM_t psm)
return rc;
}
/*@observer@*/ static const char *const pkgStageString(pkgStage a)
/*@observer@*/ static const char * pkgStageString(pkgStage a)
/*@*/
{
switch(a) {

2
lib/psm.h
View File

@ -217,7 +217,7 @@ void freeFi(TFI_t fi)
* @param fi transaction element file info
* @return formatted string
*/
/*@observer@*/ const char *const fiTypeString(/*@partial@*/TFI_t fi)
/*@observer@*/ const char * fiTypeString(/*@partial@*/TFI_t fi)
/*@*/;
/**

2
lib/rpmlib.h
View File

@ -1597,7 +1597,7 @@ int rpmRunTransactions(rpmTransactionSet ts,
* @return name of tag
*/
/*@-redecl@*/
/*@observer@*/ extern const char *const tagName(int tag)
/*@observer@*/ extern const char * tagName(int tag)
/*@*/;
/*@=redecl@*/

2
lib/transaction.c
View File

@ -270,7 +270,7 @@ void rpmProblemSetFree(rpmProblemSet probs)
free(probs);
}
static /*@observer@*/ const char *const ftstring (fileTypes ft)
static /*@observer@*/ const char * ftstring (fileTypes ft)
/*@*/
{
switch (ft) {

2
rpmdb/dbconfig.c
View File

@ -539,7 +539,7 @@ dbiIndex db3New(rpmdb rpmdb, int rpmtag)
/*@=globstate@*/
}
const char *const prDbiOpenFlags(int dbflags, int print_dbenv_flags)
const char * prDbiOpenFlags(int dbflags, int print_dbenv_flags)
{
static char buf[256];
struct dbOption *opt;

2
rpmdb/header.c
View File

@ -23,7 +23,7 @@
#include "debug.h"
/*@-redecl@*/ /* FIX: avoid rpmlib.h, need for debugging. */
/*@observer@*/ const char *const tagName(int tag) /*@*/;
/*@observer@*/ const char * tagName(int tag) /*@*/;
/*@=redecl@*/
/*@access entryInfo @*/

2
rpmdb/rpmdb.h
View File

@ -372,7 +372,7 @@ extern "C" {
* @return formatted flags (static buffer)
*/
/*@-redecl@*/
/*@exposed@*/ extern const char *const prDbiOpenFlags(int dbflags,
/*@exposed@*/ extern const char * prDbiOpenFlags(int dbflags,
int print_dbenv_flags)
/*@*/;
/*@=redecl@*/

2
rpmdb/tagname.c
View File

@ -7,7 +7,7 @@
#include "rpmlib.h"
#include "debug.h"
const char *const tagName(int tag)
const char * tagName(int tag)
{
int i;
static char nameBuf[128]; /* XXX yuk */

2
rpmio/rpmio.c
View File

@ -648,7 +648,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:
return _("Success");

2
rpmio/rpmio.h
View File

@ -560,7 +560,7 @@ typedef enum ftperrCode_e {
/**
*/
/*@-redecl@*/
/*@observer@*/ const char *const ftpStrerror(int errorNumber) /*@*/;
/*@observer@*/ const char * ftpStrerror(int errorNumber) /*@*/;
/*@=redecl@*/
/**