[CVS] RPM: rpm-5_4: rpm/rpmio/ rpmlog.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 01-May-2017 21:54:43
Branch: rpm-5_4 Handle: 2017050119544300
Modified files: (Branch: rpm-5_4)
rpm/rpmio rpmlog.c
Log:
- splint: RIP.
Summary:
RevisionChanges Path
2.46.4.9+6 -49 rpm/rpmio/rpmlog.c
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmlog.c
$ cvs diff -u -r2.46.4.8 -r2.46.4.9 rpmlog.c
--- rpm/rpmio/rpmlog.c19 Apr 2016 13:04:23 - 2.46.4.8
+++ rpm/rpmio/rpmlog.c1 May 2017 19:54:43 - 2.46.4.9
@@ -9,16 +9,12 @@
#include
#include "debug.h"
-/*@access rpmlogRec @*/
-
#ifdef __cplusplus
GENfree(rpmlogRec)
#endif /* __cplusplus */
-/*@unchecked@*/
static int nrecs = 0;
-/*@unchecked@*/
-static /*@only@*/ /*@null@*/ rpmlogRec recs = NULL;
+static rpmlogRec recs = NULL;
int rpmlogGetNrecs(void)
{
@@ -49,7 +45,6 @@
return (rec ? rec->pri : RPMLOG_DEBUG);
}
-/*@-modfilesys@*/
void rpmlogPrint(FILE *f)
{
int i;
@@ -64,11 +59,8 @@
fprintf(f, "%s", rec->message);
}
}
-/*@=modfilesys@*/
void rpmlogClose (void)
- /*@globals recs, nrecs @*/
- /*@modifies recs, nrecs @*/
{
int i;
@@ -81,23 +73,17 @@
nrecs = 0;
}
-void rpmlogOpen (/*@unused@*/ const char *ident,
- /*@unused@*/ int option,
- /*@unused@*/ int facility)
+void rpmlogOpen (const char *ident, int option, int facility)
{
}
-/*@unchecked@*/
static unsigned rpmlogMask = RPMLOG_UPTO( RPMLOG_NOTICE );
#if 0
-/*@unchecked@*/
-static /*@unused@*/ unsigned rpmlogFacility = RPMLOG_USER;
+static unsigned rpmlogFacility = RPMLOG_USER;
#endif
int rpmlogSetMask (int mask)
- /*@globals rpmlogMask @*/
- /*@modifies rpmlogMask @*/
{
int omask = rpmlogMask;
if (mask)
@@ -105,15 +91,11 @@
return omask;
}
-/*@unchecked@*/ /*@null@*/
static rpmlogCallback _rpmlogCallback;
-/*@unchecked@*/ /*@null@*/
static rpmlogCallbackData _rpmlogCallbackData;
rpmlogCallback rpmlogSetCallback(rpmlogCallback cb, rpmlogCallbackData data)
- /*@globals _rpmlogCallback, _rpmlogCallbackData @*/
- /*@modifies _rpmlogCallback, _rpmlogCallbackData @*/
{
rpmlogCallback ocb = _rpmlogCallback;
_rpmlogCallback = cb;
@@ -122,18 +104,14 @@
}
int rpmlogGetCallback(rpmlogCallback *cb, rpmlogCallbackData *data)
- /*@globals _rpmlogCallback, _rpmlogCallbackData @*/
{
*cb = _rpmlogCallback;
*data = _rpmlogCallbackData;
return 0;
}
-/*@unchecked@*/ /*@null@*/
static FILE * _stdlog = NULL;
-/*@-readonlytrans@*/ /* FIX: double indirection. */
-/*@observer@*/ /*@unchecked@*/
static const char *rpmlogMsgPrefix[] = {
N_("fatal error: "),/*!< RPMLOG_EMERG */
N_("fatal error: "),/*!< RPMLOG_ALERT */
@@ -176,7 +154,6 @@
"", /*!< RPMLOG_INFO */
ANSI_BRIGHT_BLUE,/*!< RPMLOG_DEBUG */
};
-/*@=readonlytrans@*/
const char * rpmlogLevelPrefix(rpmlogLvl pri)
{
@@ -189,8 +166,6 @@
}
static int rpmlogDefault(rpmlogRec rec)
- /*@globals fileSystem @*/
- /*@modifies fileSystem @*/
{
FILE *msgout = (_stdlog ? _stdlog : stderr);
const char * colorOn = isatty(fileno(msgout))
@@ -261,8 +236,6 @@
}
FILE * rpmlogSetFile(FILE * fp)
- /*@globals _stdlog @*/
- /*@modifies _stdlog @*/
{
FILE * ofp = _stdlog;
_stdlog = fp;
@@ -270,24 +243,18 @@
}
#if !defined(HAVE_VSNPRINTF)
-static inline int vsnprintf(char * buf, /*@unused@*/ int nb,
- const char * fmt, va_list ap)
+static inline int vsnprintf(char * buf, int nb, const char * fmt, va_list ap)
{
return vsprintf(buf, fmt, ap);
}
#endif
-/*@-modfilesys@*/
-/*@-compmempass@*/ /* FIX: rpmlogMsgPrefix[] dependent, not unqualified */
-/*@-nullstate@*/ /* FIX: rpmlogMsgPrefix[] may be NULL */
void vrpmlog (unsigned code, const char *fmt, va_list ap)
- /*@globals nrecs, recs, internalState @*/
- /*@modifies nrecs, recs, internalState @*/
{
unsigned pri = RPMLOG_PRI(code);
unsigned mask = RPMLOG_MASK(pri);
#if 0
-/*@unused@*/ unsigned fac = RPMLOG_FAC(code);
+unsigned fac = RPMLOG_FAC(code);
#endif
char *msgbuf, *msg;
size_t msgnb = BUFSIZ;
@@
[CVS] RPM: rpm-5_4: rpm/rpmio/ rpmlog.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 19-Apr-2016 15:04:23
Branch: rpm-5_4 Handle: 2016041913042300
Modified files: (Branch: rpm-5_4)
rpm/rpmio rpmlog.c
Log:
- add ANSI_COLOR_BOLD for warnings/errors.
Summary:
RevisionChanges Path
2.46.4.8+5 -3 rpm/rpmio/rpmlog.c
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmlog.c
$ cvs diff -u -r2.46.4.7 -r2.46.4.8 rpmlog.c
--- rpm/rpmio/rpmlog.c11 Apr 2016 18:44:18 - 2.46.4.7
+++ rpm/rpmio/rpmlog.c19 Apr 2016 13:04:23 - 2.46.4.8
@@ -163,7 +163,8 @@
#define ANSI_BRIGHT_CYAN "\x1b[36;1m"
#define ANSI_BRIGHT_WHITE"\x1b[37;1m"
-#define ANSI_COLOR_RESET "\x1b[0m"
+#define ANSI_COLOR_BOLD "\x1b[1m"
+#define ANSI_COLOR_RESET "\x1b[0m"
static const char *rpmlogMsgPrefixColor[] = {
ANSI_BRIGHT_RED, /*!< RPMLOG_EMERG */
@@ -225,8 +226,10 @@
case RPMLOG_CRIT:
case RPMLOG_ERR:
case RPMLOG_WARNING:
- if (colorOn && *colorOn)
+ if (colorOn && *colorOn) {
(void) fputs(ANSI_COLOR_RESET, msgout);
+ (void) fputs(ANSI_COLOR_BOLD, msgout);
+ }
case RPMLOG_DEBUG:
default:
break;
@@ -244,7 +247,6 @@
case RPMLOG_CRIT:
case RPMLOG_ERR:
case RPMLOG_WARNING:
- break;
case RPMLOG_DEBUG:
if (colorOn && *colorOn)
(void) fputs(ANSI_COLOR_RESET, msgout);
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/rpmio/ rpmlog.c rpmlog.h
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 14-Jul-2013 00:53:02
Branch: rpm-5_4 Handle: 2013071322530100
Modified files: (Branch: rpm-5_4)
rpm/rpmio rpmlog.c rpmlog.h
Log:
- fix: remove assert on NULL argument.
Summary:
RevisionChanges Path
2.46.4.4+2 -4 rpm/rpmio/rpmlog.c
2.24.4.1+3 -3 rpm/rpmio/rpmlog.h
patch -p0 '@@ .'
Index: rpm/rpmio/rpmlog.c
$ cvs diff -u -r2.46.4.3 -r2.46.4.4 rpmlog.c
--- rpm/rpmio/rpmlog.c4 Jun 2012 15:10:21 - 2.46.4.3
+++ rpm/rpmio/rpmlog.c13 Jul 2013 22:53:01 - 2.46.4.4
@@ -41,14 +41,12 @@
const char * rpmlogRecMessage(rpmlogRec rec)
{
-assert(rec != NULL);
-return (rec-message);
+return (rec ? rec-message : NULL);
}
rpmlogLvl rpmlogRecPriority(rpmlogRec rec)
{
-assert(rec != NULL);
-return (rec-pri);
+return (rec ? rec-pri : RPMLOG_DEBUG);
}
/*@-modfilesys@*/
@@ .
patch -p0 '@@ .'
Index: rpm/rpmio/rpmlog.h
$ cvs diff -u -r2.24 -r2.24.4.1 rpmlog.h
--- rpm/rpmio/rpmlog.h4 Mar 2010 20:58:10 - 2.24
+++ rpm/rpmio/rpmlog.h13 Jul 2013 22:53:01 - 2.24.4.1
@@ -230,8 +230,8 @@
* @param recrpmlog record
* @return log message
*/
-/*@observer@*/ /*@retexpose@*/
-const char * rpmlogRecMessage(rpmlogRec rec)
+/*@observer@*/ /*@retexpose@*/ /*@null@*/
+const char * rpmlogRecMessage(/*@null@*/ rpmlogRec rec)
/*@*/;
/**
@@ -239,7 +239,7 @@
* @param recrpmlog record
* @return log priority
*/
-rpmlogLvl rpmlogRecPriority(rpmlogRec rec)
+rpmlogLvl rpmlogRecPriority(/*@null@*/ rpmlogRec rec)
/*@*/;
/**
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
