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 20:18:30
Branch: rpm-5_4 Handle: 2012041418183000
Modified files: (Branch: rpm-5_4)
rpm/rpmio yarn.c
Log:
- c++: allocator casts.
Summary:
Revision Changes Path
2.11.2.1 +4 -4 rpm/rpmio/yarn.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/rpmio/yarn.c
============================================================================
$ cvs diff -u -r2.11 -r2.11.2.1 yarn.c
--- rpm/rpmio/yarn.c 2 Nov 2010 15:13:08 -0000 2.11
+++ rpm/rpmio/yarn.c 14 Apr 2012 18:18:30 -0000 2.11.2.1
@@ -248,7 +248,7 @@
int ret;
yarnLock bolt;
- bolt = my_malloc(sizeof(*bolt));
+ bolt = (yarnLock) my_malloc(sizeof(*bolt));
if ((ret = pthread_mutex_init(&(bolt->mutex), NULL)) ||
(ret = pthread_cond_init(&(bolt->cond), NULL)))
fail(ret);
@@ -406,7 +406,7 @@
static void * yarnIgnition(/*@only@*/ void * arg)
/*@*/
{
- struct capsule *capsule = arg;
+ struct capsule *capsule = (struct capsule *)arg;
/* run yarnReenter() before leaving */
/*@-moduncon -noeffectuncon -sysunrecog @*/
@@ -447,7 +447,7 @@
(allocated instead of automatic so that we're sure this will still be
there when yarnIgnition() actually starts up -- yarnIgnition() will
free this
allocation) */
- capsule = my_malloc(sizeof(*capsule));
+ capsule = (struct capsule *) my_malloc(sizeof(*capsule));
capsule->probe = probe;
/*@-mustfreeonly -temptrans @*/
capsule->payload = payload;
@@ -458,7 +458,7 @@
yarnPossess(&(threads_lock));
/* create the thread and call yarnIgnition() from that thread */
- th = my_malloc(sizeof(*th));
+ th = (yarnThread) my_malloc(sizeof(*th));
if ((ret = pthread_attr_init(&attr))
|| (ret = (stack ? pthread_attr_setstack(&attr, stack, nstack) : 0))
|| (ret = pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_JOINABLE))
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
