lib: introduce xbps_verbose_printf

like xbps_dbg_printf, but for verbose-only prints to stderr

Author: classabbyamp

bin/xbps-pkgdb/check.c

@@ -53,8 +53,7 @@ check_cb(struct xbps_handle *xhp UNUSED,
 	int rv;
 
 	xbps_dictionary_get_cstring_nocopy(obj, "pkgver", &pkgver);
-	if (xhp->flags & XBPS_FLAG_VERBOSE)
-		printf("Checking %s ...\n", pkgver);
+	xbps_verbose_printf("Checking %s ...\n", pkgver);
 
 	if (!xbps_pkg_name(pkgname, sizeof(pkgname), pkgver)) {
 		abort();

bin/xbps-rindex/remove-obsoletes.c

@@ -101,7 +101,7 @@ index_match_pkgver(xbps_dictionary_t index, const char *pkgname, const char *pkg
 }
 
 static int
-cleaner_cb(struct xbps_handle *xhp, xbps_object_t obj, const char *key UNUSED, void *arg, bool *done UNUSED)
+cleaner_cb(struct xbps_handle *xhp UNUSED, xbps_object_t obj, const char *key UNUSED, void *arg, bool *done UNUSED)
 {
 	char pkgname[XBPS_NAME_SIZE];
 	struct xbps_repo *repo = arg;
@@ -115,8 +115,7 @@ cleaner_cb(struct xbps_handle *xhp, xbps_object_t obj, const char *key UNUSED, v
 		return 0;
 	}
 
-	if (xhp->flags & XBPS_FLAG_VERBOSE)
-		printf("checking %s (%s)\n", pkgver, binpkg);
+	xbps_verbose_printf("checking %s (%s)\n", pkgver, binpkg);
 
 	if (index_match_pkgver(repo->stage, pkgname, pkgver) ||
 	    index_match_pkgver(repo->index, pkgname, pkgver)) {

bin/xbps-rindex/sign.c

@@ -252,7 +252,7 @@ sign_repo(struct xbps_handle *xhp, const char *repodir,
 }
 
 static int
-sign_pkg(struct xbps_handle *xhp, const char *binpkg, const char *privkey, bool force)
+sign_pkg(struct xbps_handle *xhp UNUSED, const char *binpkg, const char *privkey, bool force)
 {
 	RSA *rsa = NULL;
 	unsigned char *sig = NULL;
@@ -265,8 +265,7 @@ sign_pkg(struct xbps_handle *xhp, const char *binpkg, const char *privkey, bool
 	 * Skip pkg if file signature exists
 	 */
 	if (!force && ((sigfile_fd = access(sigfile, R_OK)) == 0)) {
-		if (xhp->flags & XBPS_FLAG_VERBOSE)
-			fprintf(stderr, "skipping %s, file signature found.\n", binpkg);
+		xbps_verbose_printf("skipping %s, file signature found.\n", binpkg);
 
 		sigfile_fd = -1;
 		goto out;

bin/xbps-uhelper/main.c

@@ -355,15 +355,13 @@ main(int argc, char **argv)
 			/* NOTREACHED */
 		}
 		rv = xbps_pkgpattern_match(argv[1], argv[2]);
-		if (flags & XBPS_FLAG_VERBOSE) {
-			if (rv >= 0)
-				fprintf(stderr, "%s %s %s\n",
-					argv[1],
-					(rv == 1) ? "matches" : "does not match",
-					argv[2]);
-			else
-				xbps_error_printf("%s: not a pattern\n", argv[2]);
-		}
+		if (rv >= 0)
+			xbps_verbose_printf("%s %s %s\n",
+				argv[1],
+				(rv == 1) ? "matches" : "does not match",
+				argv[2]);
+		else if (flags & XBPS_FLAG_VERBOSE)
+			xbps_error_printf("%s: not a pattern\n", argv[2]);
 		exit(rv);
 	} else if (strcmp(argv[0], "cmpver") == 0) {
 		/* Compare two version strings, installed vs required */
@@ -373,11 +371,10 @@ main(int argc, char **argv)
 		}
 
 		rv = xbps_cmpver(argv[1], argv[2]);
-		if (flags & XBPS_FLAG_VERBOSE)
-			fprintf(stderr, "%s %s %s\n",
-				argv[1],
-				(rv == 1) ? ">" : ((rv == 0) ? "=" : "<"),
-				argv[2]);
+		xbps_verbose_printf("%s %s %s\n",
+			argv[1],
+			(rv == 1) ? ">" : ((rv == 0) ? "=" : "<"),
+			argv[2]);
 		exit(rv);
 	} else if (strcmp(argv[0], "arch") == 0) {
 		/* returns the xbps native arch */

include/xbps.h.in

@@ -77,15 +77,15 @@
 # define XBPS_SYSDEFCONF_PATH	"/usr/share" XBPS_SYSDIR
 #endif
 
-/** 
+/**
  * @def XBPS_META_PATH
  * Default root PATH to store metadata info.
  */
 #ifndef XBPS_META_PATH
 #define XBPS_META_PATH		"var/db/xbps"
 #endif
 
-/** 
+/**
  * @def XBPS_CACHE_PATH
  * Default cache PATH to store downloaded binpkgs.
  */
@@ -109,7 +109,7 @@
  */
 #define XBPS_PKGFILES		"files.plist"
 
-/** 
+/**
  * @def XBPS_REPODATA_INDEX
  * Filename for the repository index property list.
  */
@@ -285,7 +285,7 @@
 extern "C" {
 #endif
 
-/** @addtogroup initend */ 
+/** @addtogroup initend */
 /**@{*/
 
 /**
@@ -689,9 +689,11 @@ struct xbps_handle {
 };
 
 extern int xbps_debug_level;
+extern int xbps_verbose_level;
 
 void xbps_dbg_printf(const char *, ...) __attribute__ ((format (printf, 1, 2)));
 void xbps_dbg_printf_append(const char *, ...)__attribute__ ((format (printf, 1, 2)));
+void xbps_verbose_printf(const char *, ...) __attribute__ ((format (printf, 1, 2)));
 void xbps_error_printf(const char *, ...)__attribute__ ((format (printf, 1, 2)));
 void xbps_warn_printf(const char *, ...)__attribute__ ((format (printf, 1, 2)));
 
@@ -752,11 +754,11 @@ int xbps_configure_packages(struct xbps_handle *xhp, xbps_array_t ignpkgs);
 
 /**
  * Download a file from a remote URL to current working directory.
- * 
+ *
  * @param[in] xhp Pointer to an xbps_handle struct.
  * @param[in] uri Remote URI string.
  * @param[in] flags Flags passed to libfetch's fetchXget().
- * 
+ *
  * @return -1 on error, 0 if not downloaded (because local/remote size/mtime
  * do not match) and 1 if downloaded successfully.
  **/
@@ -765,14 +767,14 @@ int xbps_fetch_file(struct xbps_handle *xhp, const char *uri,
 
 /**
  * Download and digest a file from a remote URL to current working directory.
- * 
+ *
  * @param[in] xhp Pointer to an xbps_handle struct.
  * @param[in] uri Remote URI string.
  * @param[in] flags Flags passed to libfetch's fetchXget().
  * @param[out] digest SHA256 digest buffer for the downloaded file or NULL.
  * @param[in] digestlen Size of \a digest if specified; must be at least
  * XBPS_SHA256_DIGEST_SIZE.
- * 
+ *
  * @return -1 on error, 0 if not downloaded (because local/remote size/mtime
  * do not match) and 1 if downloaded successfully.
  **/
@@ -783,12 +785,12 @@ int xbps_fetch_file_sha256(struct xbps_handle *xhp, const char *uri,
 /**
  * Download a file from a remote URL to current working directory,
  * and writing file to \a filename.
- * 
+ *
  * @param[in] xhp Pointer to an xbps_handle struct.
  * @param[in] uri Remote URI string.
  * @param[in] filename Local filename to safe the file
  * @param[in] flags Flags passed to libfetch's fetchXget().
- * 
+ *
  * @return -1 on error, 0 if not downloaded (because local/remote size/mtime
  * do not match) and 1 if downloaded successfully.
  **/
@@ -798,15 +800,15 @@ int xbps_fetch_file_dest(struct xbps_handle *xhp, const char *uri,
 /**
  * Download and digest a file from a remote URL to current working directory,
  * and writing file to \a filename.
- * 
+ *
  * @param[in] xhp Pointer to an xbps_handle struct.
  * @param[in] uri Remote URI string.
  * @param[in] filename Local filename to safe the file
  * @param[in] flags Flags passed to libfetch's fetchXget().
  * @param[out] digest SHA256 digest buffer of the downloaded file or NULL.
  * @param[in] digestlen Size of \a digest if specified; must be at least
  * XBPS_SHA256_DIGEST_SIZE.
- * 
+ *
  * @return -1 on error, 0 if not downloaded (because local/remote size/mtime
  * do not match) and 1 if downloaded successfully.
  **/
@@ -1460,7 +1462,7 @@ struct xbps_repo {
 	xbps_dictionary_t idxmeta;
 	/**
 	 * @var uri
-	 * 
+	 *
 	 * URI string associated with repository.
 	 */
 	const char *uri;
@@ -1768,7 +1770,7 @@ typedef enum pkg_state {
 /**
  * Gets package state from package \a pkgname, and sets its state
  * into \a state.
- * 
+ *
  * @param[in] xhp The pointer to an xbps_handle struct.
  * @param[in] pkgname Package name.
  * @param[out] state Package state returned.
@@ -1985,7 +1987,7 @@ bool xbps_remote_binpkg_exists(struct xbps_handle *xhp, xbps_dictionary_t pkgd);
  * Checks if the URI specified by \a uri is remote or local.
  *
  * @param[in] uri URI string.
- * 
+ *
  * @return true if URI is remote, false if local.
  */
 bool xbps_repository_is_remote(const char *uri);
@@ -2092,7 +2094,7 @@ bool xbps_pkgpattern_name(char *dst, size_t len, const char *pattern);
 
 /**
  * Gets the package version in a package string, i.e `foo-2.0`.
- * 
+ *
  * @param[in] pkg Package string.
  *
  * @return A string with the version string, NULL if it couldn't

lib/initend.c

@@ -53,6 +53,9 @@ xbps_init(struct xbps_handle *xhp)
 	if (xhp->flags & XBPS_FLAG_DEBUG)
 		xbps_debug_level = 1;
 
+	if (xhp->flags & XBPS_FLAG_VERBOSE)
+		xbps_verbose_level = 1;
+
 	xbps_dbg_printf("%s\n", XBPS_RELVER);
 
 	/* Set rootdir */

lib/log.c

@@ -35,6 +35,7 @@
 #endif
 
 int xbps_debug_level = 0;
+int xbps_verbose_level = 0;
 
 /**
  * @file lib/log.c
@@ -79,6 +80,19 @@ xbps_dbg_printf(const char *fmt, ...)
 	va_end(ap);
 }
 
+void
+xbps_verbose_printf(const char *fmt, ...)
+{
+	va_list ap;
+
+	if (xbps_verbose_level == 0)
+		return;
+
+	va_start(ap, fmt);
+	common_printf(stderr, NULL, fmt, ap);
+	va_end(ap);
+}
+
 void
 xbps_error_printf(const char *fmt, ...)
 {