[pacman-dev] [PATCH 3/3] Remove remaining usages of fprintf() from frontend

Dan McGee dan at archlinux.org
Fri Oct 21 11:53:01 EDT 2011


These can either be replaced with pm_printf() if they are error related,
or in the fprintf(stdout, ...) case a bare printf() will do.

Signed-off-by: Dan McGee <dan at archlinux.org>
---
 src/pacman/package.c |    4 ++--
 src/pacman/util.c    |    5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/pacman/package.c b/src/pacman/package.c
index e5558df..12f555a 100644
--- a/src/pacman/package.c
+++ b/src/pacman/package.c
@@ -252,9 +252,9 @@ void dump_pkg_files(alpm_pkg_t *pkg, int quiet)
 	for(i = 0; i < pkgfiles->count; i++) {
 		const alpm_file_t *file = pkgfiles->files + i;
 		if(!quiet) {
-			fprintf(stdout, "%s %s%s\n", pkgname, root, file->name);
+			printf("%s %s%s\n", pkgname, root, file->name);
 		} else {
-			fprintf(stdout, "%s%s\n", root, file->name);
+			printf("%s%s\n", root, file->name);
 		}
 	}
 
diff --git a/src/pacman/util.c b/src/pacman/util.c
index 1b0625e..b9ee8c9 100644
--- a/src/pacman/util.c
+++ b/src/pacman/util.c
@@ -1158,14 +1158,15 @@ static int parseindex(char *s, int *val, int min, int max)
 	int n = strtol(s, &endptr, 10);
 	if(*endptr == '\0') {
 		if(n < min || n > max) {
-			fprintf(stderr, _("Invalid value: %d is not between %d and %d\n"),
+			pm_printf(ALPM_LOG_ERROR,
+					_("invalid value: %d is not between %d and %d\n"),
 					n, min, max);
 			return -1;
 		}
 		*val = n;
 		return 0;
 	} else {
-		fprintf(stderr, _("Invalid number: %s\n"), s);
+		pm_printf(ALPM_LOG_ERROR, _("invalid number: %s\n"), s);
 		return -1;
 	}
 }
-- 
1.7.7



More information about the pacman-dev mailing list