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:17:33
Branch: rpm-5_4 Handle: 2012041418173300
Modified files: (Branch: rpm-5_4)
rpm/rpmio url.c
Log:
- c++: allocator casts.
Summary:
Revision Changes Path
1.73.4.3 +5 -5 rpm/rpmio/url.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/rpmio/url.c
============================================================================
$ cvs diff -u -r1.73.4.2 -r1.73.4.3 url.c
--- rpm/rpmio/url.c 18 Mar 2012 14:19:31 -0000 1.73.4.2
+++ rpm/rpmio/url.c 14 Apr 2012 18:17:33 -0000 1.73.4.3
@@ -299,7 +299,7 @@
const char * host = (u->host ? u->host : "");
const char * user = (u->user ? u->user : "");
char * prompt;
- prompt = alloca(strlen(host) + strlen(user) + 256);
+ prompt = (char *) alloca(strlen(host) + strlen(user) + 256);
sprintf(prompt, _("Password for %s@%s: "), user, host);
u->password = _free(u->password);
/*@-dependenttrans -moduncon @*/
@@ -315,7 +315,7 @@
/*@observer@*/
const char * host = (u->host ? u->host : "");
const char *uu = (u->user ? u->user : "anonymous");
- char *nu = xmalloc(strlen(uu) + sizeof("@") + strlen(host));
+ char *nu = (char *)xmalloc(strlen(uu) + sizeof("@") +
strlen(host));
(void) stpcpy( stpcpy( stpcpy(nu, uu), "@"), host);
u->proxyu = nu;
u->proxyh = xstrdup(proxy);
@@ -400,7 +400,7 @@
urltype urlIsURL(const char * url)
{
struct urlstring *us;
- int ut = URL_IS_UNKNOWN;;
+ urltype ut = URL_IS_UNKNOWN;;
if (url && *url && *url != '/')
for (us = urlstrings; us->leadin != NULL; us++) {
@@ -422,7 +422,7 @@
{
static const char empty[] = "";
const char *path = (url ? url : empty);
- int ut = URL_IS_UNKNOWN;
+ urltype ut = URL_IS_UNKNOWN;
if (*path != '\0' && *path != '/') {
struct urlstring *us;
@@ -449,7 +449,7 @@
/*@*/
{
size_t nb = strlen(url);
- char * t = xmalloc(nb + 1 + 1);
+ char * t = (char *) xmalloc(nb + 1 + 1);
const char * nurl = t;
while (*url != '\0')
*t++ = *url++;
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
