folkslinux
/
rpm
mirror of https://github.com/rpm-software-management/rpm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove bogus const from rpmGenPath and rpmGetPath return type 

- both return malloced strings you're supposed to free
This commit is contained in:
Panu Matilainen 2007-12-15 09:39:32 +02:00
parent 55cb2ff128
commit dce66192f2
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
rpmio/rpmfileutil.c
View File

@ -510,7 +510,7 @@ char *rpmCleanPath(char * path)
/* Merge 3 args into path, any or all of which may be a url. */
const char * rpmGenPath(const char * urlroot, const char * urlmdir,
char * rpmGenPath(const char * urlroot, const char * urlmdir,
const char *urlfile)
{
const char * xroot = rpmGetPath(urlroot, NULL);
@ -561,8 +561,7 @@ const char * file = xfile;
/* Return concatenated and expanded canonical path. */
const char *
rpmGetPath(const char *path, ...)
char * rpmGetPath(const char *path, ...)
{
char buf[BUFSIZ];
const char * s;

6
rpmio/rpmfileutil.h
View File

@ -83,8 +83,7 @@ char * rpmCleanPath (char * path);
* @param urlfile file URL (often a file, or NULL)
* @return expanded, merged, canonicalized path (malloc'ed)
*/
/* LCL: shrug */
const char * rpmGenPath (const char * urlroot,
char * rpmGenPath (const char * urlroot,
const char * urlmdir,
const char * urlfile);
@ -93,8 +92,7 @@ const char * rpmGenPath (const char * urlroot,
* @param path macro(s) to expand (NULL terminates list)
* @return canonicalized path (malloc'ed)
*/
/* LCL: shrug */
const char * rpmGetPath (const char * path, ...);
char * rpmGetPath (const char * path, ...);
/** \ingroup rpmfileutil
* Return URL path(s) from a (URL prefixed) pattern glob.