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 21:35:32 Branch: rpm-5_4 Handle: 2012041419353100 Modified files: (Branch: rpm-5_4) rpm/rpmio rpmio.c Log: - c++: allocator casts. Summary: Revision Changes Path 1.230.2.7 +6 -5 rpm/rpmio/rpmio.c ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/rpmio/rpmio.c ============================================================================ $ cvs diff -u -r1.230.2.6 -r1.230.2.7 rpmio.c --- rpm/rpmio/rpmio.c 25 Mar 2012 18:13:39 -0000 1.230.2.6 +++ rpm/rpmio/rpmio.c 14 Apr 2012 19:35:31 -0000 1.230.2.7 @@ -295,7 +295,7 @@ /*@globals fileSystem @*/ /*@modifies _fd, fileSystem @*/ { - FD_t fd = _fd; + FD_t fd = (FD_t) _fd; int i; assert(fd != NULL); @@ -2889,7 +2889,8 @@ } /* XXX persistent HTTP/1.1 returns the previously opened fp */ - if (isHTTP && ((fp = fdGetFp(fd)) != NULL) && ((fdno = fdGetFdno(fd)) >= 0 || fd->req != NULL)) + if (isHTTP && ((fp = (FILE *) fdGetFp(fd)) != NULL) + && ((fdno = fdGetFdno(fd)) >= 0 || fd->req != NULL)) { /*@+voidabstract@*/ fdPush(fd, fpio, fp, fileno(fp)); /* Push fpio onto stack */ @@ -3017,7 +3018,7 @@ if (path == NULL || *path == '\0') return -1; - d = alloca(strlen(path)+2); + d = (char *) alloca(strlen(path)+2); de = stpcpy(d, path); de[1] = '\0'; for (de = d; *de != '\0'; de++) { @@ -3081,7 +3082,7 @@ mode = X_OK; /* Strip filename out of its name space wrapper. */ - bn = alloca_strdup(FN); + bn = (char *) alloca_strdup(FN); for (t = bn; t && *t; t++) { if (*t != '(') continue; @@ -3147,7 +3148,7 @@ } /* Look for relative basename on PATH. */ - for (r = alloca_strdup(path); r != NULL && *r != '\0'; r = re) { + for (r = (char *) alloca_strdup(path); r != NULL && *r != '\0'; r = re) { /* Find next element, terminate current element. */ for (re = r; (re = strchr(re, ':')) != NULL; re++) { @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository rpm-cvs@rpm5.org