From bf60ec455312e67724a00c9f1a00e5088c04c963 Mon Sep 17 00:00:00 2001 From: ewt Date: Sat, 20 Jul 1996 23:20:56 +0000 Subject: [PATCH] made printDepFlags() externally visible CVS patchset: 910 CVS date: 1996/07/20 23:20:56 --- install.c | 7 ++++--- install.h | 3 +++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/install.c b/install.c index 623989b64..65afa0fb6 100644 --- a/install.c +++ b/install.c @@ -16,7 +16,6 @@ static int hashesPrinted = 0; static void printHash(const unsigned long amount, const unsigned long total); static void printPercent(const unsigned long amount, const unsigned long total); static int getFtpURL(char * hostAndFile, char * dest); -static void printDepFlags(FILE * f, char * version, int flags); static void printDepProblems(FILE * f, struct rpmDependencyConflict * conflicts, int numConflicts); static char * getFtpPassword(char * machine, char * account, int mustAsk); @@ -499,7 +498,10 @@ static int getFtpURL(char * hostAndFile, char * dest) { return fd; } -static void printDepFlags(FILE * f, char * version, int flags) { +void printDepFlags(FILE * f, char * version, int flags) { + if (flags) + fprintf(f, " "); + if (flags & REQUIRE_LESS) fprintf(f, "<"); if (flags & REQUIRE_GREATER) @@ -520,7 +522,6 @@ static void printDepProblems(FILE * f, struct rpmDependencyConflict * conflicts, for (i = 0; i < numConflicts; i++) { fprintf(f, "\t%s", conflicts[i].needsName); if (conflicts[i].needsFlags) { - fprintf(f, " "); printDepFlags(stderr, conflicts[i].needsVersion, conflicts[i].needsFlags); } diff --git a/install.h b/install.h index d50b7d76f..dcc83291a 100644 --- a/install.h +++ b/install.h @@ -1,6 +1,8 @@ #ifndef _H_INSTALL #define _H_INSTALL +#include + #define RPMINSTALL_PERCENT (1 << 0) #define RPMINSTALL_HASH (1 << 1) #define RPMINSTALL_NODEPS (1 << 2) @@ -12,6 +14,7 @@ int doInstall(char * rootdir, char ** argv, char * prefix, int installFlags, int doSourceInstall(char * prefix, char * arg, char ** specFile); int doUninstall(char * rootdir, char ** argv, int uninstallFlags, int interfaceFlags); +void printDepFlags(FILE * f, char * version, int flags); #endif