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

made printDepFlags() externally visible 

CVS patchset: 910
CVS date: 1996/07/20 23:20:56
This commit is contained in:
ewt 1996-07-20 23:20:56 +00:00
parent 314715470b
commit bf60ec4553
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
install.c
View File

@ -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);
}

3
install.h
View File

@ -1,6 +1,8 @@
#ifndef _H_INSTALL
#define _H_INSTALL
#include <stdio.h>
#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