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-Apr-2012 22:44:46
Branch: rpm-5_4 Handle: 2012041420444600
Modified files: (Branch: rpm-5_4)
rpm/rpmio bson.c bzdio.c rpmbz.h rpmzlog.c rpmzlog.h rpmzq.c
Log:
- c++: casts.
Summary:
Revision Changes Path
2.4.4.4 +4 -4 rpm/rpmio/bson.c
2.24.4.1 +8 -8 rpm/rpmio/bzdio.c
1.6.4.1 +5 -1 rpm/rpmio/rpmbz.h
2.5.6.1 +10 -4 rpm/rpmio/rpmzlog.c
2.5.6.1 +1 -1 rpm/rpmio/rpmzlog.h
1.27.4.1 +25 -16 rpm/rpmio/rpmzq.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/rpmio/bson.c
============================================================================
$ cvs diff -u -r2.4.4.3 -r2.4.4.4 bson.c
--- rpm/rpmio/bson.c 12 Mar 2012 18:35:05 -0000 2.4.4.3
+++ rpm/rpmio/bson.c 14 Apr 2012 20:44:46 -0000 2.4.4.4
@@ -365,7 +365,7 @@
}
bson *bson_empty( bson *obj ) {
- static char *data = "\005\0\0\0\0";
+ static char data[] = "\005\0\0\0\0";
bson_init_data( obj, data );
obj->finished = 1;
obj->err = 0;
@@ -700,7 +700,7 @@
char msg[] = "unknown type: 000000000000";
bson_numstr( msg+14, ( unsigned )( i->cur[0] ) );
bson_fatal_msg( 0, msg );
- return 0;
+ return ( bson_type )0;
}
}
@@ -854,7 +854,7 @@
if ( bson_iterator_type( i ) == BSON_CODEWSCOPE ) {
int code_len;
bson_little_endian32( &code_len, bson_iterator_value( i )+4 );
- bson_init_data( scope, ( void * )( bson_iterator_value( i
)+8+code_len ) );
+ bson_init_data( scope, ( char * )( bson_iterator_value( i
)+8+code_len ) );
_bson_reset( scope );
scope->finished = 1;
} else {
@@ -967,7 +967,7 @@
}
}
- b->data = bson_realloc( b->data, new_size );
+ b->data = (char *) bson_realloc( b->data, new_size );
if ( !b->data )
bson_fatal_msg( !!b->data, "realloc() failed" );
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/bzdio.c
============================================================================
$ cvs diff -u -r2.24 -r2.24.4.1 bzdio.c
--- rpm/rpmio/bzdio.c 17 Jan 2010 12:16:31 -0000 2.24
+++ rpm/rpmio/bzdio.c 14 Apr 2012 20:44:46 -0000 2.24.4.1
@@ -310,7 +310,7 @@
static int rpmbzFlush(void * _bz)
/*@*/
{
- rpmbz bz = _bz;
+ rpmbz bz = (rpmbz) _bz;
return BZ2_bzflush(bz->bzfile);
}
@@ -381,7 +381,7 @@
/*@modifies fileSystem @*/
{
FD_t fd = c2f(cookie);
- rpmbz bz = bzdFileno(fd);
+ rpmbz bz = (rpmbz) bzdFileno(fd);
return rpmbzFlush(bz);
}
/*@=globuse@*/
@@ -393,7 +393,7 @@
/*@modifies *buf, fileSystem, internalState @*/
{
FD_t fd = c2f(cookie);
- rpmbz bz = bzdFileno(fd);
+ rpmbz bz = (rpmbz) bzdFileno(fd);
ssize_t rc = 0;
assert(bz != NULL);
@@ -404,7 +404,7 @@
/*@=modobserver@*/
if (rc >= 0) {
fdstat_exit(fd, FDSTAT_READ, rc);
- if (fd->ndigests && rc > 0) fdUpdateDigests(fd, (void *)buf, rc);
+ if (fd->ndigests && rc > 0) fdUpdateDigests(fd, (const unsigned char
*)buf, rc);
}
return rc;
}
@@ -417,13 +417,13 @@
/*@modifies fileSystem, internalState @*/
{
FD_t fd = c2f(cookie);
- rpmbz bz = bzdFileno(fd);
+ rpmbz bz = (rpmbz) bzdFileno(fd);
ssize_t rc;
assert(bz != NULL);
if (fd->bytesRemain == 0) return 0; /* XXX simulate EOF */
- if (fd->ndigests && count > 0) fdUpdateDigests(fd, (void *)buf, count);
+ if (fd->ndigests && count > 0) fdUpdateDigests(fd, (const unsigned char
*)buf, count);
fdstat_enter(fd, FDSTAT_WRITE);
/*@-modobserver@*/ /* FIX: is errcookie an observer? */
@@ -439,7 +439,7 @@
/*@*/
{
FD_t fd = c2f(cookie);
- rpmbz bz = bzdFileno(fd);
+ rpmbz bz = (rpmbz) bzdFileno(fd);
assert(bz != NULL);
BZDONLY(fd);
@@ -451,7 +451,7 @@
/*@modifies fileSystem, internalState @*/
{
FD_t fd = c2f(cookie);
- rpmbz bz = bzdFileno(fd);
+ rpmbz bz = (rpmbz) bzdFileno(fd);
int rc;
assert(bz != NULL);
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmbz.h
============================================================================
$ cvs diff -u -r1.6 -r1.6.4.1 rpmbz.h
--- rpm/rpmio/rpmbz.h 2 Dec 2009 19:34:27 -0000 1.6
+++ rpm/rpmio/rpmbz.h 14 Apr 2012 20:44:46 -0000 1.6.4.1
@@ -182,6 +182,10 @@
void * zlog; /*!< trace logging. */
};
+#ifdef __cplusplus
+GENfree(rpmbz)
+#endif /* __cplusplus */
+
/*@only@*/ /*@null@*/
static rpmbz rpmbzFini(/*@only@*/ rpmbz bz)
/*@modifies bz @*/
@@ -194,7 +198,7 @@
static rpmbz rpmbzInit(int level, int small, int verbosity, mode_t omode)
/*@*/
{
- rpmbz bz = xcalloc(1, sizeof(*bz));
+ rpmbz bz = (rpmbz) xcalloc(1, sizeof(*bz));
static int _bzdB = 9;
static int _bzdS = 0;
static int _bzdV = 1;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmzlog.c
============================================================================
$ cvs diff -u -r2.5 -r2.5.6.1 rpmzlog.c
--- rpm/rpmio/rpmzlog.c 25 Mar 2009 20:10:52 -0000 2.5
+++ rpm/rpmio/rpmzlog.c 14 Apr 2012 20:44:46 -0000 2.5.6.1
@@ -53,6 +53,12 @@
/*@access rpmzMsg @*/
/*@access rpmzLog @*/
+
+#ifdef __cplusplus
+GENfree(rpmzMsg)
+GENfree(rpmzLog)
+#endif /* __cplusplus */
+
/*==============================================================*/
/* maximum log entry length */
@@ -74,7 +80,7 @@
rpmzLog rpmzLogNew(struct timeval *tv)
{
- rpmzLog zlog = xcalloc(1, sizeof(*zlog));
+ rpmzLog zlog = (rpmzLog) xcalloc(1, sizeof(*zlog));
zlog->_item.use = yarnNewLock(0);
zlog->msg_head = NULL;
@@ -92,7 +98,7 @@
/*@=nullret@*/
}
-void rpmzLogAdd(rpmzLog zlog, char *fmt, ...)
+void rpmzLogAdd(rpmzLog zlog, const char *fmt, ...)
{
rpmzMsg me;
struct timeval now;
@@ -104,7 +110,7 @@
return;
xx = gettimeofday(&now, NULL);
- me = xmalloc(sizeof(*me));
+ me = (rpmzMsg) xmalloc(sizeof(*me));
me->when = now;
va_start(ap, fmt);
xx = vsnprintf(msg, sizeof(msg)-1, fmt, ap);
@@ -112,7 +118,7 @@
msg[sizeof(msg)-1] = '\0';
/*@-mustfreeonly@*/
- me->msg = xmalloc(strlen(msg) + 1);
+ me->msg = (char *) xmalloc(strlen(msg) + 1);
/*@=mustfreeonly@*/
strcpy(me->msg, msg);
/*@-mustfreeonly@*/
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmzlog.h
============================================================================
$ cvs diff -u -r2.5 -r2.5.6.1 rpmzlog.h
--- rpm/rpmio/rpmzlog.h 25 Mar 2009 20:10:52 -0000 2.5
+++ rpm/rpmio/rpmzlog.h 14 Apr 2012 20:44:46 -0000 2.5.6.1
@@ -61,7 +61,7 @@
/**
* Add entry to trace log.
*/
-void rpmzLogAdd(/*@null@*/ rpmzLog zlog, char *fmt, ...)
+void rpmzLogAdd(/*@null@*/ rpmzLog zlog, const char *fmt, ...)
/*@globals fileSystem, internalState @*/
/*@modifies zlog, fileSystem, internalState @*/;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmzq.c
============================================================================
$ cvs diff -u -r1.27 -r1.27.4.1 rpmzq.c
--- rpm/rpmio/rpmzq.c 17 Jan 2010 12:16:31 -0000 1.27
+++ rpm/rpmio/rpmzq.c 14 Apr 2012 20:44:46 -0000 1.27.4.1
@@ -73,6 +73,15 @@
#include "debug.h"
+#ifdef __cplusplus
+GENfree(unsigned char *)
+GENfree(rpmzJob)
+GENfree(rpmzPool)
+GENfree(rpmzSpace)
+GENfree(rpmzFIFO)
+GENfree(rpmzSEQ)
+#endif /* __cplusplus */
+
/*@unchecked@*/
int _rpmzq_debug = 0;
@@ -297,7 +306,7 @@
/*@-mustmod@*/
int rpmbzCompressBlock(void * _bz, rpmzJob job)
{
- rpmbz bz = _bz;
+ rpmbz bz = (rpmbz) _bz;
unsigned int len = job->out->len;
int rc;
rc = BZ2_bzBuffToBuffCompress((char *)job->out->buf, &len,
@@ -343,7 +352,7 @@
limit, i.e., to never wait for a buffer to return to the pool */
rpmzPool rpmzqNewPool(size_t size, int limit)
{
- rpmzPool pool = xcalloc(1, sizeof(*pool));
+ rpmzPool pool = (rpmzPool) xcalloc(1, sizeof(*pool));
/*@=mustfreeonly@*/
pool->have = yarnNewLock(0);
pool->head = NULL;
@@ -385,12 +394,12 @@
yarnRelease(pool->have);
}
- space = xcalloc(1, sizeof(*space));
+ space = (rpmzSpace) xcalloc(1, sizeof(*space));
/*@-mustfreeonly@*/
space->use = yarnNewLock(1); /* initially one user */
space->len = (pool ? pool->size : len);
if (space->len > 0)
- space->buf = xmalloc(space->len);
+ space->buf = (unsigned char *) xmalloc(space->len);
space->ptr = space->buf; /* XXX save allocated buffer */
space->ix = 0; /* XXX initialize to 0 */
/*@-assignexpose -temptrans @*/
@@ -435,7 +444,7 @@
rpmzPool pool = space->pool;
if (pool != NULL) {
yarnPossess(pool->have);
- space->buf = space->ptr; /* XXX reset to original allocation. */
+ space->buf = (unsigned char *) space->ptr; /* XXX reset to
original allocation. */
space->len = pool->size; /* XXX reset to pool->size */
space->ix = 0; /* XXX reset to 0 */
/*@-mustfreeonly@*/
@@ -494,7 +503,7 @@
rpmzJob rpmzqNewJob(long seq)
{
- rpmzJob job = xcalloc(1, sizeof(*job));
+ rpmzJob job = (rpmzJob) xcalloc(1, sizeof(*job));
job->use = yarnNewLock(1); /* initially one user */
job->seq = seq;
job->calc = yarnNewLock(0);
@@ -644,7 +653,7 @@
rpmzFIFO rpmzqInitFIFO(long val)
{
- rpmzFIFO zs = xcalloc(1, sizeof(*zs));
+ rpmzFIFO zs = (rpmzFIFO) xcalloc(1, sizeof(*zs));
zs->have = yarnNewLock(val);
zs->head = NULL;
zs->tail = &zs->head;
@@ -707,7 +716,7 @@
rpmzSEQ rpmzqInitSEQ(long val)
{
- rpmzSEQ zs = xcalloc(1, sizeof(*zs));
+ rpmzSEQ zs = (rpmzSEQ) xcalloc(1, sizeof(*zs));
zs->first = yarnNewLock(val);
zs->head = NULL;
return zs;
@@ -885,9 +894,9 @@
if (job->out->len < outlen) {
fprintf(stderr, "==> FIXME: %s: job->out %p %p[%u] malloc(%u)\n",
__FUNCTION__, job->out, job->out->buf, (unsigned)job->out->len,
(unsigned)outlen);
job->out = rpmzqDropSpace(job->out);
- job->out = xcalloc(1, sizeof(*job->out));
+ job->out = (rpmzSpace) xcalloc(1, sizeof(*job->out));
job->out->len = outlen;
- job->out->buf = xmalloc(job->out->len);
+ job->out->buf = (unsigned char *) xmalloc(job->out->len);
}
/* compress job->in to job-out */
@@ -899,9 +908,9 @@
if (job->out->len < outlen) {
fprintf(stderr, "==> FIXME: %s: job->out %p %p[%u] malloc(%u)\n",
__FUNCTION__, job->out, job->out->buf, (unsigned)job->out->len,
(unsigned)outlen);
job->out = rpmzqDropSpace(job->out);
- job->out = xcalloc(1, sizeof(*job->out));
+ job->out = (rpmzSpace) xcalloc(1, sizeof(*job->out));
job->out->len = outlen;
- job->out->buf = xmalloc(job->out->len);
+ job->out->buf = (unsigned char *) xmalloc(job->out->len);
}
for (;;) {
@@ -919,9 +928,9 @@
job->out->buf = _free(job->out->buf);
job->out = _free(job->out);
}
- job->out = xcalloc(1, sizeof(*job->out));
+ job->out = (rpmzSpace) xcalloc(1, sizeof(*job->out));
job->out->len = outlen;
- job->out->buf = xmalloc(job->out->len);
+ job->out->buf = (unsigned char *) xmalloc(job->out->len);
}
assert(ret == BZ_OK);
break;
@@ -938,7 +947,7 @@
/*@globals fileSystem, internalState @*/
/*@modifies _zq, fileSystem, internalState @*/
{
- rpmzQueue zq = _zq;
+ rpmzQueue zq = (rpmzQueue) _zq;
rpmbz bz = rpmbzInit(zq->level, -1, -1, zq->omode);
rpmzJob job;
@@ -958,7 +967,7 @@
/*@globals fileSystem, internalState @*/
/*@modifies _zq, fileSystem, internalState @*/
{
- rpmzQueue zq = _zq;
+ rpmzQueue zq = (rpmzQueue) _zq;
rpmbz bz = rpmbzInit(zq->level, -1, -1, zq->omode);
rpmzJob job;
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
