summaryrefslogtreecommitdiff
path: root/rpmio
diff options
context:
space:
mode:
authorPanu Matilainen <pmatilai@redhat.com>2008-04-19 16:58:55 +0300
committerPanu Matilainen <pmatilai@redhat.com>2008-04-19 16:58:55 +0300
commit1b972af8a6698b62a0c0d0818c6798aaad386b70 (patch)
tree2681d4b10bd0f3ca5f4c762d086affdc0caee609 /rpmio
parent2072bd1334846e4d005c2e07949439f391ea6173 (diff)
downloadrpm-1b972af8a6698b62a0c0d0818c6798aaad386b70.tar.gz
rpm-1b972af8a6698b62a0c0d0818c6798aaad386b70.tar.bz2
rpm-1b972af8a6698b62a0c0d0818c6798aaad386b70.zip
Change rpmGlob() argvPtr type to ARGV_t to make it obvious what it is
- also fix incorrect doxygen commentary, it wasn't a contiguous blob before either
Diffstat (limited to 'rpmio')
-rw-r--r--rpmio/rpmfileutil.c2
-rw-r--r--rpmio/rpmfileutil.h5
2 files changed, 4 insertions, 3 deletions
diff --git a/rpmio/rpmfileutil.c b/rpmio/rpmfileutil.c
index dad7bd757..524f519d3 100644
--- a/rpmio/rpmfileutil.c
+++ b/rpmio/rpmfileutil.c
@@ -531,7 +531,7 @@ char * rpmGetPath(const char *path, ...)
return rpmCleanPath(res);
}
-int rpmGlob(const char * patterns, int * argcPtr, char *** argvPtr)
+int rpmGlob(const char * patterns, int * argcPtr, ARGV_t * argvPtr)
{
int ac = 0;
const char ** av = NULL;
diff --git a/rpmio/rpmfileutil.h b/rpmio/rpmfileutil.h
index b0e11c7d5..87a881043 100644
--- a/rpmio/rpmfileutil.h
+++ b/rpmio/rpmfileutil.h
@@ -9,6 +9,7 @@
#include <rpm/rpmutil.h>
#include <rpm/rpmio.h>
#include <rpm/rpmpgp.h>
+#include <rpm/argv.h>
/** \ingroup rpmfileutil
*/
@@ -86,10 +87,10 @@ char * rpmGetPath (const char * path, ...) RPM_GNUC_NULL_TERMINATED;
* Return URL path(s) from a (URL prefixed) pattern glob.
* @param patterns glob pattern
* @retval *argcPtr no. of paths
- * @retval *argvPtr array of paths (malloc'd contiguous blob)
+ * @retval *argvPtr ARGV_t array of paths
* @return 0 on success
*/
-int rpmGlob(const char * patterns, int * argcPtr, char *** argvPtr);
+int rpmGlob(const char * patterns, int * argcPtr, ARGV_t * argvPtr);
/** \ingroup rpmfileutil
* Escape isspace(3) characters in string.