RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 19-Mar-2008 16:19:58
Branch: HEAD Handle: 2008031915195800
Modified files:
rpm/rpmio rpmdav.c rpmdav.h
Log:
- jbj: use uint16_t rather than mode_t to accomodate RPMTAG_FILEMODES
arrays.
Summary:
Revision Changes Path
2.71 +2 -2 rpm/rpmio/rpmdav.c
2.28 +2 -2 rpm/rpmio/rpmdav.h
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmdav.c
============================================================================
$ cvs diff -u -r2.70 -r2.71 rpmdav.c
--- rpm/rpmio/rpmdav.c 12 Mar 2008 19:41:13 -0000 2.70
+++ rpm/rpmio/rpmdav.c 19 Mar 2008 15:19:58 -0000 2.71
@@ -217,7 +217,7 @@
return dp;
}
-DIR * avOpendir(const char * path, const char ** av, mode_t * modes)
+DIR * avOpendir(const char * path, const char ** av, uint16_t * modes)
{
AVDIR avdir;
struct dirent * dp;
@@ -228,7 +228,7 @@
int ac, nac;
if (_av_debug)
-fprintf(stderr, "*** avOpendir(%s, %p)\n", path, av);
+fprintf(stderr, "*** avOpendir(%s, %p, %p)\n", path, av, modes);
nb = 0;
ac = 0;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmdav.h
============================================================================
$ cvs diff -u -r2.27 -r2.28 rpmdav.h
--- rpm/rpmio/rpmdav.h 2 Mar 2008 02:11:53 -0000 2.27
+++ rpm/rpmio/rpmdav.h 19 Mar 2008 15:19:58 -0000 2.28
@@ -72,7 +72,7 @@
ARGV_t av;
/[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/
struct stat *st;
- mode_t * modes;
+ uint16_t * modes; /* XXX sizeof(mode_t) != sizeof(rpmmode_t) */
size_t * sizes;
time_t * mtimes;
};
@@ -126,7 +126,7 @@
*/
/[EMAIL PROTECTED]@*/
DIR * avOpendir(const char * path,
- /[EMAIL PROTECTED]@*/ const char ** av, /[EMAIL PROTECTED]@*/
mode_t * modes)
+ /[EMAIL PROTECTED]@*/ const char ** av, /[EMAIL PROTECTED]@*/
uint16_t * modes)
/[EMAIL PROTECTED] fileSystem, internalState @*/
/[EMAIL PROTECTED] fileSystem, internalState @*/;
#endif
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
