RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 13-Jan-2008 12:51:32
Branch: HEAD Handle: 2008011311513100
Modified files:
rpm/rpmio macro.c rpmlog.h rpmlua.c rpmlua.h rpmmacro.h
rpmpgp.c stringbuf.c stringbuf.h
Log:
- splint fiddles.
Summary:
Revision Changes Path
2.174 +10 -6 rpm/rpmio/macro.c
2.21 +2 -1 rpm/rpmio/rpmlog.h
2.42 +16 -14 rpm/rpmio/rpmlua.c
2.10 +4 -2 rpm/rpmio/rpmlua.h
2.47 +1 -1 rpm/rpmio/rpmmacro.h
2.87 +1 -1 rpm/rpmio/rpmpgp.c
2.3 +11 -31 rpm/rpmio/stringbuf.c
2.3 +1 -1 rpm/rpmio/stringbuf.h
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/rpmio/macro.c
============================================================================
$ cvs diff -u -r2.173 -r2.174 macro.c
--- rpm/rpmio/macro.c 12 Jan 2008 18:56:18 -0000 2.173
+++ rpm/rpmio/macro.c 13 Jan 2008 11:51:31 -0000 2.174
@@ -1201,7 +1201,7 @@
size_t l;
if ((cp = realpath(buf, rp)) != NULL) {
l = strlen(cp);
- if (l+1 <= bufn) {
+ if ((size_t)(l+1) <= bufn) {
memcpy(buf, cp, l+1);
b = buf;
}
@@ -1298,15 +1298,19 @@
}
static int expandFIFO(MacroBuf mb, MacroEntry me, const char *g, size_t gn)
- /[EMAIL PROTECTED]/
+ /[EMAIL PROTECTED] rpmGlobalMacroContext, fileSystem, internalState @*/
+ /[EMAIL PROTECTED] mb, rpmGlobalMacroContext, fileSystem, internalState
@*/
{
int rc = 0;
- if (me && me->prev) {
- rc = expandFIFO(mb, me->prev, g, gn);
- rc = expandT(mb, g, gn);
+ if (me) {
+ if (me->prev) {
+ rc = expandFIFO(mb, me->prev, g, gn);
+ rc = expandT(mb, g, gn);
+ }
+ rc = expandT(mb, me->body, strlen(me->body));
}
- return expandT(mb, me->body, strlen(me->body));
+ return rc;
}
/**
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmlog.h
============================================================================
$ cvs diff -u -r2.20 -r2.21 rpmlog.h
--- rpm/rpmio/rpmlog.h 1 Jan 2008 20:27:52 -0000 2.20
+++ rpm/rpmio/rpmlog.h 13 Jan 2008 11:51:31 -0000 2.21
@@ -214,7 +214,8 @@
* @return none
*/
void rpmlogGetCallback(rpmlogCallback *cb, rpmlogCallbackData *data)
- /[EMAIL PROTECTED]/;
+ /[EMAIL PROTECTED] internalState @*/
+ /[EMAIL PROTECTED] *cb, *data, internalState @*/;
/**
* Return number of messages.
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmlua.c
============================================================================
$ cvs diff -u -r2.41 -r2.42 rpmlua.c
--- rpm/rpmio/rpmlua.c 12 Jan 2008 22:38:01 -0000 2.41
+++ rpm/rpmio/rpmlua.c 13 Jan 2008 11:51:31 -0000 2.42
@@ -45,7 +45,7 @@
/[EMAIL PROTECTED]@*/ \
)
-/[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/
+/[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/
static rpmlua globalLuaState = NULL;
static int luaopen_rpm(lua_State *L)
@@ -56,7 +56,9 @@
rpmlua rpmluaGetGlobalState(void)
{
+/[EMAIL PROTECTED]@*/
return globalLuaState;
+/[EMAIL PROTECTED]@*/
}
/[EMAIL PROTECTED]@*/ /* XXX hide rpmGlobalMacroContext mods for now.
*/
@@ -706,7 +708,7 @@
}
static int rpm_undefine(lua_State *L)
- /[EMAIL PROTECTED] rpmGlobalMacroContext, h_errno, internalState @*/
+ /[EMAIL PROTECTED] rpmGlobalMacroContext, internalState @*/
/[EMAIL PROTECTED] L, rpmGlobalMacroContext, internalState @*/
{
const char *str = luaL_checkstring(L, 1);
@@ -917,8 +919,8 @@
}
static int rpm_source(lua_State *L)
- /[EMAIL PROTECTED] internalState @*/
- /[EMAIL PROTECTED] L, internalState @*/
+ /[EMAIL PROTECTED] fileSystem, internalState @*/
+ /[EMAIL PROTECTED] L, fileSystem, internalState @*/
{
if (!lua_isstring(L, 1)) {
(void)luaL_argerror(L, 1, "filename expected");
@@ -931,8 +933,8 @@
}
static int rpm_load(lua_State *L)
- /[EMAIL PROTECTED] internalState @*/
- /[EMAIL PROTECTED] L, internalState @*/
+ /[EMAIL PROTECTED] rpmGlobalMacroContext, fileSystem, internalState @*/
+ /[EMAIL PROTECTED] L, rpmGlobalMacroContext, fileSystem, internalState
@*/
{
if (!lua_isstring(L, 1)) {
(void)luaL_argerror(L, 1, "filename expected");
@@ -952,8 +954,8 @@
}
static int rpm_slurp(lua_State *L)
- /[EMAIL PROTECTED] internalState @*/
- /[EMAIL PROTECTED] L, internalState @*/
+ /[EMAIL PROTECTED] fileSystem, internalState @*/
+ /[EMAIL PROTECTED] L, fileSystem, internalState @*/
{
uint8_t *b;
ssize_t blen;
@@ -968,7 +970,7 @@
}
rc = rpmioSlurp(fn, &b, &blen);
if (rc || b == NULL || blen <= 0) {
- luaL_error(L, "failed to slurp data");
+ (void)luaL_error(L, "failed to slurp data");
return 0;
}
lua_pushlstring(L, (const char *)b, (size_t)blen);
@@ -976,18 +978,18 @@
}
static int rpm_sleep(lua_State *L)
- /[EMAIL PROTECTED] internalState @*/
- /[EMAIL PROTECTED] L, internalState @*/
+ /[EMAIL PROTECTED] fileSystem, internalState @*/
+ /[EMAIL PROTECTED] L, fileSystem, internalState @*/
{
- int sec;
+ unsigned sec;
if (lua_isnumber(L, 1))
- sec = lua_tonumber(L, 1);
+ sec = (unsigned) lua_tonumber(L, 1);
else {
(void)luaL_argerror(L, 1, "seconds");
return 0;
}
- sleep(sec);
+ (void) sleep(sec);
return 0;
}
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmlua.h
============================================================================
$ cvs diff -u -r2.9 -r2.10 rpmlua.h
--- rpm/rpmio/rpmlua.h 1 Jan 2008 20:27:52 -0000 2.9
+++ rpm/rpmio/rpmlua.h 13 Jan 2008 11:51:31 -0000 2.10
@@ -44,8 +44,10 @@
typedef /[EMAIL PROTECTED]@*/ struct rpmluav_s * rpmluav;
/[EMAIL PROTECTED]@*/
-/[EMAIL PROTECTED]@*/
-rpmlua rpmluaGetGlobalState(void);
+/[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/
+rpmlua rpmluaGetGlobalState(void)
+ /[EMAIL PROTECTED]/;
+
rpmlua rpmluaNew(void)
/[EMAIL PROTECTED] fileSystem, internalState @*/
/[EMAIL PROTECTED] fileSystem, internalState @*/;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmmacro.h
============================================================================
$ cvs diff -u -r2.46 -r2.47 rpmmacro.h
--- rpm/rpmio/rpmmacro.h 2 Jan 2008 19:10:14 -0000 2.46
+++ rpm/rpmio/rpmmacro.h 13 Jan 2008 11:51:31 -0000 2.47
@@ -162,7 +162,7 @@
* @return @todo Document.
*/
int rpmUndefineMacro(/[EMAIL PROTECTED]@*/ MacroContext mc, const char *
macro)
- /[EMAIL PROTECTED] rpmGlobalMacroContext, h_errno, internalState @*/
+ /[EMAIL PROTECTED] rpmGlobalMacroContext, internalState @*/
/[EMAIL PROTECTED] mc, rpmGlobalMacroContext, internalState @*/;
/**
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmpgp.c
============================================================================
$ cvs diff -u -r2.86 -r2.87 rpmpgp.c
--- rpm/rpmio/rpmpgp.c 29 Dec 2007 18:32:02 -0000 2.86
+++ rpm/rpmio/rpmpgp.c 13 Jan 2008 11:51:31 -0000 2.87
@@ -1482,7 +1482,7 @@
int pgpHashAlgoStringToNumber(const char *name, size_t name_len)
{
- int i;
+ size_t i;
if (name == NULL)
return -1;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/stringbuf.c
============================================================================
$ cvs diff -u -r2.2 -r2.3 stringbuf.c
--- rpm/rpmio/stringbuf.c 21 Dec 2007 08:51:46 -0000 2.2
+++ rpm/rpmio/stringbuf.c 13 Jan 2008 11:51:31 -0000 2.3
@@ -4,6 +4,7 @@
#include "system.h"
+#include <rpmio.h> /* XXX xisspace, _free */
#include "stringbuf.h"
#include "debug.h"
@@ -11,32 +12,13 @@
struct StringBufRec {
/[EMAIL PROTECTED]@*/
- char *buf;
+ char * buf;
/[EMAIL PROTECTED]@*/
- char *tail; /* Points to first "free" char */
- int allocated;
- int free;
+ char * tail; /* Points to first "free" char */
+ size_t allocated;
+ size_t free;
};
-/**
- * Locale insensitive isspace(3).
- */
-/[EMAIL PROTECTED]@*/ static inline int xisspace(int c) /[EMAIL PROTECTED]/ {
- return (c == ' ' || c == '\t' || c == '\n' || c == '\r' || c == '\f' ||
c == '\v');
-}
-
-/**
- * Wrapper to free(3), hides const compilation noise, permit NULL, return
NULL.
- * @param p memory to free
- * @return NULL always
- */
-/[EMAIL PROTECTED]@*/ static inline /[EMAIL PROTECTED]@*/ void *
-_free(/[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/
const void * p) /[EMAIL PROTECTED] *p @*/
-{
- if (p != NULL) free((void *)p);
- return NULL;
-}
-
StringBuf newStringBuf(void)
{
StringBuf sb = xmalloc(sizeof(*sb));
@@ -68,7 +50,7 @@
void stripTrailingBlanksStringBuf(StringBuf sb)
{
while (sb->free != sb->allocated) {
- if (! xisspace(*(sb->tail - 1)))
+ if (!xisspace((int)*(sb->tail - 1)))
break;
sb->free++;
sb->tail--;
@@ -81,13 +63,12 @@
return sb->buf;
}
-void appendStringBufAux(StringBuf sb, const char *s, int nl)
+void appendStringBufAux(StringBuf sb, const char *s, size_t nl)
{
- int l;
+ size_t l = strlen(s);
- l = strlen(s);
/* If free == l there is no room for NULL terminator! */
- while ((l + nl + 1) > sb->free) {
+ while ((l + nl) >= sb->free) {
sb->allocated += BUF_CHUNK;
sb->free += BUF_CHUNK;
sb->buf = xrealloc(sb->buf, sb->allocated);
@@ -100,9 +81,8 @@
sb->tail += l;
sb->free -= l;
if (nl) {
- sb->tail[0] = '\n';
- sb->tail[1] = '\0';
- sb->tail++;
+ *sb->tail++ = '\n';
sb->free--;
+ *sb->tail = '\0';
}
}
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/stringbuf.h
============================================================================
$ cvs diff -u -r2.2 -r2.3 stringbuf.h
--- rpm/rpmio/stringbuf.h 21 Dec 2007 08:51:46 -0000 2.2
+++ rpm/rpmio/stringbuf.h 13 Jan 2008 11:51:31 -0000 2.3
@@ -49,7 +49,7 @@
/**
*/
-void appendStringBufAux(StringBuf sb, const char * s, int nl)
+void appendStringBufAux(StringBuf sb, const char * s, size_t nl)
/[EMAIL PROTECTED] sb @*/;
#ifdef __cplusplus
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository [email protected]
