diff options
| author | jbj <devnull@localhost> | 2000-12-02 21:53:44 +0000 |
|---|---|---|
| committer | jbj <devnull@localhost> | 2000-12-02 21:53:44 +0000 |
| commit | 2885f536b6e314734c0c04245d77b9f7bdc76d42 (patch) | |
| tree | 1ab8d5ab1cbc20bd1b1da69ba475b80816db2da9 /rpmio | |
| parent | d7a40e754dc6b0ac07d2185bb5723384065feab5 (diff) | |
| download | rpm-2885f536b6e314734c0c04245d77b9f7bdc76d42.tar.gz rpm-2885f536b6e314734c0c04245d77b9f7bdc76d42.tar.bz2 rpm-2885f536b6e314734c0c04245d77b9f7bdc76d42.zip | |
Bring header reggions mods back to top of stack.
CVS patchset: 4305
CVS date: 2000/12/02 21:53:44
Diffstat (limited to 'rpmio')
| -rw-r--r-- | rpmio/Makefile.am | 6 | ||||
| -rw-r--r-- | rpmio/macro.c | 4 | ||||
| -rw-r--r-- | rpmio/rpmio_internal.h | 6 |
3 files changed, 10 insertions, 6 deletions
diff --git a/rpmio/Makefile.am b/rpmio/Makefile.am index 551eac56d..c5bcc2247 100644 --- a/rpmio/Makefile.am +++ b/rpmio/Makefile.am @@ -6,8 +6,10 @@ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/build -I$(top_srcdir)/lib \ -I$(top_srcdir)/popt @INCPATH@ pkgincdir = $(pkgincludedir) -pkginc_HEADERS = rpmio.h rpmurl.h rpmmacro.h rpmlog.h rpmmessages.h rpmerr.h -noinst_HEADERS = base64.h rpmio_internal.h ugid.h +pkginc_HEADERS = \ + rpmio.h rpmurl.h rpmmacro.h rpmlog.h rpmmessages.h rpmerr.h \ + ugid.h +noinst_HEADERS = base64.h rpmio_internal.h lib_LTLIBRARIES = librpmio.la librpmio_la_SOURCES = rpmrpc.c rpmio.c rpmio_api.c url.c macro.c \ diff --git a/rpmio/macro.c b/rpmio/macro.c index d8c3adb6f..40aa7f067 100644 --- a/rpmio/macro.c +++ b/rpmio/macro.c @@ -1500,8 +1500,8 @@ int isCompressed(const char *file, rpmCompressedMagic *compressed) rpmError(RPMERR_BADSPEC, _("File %s: %s"), file, Fstrerror(fd)); rc = 1; } else if (nb < sizeof(magic)) { - rpmError(RPMERR_BADSPEC, _("File %s is smaller than %d bytes"), - file, sizeof(magic)); + rpmError(RPMERR_BADSPEC, _("File %s is smaller than %u bytes"), + file, (unsigned)sizeof(magic)); rc = 0; } Fclose(fd); diff --git a/rpmio/rpmio_internal.h b/rpmio/rpmio_internal.h index 25740acd2..d3ee03a21 100644 --- a/rpmio/rpmio_internal.h +++ b/rpmio/rpmio_internal.h @@ -344,8 +344,10 @@ int ufdClose( /*@only@*/ void * cookie); /** \ingroup rpmio */ -/*@unused@*/ static inline void fdInitMD5(FD_t fd) { - fd->digest = rpmDigestInit(RPMDIGEST_MD5); +/*@unused@*/ static inline void fdInitMD5(FD_t fd, int flags) { + if (flags) flags = RPMDIGEST_NATIVE; + flags |= RPMDIGEST_MD5; + fd->digest = rpmDigestInit(flags); } /** \ingroup rpmio |