lib: change xbps_dbg_printf to not require xbps_handle

This allows to simplify a lot of code by not having to pass around
the xbps handle everywhere just to print some debug information.

Author: Duncaen

bin/xbps-install/state_cb.c

@@ -196,8 +196,7 @@ state_cb(const struct xbps_state_cb_data *xscd, void *cbdata UNUSED)
 		if (xscd->desc)
 			printf("%s\n", xscd->desc);
 		else
-			xbps_dbg_printf(xscd->xhp,
-			    "%s: unknown state %d\n", xscd->arg, xscd->state);
+			xbps_dbg_printf("%s: unknown state %d\n", xscd->arg, xscd->state);
 
 		break;
 	}

bin/xbps-install/transaction.c

@@ -384,15 +384,15 @@ exec_transaction(struct xbps_handle *xhp, unsigned int maxcols, bool yes, bool d
 				goto proceed;
 			}
 		} else {
-			xbps_dbg_printf(xhp, "Empty transaction dictionary: %s\n",
+			xbps_dbg_printf("Empty transaction dictionary: %s\n",
 			    strerror(errno));
 		}
 		goto out;
 	}
 proceed:
 #ifdef FULL_DEBUG
-	xbps_dbg_printf(xhp, "Dictionary before transaction happens:\n");
-	xbps_dbg_printf_append(xhp, "%s",
+	xbps_dbg_printf("Dictionary before transaction happens:\n");
+	xbps_dbg_printf_append("%s",
 	    xbps_dictionary_externalize(xhp->transd));
 #endif
 

bin/xbps-query/ownedby.c

@@ -146,7 +146,7 @@ repo_match_cb(struct xbps_handle *xhp,
 	assert(bfile);
 	filesd = xbps_archive_fetch_plist(bfile, "/files.plist");
 	if (filesd == NULL) {
-		xbps_dbg_printf(xhp, "%s: couldn't fetch files.plist from %s: %s\n",
+		xbps_dbg_printf("%s: couldn't fetch files.plist from %s: %s\n",
 		    pkgver, bfile, strerror(errno));
 		return EINVAL;
 	}

bin/xbps-query/show-info-files.c

@@ -296,7 +296,7 @@ cat_file(struct xbps_handle *xhp, const char *pkg, const char *file)
 	if (url == NULL)
 		return EINVAL;
 
-	xbps_dbg_printf(xhp, "matched pkg at %s\n", url);
+	xbps_dbg_printf("matched pkg at %s\n", url);
 	rv = xbps_archive_fetch_file_into_fd(url, file, STDOUT_FILENO);
 	free(url);
 	return rv;
@@ -317,7 +317,7 @@ repo_cat_file(struct xbps_handle *xhp, const char *pkg, const char *file)
 	if (url == NULL)
 		return EINVAL;
 
-	xbps_dbg_printf(xhp, "matched pkg at %s\n", url);
+	xbps_dbg_printf("matched pkg at %s\n", url);
 	rv = xbps_archive_fetch_file_into_fd(url, file, STDOUT_FILENO);
 	free(url);
 	return rv;

bin/xbps-remove/clean-cache.c

@@ -88,7 +88,7 @@ cleaner_cb(struct xbps_handle *xhp, xbps_object_t obj,
 	}
 	if (strcmp(binpkgarch, xhp->target_arch ? xhp->target_arch : xhp->native_arch) != 0 &&
 	    strcmp(binpkgarch, "noarch") != 0) {
-		xbps_dbg_printf(xhp, "%s: ignoring binpkg with unmatched arch\n", binpkg);
+		xbps_dbg_printf("%s: ignoring binpkg with unmatched arch\n", binpkg);
 		return 0;
 	}
 
@@ -150,7 +150,7 @@ clean_cachedir(struct xbps_handle *xhp, bool drun)
 		if ((ext = strrchr(dp->d_name, '.')) == NULL)
 			continue;
 		if (strcmp(ext, ".xbps")) {
-			xbps_dbg_printf(xhp, "ignoring unknown file: %s\n", dp->d_name);
+			xbps_dbg_printf("ignoring unknown file: %s\n", dp->d_name);
 			continue;
 		}
 		xbps_array_add_cstring(array, dp->d_name);

bin/xbps-rindex/index-clean.c

@@ -46,7 +46,7 @@ struct CleanerCbInfo {
 };
 
 static int
-idx_cleaner_cb(struct xbps_handle *xhp,
+idx_cleaner_cb(struct xbps_handle *xhp UNUSED,
 		xbps_object_t obj,
 		const char *key UNUSED,
 		void *arg,
@@ -59,7 +59,7 @@ idx_cleaner_cb(struct xbps_handle *xhp,
 	xbps_dictionary_get_cstring_nocopy(obj, "architecture", &arch);
 	xbps_dictionary_get_cstring_nocopy(obj, "pkgver", &pkgver);
 
-	xbps_dbg_printf(xhp, "%s: checking %s [%s] ...\n", info->repourl, pkgver, arch);
+	xbps_dbg_printf("%s: checking %s [%s] ...\n", info->repourl, pkgver, arch);
 
 	filen = xbps_xasprintf("%s/%s.%s.xbps", info->repourl, pkgver, arch);
 	if (access(filen, R_OK) == -1) {

include/xbps.h.in

@@ -681,8 +681,10 @@ struct xbps_handle {
 	int flags;
 };
 
-void xbps_dbg_printf(struct xbps_handle *, const char *, ...) __attribute__ ((format (printf, 2, 3)));
-void xbps_dbg_printf_append(struct xbps_handle *, const char *, ...)__attribute__ ((format (printf, 2, 3)));
+extern int xbps_debug_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_error_printf(const char *, ...)__attribute__ ((format (printf, 1, 2)));
 void xbps_warn_printf(const char *, ...)__attribute__ ((format (printf, 1, 2)));
 

lib/conf.c

@@ -61,7 +61,7 @@ store_virtualpkg(struct xbps_handle *xhp, const char *path, size_t line, char *v
 	 */
 	p = strchr(val, ':');
 	if (p == NULL || p[1] == '\0') {
-		xbps_dbg_printf(xhp, "%s: ignoring invalid "
+		xbps_dbg_printf("%s: ignoring invalid "
 		    "virtualpkg option at line %zu\n", path, line);
 		return 0;
 	}
@@ -71,7 +71,7 @@ store_virtualpkg(struct xbps_handle *xhp, const char *path, size_t line, char *v
 		return -errno;
 	if (!xbps_dictionary_set_cstring(xhp->vpkgd_conf, val, p))
 		return -errno;
-	xbps_dbg_printf(xhp, "%s: added virtualpkg %s for %s\n", path, val, p);
+	xbps_dbg_printf("%s: added virtualpkg %s for %s\n", path, val, p);
 	return 1;
 }
 
@@ -95,7 +95,7 @@ store_preserved_file(struct xbps_handle *xhp, const char *file)
 		if (xbps_match_string_in_array(xhp->preserved_files, file))
 			goto out;
 		xbps_array_add_cstring(xhp->preserved_files, file);
-		xbps_dbg_printf(xhp, "Added preserved file: %s\n", file);
+		xbps_dbg_printf("Added preserved file: %s\n", file);
 		goto out;
 	} else if (rv != 0) {
 		goto out;
@@ -109,7 +109,7 @@ store_preserved_file(struct xbps_handle *xhp, const char *file)
 		assert(p);
 		xbps_strlcpy(p, globbuf.gl_pathv[i] + strlen(xhp->rootdir), len);
 		xbps_array_add_cstring(xhp->preserved_files, p);
-		xbps_dbg_printf(xhp, "Added preserved file: %s (expanded from %s)\n", p, file);
+		xbps_dbg_printf("Added preserved file: %s (expanded from %s)\n", p, file);
 		free(p);
 	}
 out:
@@ -134,7 +134,7 @@ store_ignored_pkg(struct xbps_handle *xhp, const char *pkgname)
 		assert(xhp->ignored_pkgs);
 	}
 	xbps_array_add_cstring(xhp->ignored_pkgs, pkgname);
-	xbps_dbg_printf(xhp, "Added ignored package: %s\n", pkgname);
+	xbps_dbg_printf("Added ignored package: %s\n", pkgname);
 }
 
 static void
@@ -147,7 +147,7 @@ store_noextract(struct xbps_handle *xhp, const char *value)
 		assert(xhp->noextract);
 	}
 	xbps_array_add_cstring(xhp->noextract, value);
-	xbps_dbg_printf(xhp, "Added noextract pattern: %s\n", value);
+	xbps_dbg_printf("Added noextract pattern: %s\n", value);
 }
 
 enum {
@@ -288,7 +288,7 @@ parse_file(struct xbps_handle *xhp, const char *path, bool nested)
 		return rv;
 	}
 
-	xbps_dbg_printf(xhp, "Parsing configuration file: %s\n", path);
+	xbps_dbg_printf("Parsing configuration file: %s\n", path);
 
 	while ((rd = getline(&line, &len, fp)) != -1) {
 		char *val = NULL;
@@ -310,7 +310,7 @@ parse_file(struct xbps_handle *xhp, const char *path, bool nested)
 
 		switch (parse_option(line, rd, &val, &vallen)) {
 		case KEY_ERROR:
-			xbps_dbg_printf(xhp, "%s: ignoring invalid option at "
+			xbps_dbg_printf("%s: ignoring invalid option at "
 			    "line %zu\n", path, nlines);
 			continue;
 		case KEY_ROOTDIR:
@@ -320,7 +320,7 @@ parse_file(struct xbps_handle *xhp, const char *path, bool nested)
 				rv = ENOMEM;
 				break;
 			}
-			xbps_dbg_printf(xhp, "%s: rootdir set to %s\n", path, val);
+			xbps_dbg_printf("%s: rootdir set to %s\n", path, val);
 			break;
 		case KEY_CACHEDIR:
 			size = sizeof xhp->cachedir;
@@ -329,7 +329,7 @@ parse_file(struct xbps_handle *xhp, const char *path, bool nested)
 				rv = ENOMEM;
 				break;
 			}
-			xbps_dbg_printf(xhp, "%s: cachedir set to %s\n", path, val);
+			xbps_dbg_printf("%s: cachedir set to %s\n", path, val);
 			break;
 		case KEY_ARCHITECTURE:
 			size = sizeof xhp->native_arch;
@@ -338,21 +338,21 @@ parse_file(struct xbps_handle *xhp, const char *path, bool nested)
 				rv = ENOMEM;
 				break;
 			}
-			xbps_dbg_printf(xhp, "%s: native architecture set to %s\n", path,
+			xbps_dbg_printf("%s: native architecture set to %s\n", path,
 			    val);
 			break;
 		case KEY_SYSLOG:
 			if (strcasecmp(val, "true") == 0) {
 				xhp->flags &= ~XBPS_FLAG_DISABLE_SYSLOG;
-				xbps_dbg_printf(xhp, "%s: syslog enabled\n", path);
+				xbps_dbg_printf("%s: syslog enabled\n", path);
 			} else {
 				xhp->flags |= XBPS_FLAG_DISABLE_SYSLOG;
-				xbps_dbg_printf(xhp, "%s: syslog disabled\n", path);
+				xbps_dbg_printf("%s: syslog disabled\n", path);
 			}
 			break;
 		case KEY_REPOSITORY:
 			if (store_repo(xhp, val))
-				xbps_dbg_printf(xhp, "%s: added repository %s\n", path, val);
+				xbps_dbg_printf("%s: added repository %s\n", path, val);
 			break;
 		case KEY_VIRTUALPKG:
 			rv = store_virtualpkg(xhp, path, nlines, val);
@@ -368,19 +368,19 @@ parse_file(struct xbps_handle *xhp, const char *path, bool nested)
 		case KEY_KEEPCONF:
 			if (strcasecmp(val, "true") == 0) {
 				xhp->flags |= XBPS_FLAG_KEEP_CONFIG;
-				xbps_dbg_printf(xhp, "%s: config preservation enabled\n", path);
+				xbps_dbg_printf("%s: config preservation enabled\n", path);
 			} else {
 				xhp->flags &= ~XBPS_FLAG_KEEP_CONFIG;
-				xbps_dbg_printf(xhp, "%s: config preservation disabled\n", path);
+				xbps_dbg_printf("%s: config preservation disabled\n", path);
 			}
 			break;
 		case KEY_BESTMATCHING:
 			if (strcasecmp(val, "true") == 0) {
 				xhp->flags |= XBPS_FLAG_BESTMATCH;
-				xbps_dbg_printf(xhp, "%s: pkg best matching enabled\n", path);
+				xbps_dbg_printf("%s: pkg best matching enabled\n", path);
 			} else {
 				xhp->flags &= ~XBPS_FLAG_BESTMATCH;
-				xbps_dbg_printf(xhp, "%s: pkg best matching disabled\n", path);
+				xbps_dbg_printf("%s: pkg best matching disabled\n", path);
 			}
 			break;
 		case KEY_IGNOREPKG:
@@ -392,7 +392,7 @@ parse_file(struct xbps_handle *xhp, const char *path, bool nested)
 		case KEY_INCLUDE:
 			/* Avoid double-nested parsing, only allow it once */
 			if (nested) {
-				xbps_dbg_printf(xhp, "%s: ignoring nested include\n", path);
+				xbps_dbg_printf("%s: ignoring nested include\n", path);
 				continue;
 			}
 			dir = strdup(path);
@@ -418,12 +418,12 @@ xbps_conf_init(struct xbps_handle *xhp)
 	assert(seen);
 
 	if (*xhp->confdir) {
-		xbps_dbg_printf(xhp, "Processing configuration directory: %s\n", xhp->confdir);
+		xbps_dbg_printf("Processing configuration directory: %s\n", xhp->confdir);
 		if ((rv = parse_files_glob(xhp, seen, xhp->confdir, "*.conf", false)))
 			goto out;
 	}
 	if (*xhp->sysconfdir) {
-		xbps_dbg_printf(xhp, "Processing system configuration directory: %s\n", xhp->sysconfdir);
+		xbps_dbg_printf("Processing system configuration directory: %s\n", xhp->sysconfdir);
 		if ((rv = parse_files_glob(xhp, seen, xhp->sysconfdir, "*.conf", false)))
 			goto out;
 	}

lib/download.c

@@ -172,12 +172,12 @@ xbps_fetch_file_dest_sha256(struct xbps_handle *xhp, const char *uri, const char
 	fio = fetchXGet(url, &url_st, fetch_flags);
 
 	/* debug stuff */
-	xbps_dbg_printf(xhp, "st.st_size: %zd\n", (ssize_t)stp->st_size);
-	xbps_dbg_printf(xhp, "st.st_atime: %s\n", print_time(&stp->st_atime));
-	xbps_dbg_printf(xhp, "st.st_mtime: %s\n", print_time(&stp->st_mtime));
-	xbps_dbg_printf(xhp, "url_stat.size: %zd\n", (ssize_t)url_st.size);
-	xbps_dbg_printf(xhp, "url_stat.atime: %s\n", print_time(&url_st.atime));
-	xbps_dbg_printf(xhp, "url_stat.mtime: %s\n", print_time(&url_st.mtime));
+	xbps_dbg_printf("st.st_size: %zd\n", (ssize_t)stp->st_size);
+	xbps_dbg_printf("st.st_atime: %s\n", print_time(&stp->st_atime));
+	xbps_dbg_printf("st.st_mtime: %s\n", print_time(&stp->st_mtime));
+	xbps_dbg_printf("url_stat.size: %zd\n", (ssize_t)url_st.size);
+	xbps_dbg_printf("url_stat.atime: %s\n", print_time(&url_st.atime));
+	xbps_dbg_printf("url_stat.mtime: %s\n", print_time(&url_st.mtime));
 
 	if (fio == NULL) {
 		if (fetchLastErrCode == FETCH_UNCHANGED) {
@@ -191,26 +191,26 @@ xbps_fetch_file_dest_sha256(struct xbps_handle *xhp, const char *uri, const char
 		goto fetch_file_out;
 	}
 	if (url_st.size == -1) {
-		xbps_dbg_printf(xhp, "Remote file size is unknown, resume "
+		xbps_dbg_printf("Remote file size is unknown, resume "
 		     "not possible...\n");
 		restart = false;
 	} else if (stp->st_size > url_st.size) {
 		/*
 		 * Remove local file if bigger than remote, and refetch the
 		 * whole shit again.
 		 */
-		xbps_dbg_printf(xhp, "Local file %s is greater than remote, "
+		xbps_dbg_printf("Local file %s is greater than remote, "
 		    "removing local file and refetching...\n", filename);
 		(void)remove(tempfile);
 		restart = false;
 	}
-	xbps_dbg_printf(xhp, "url->scheme: %s\n", url->scheme);
-	xbps_dbg_printf(xhp, "url->host: %s\n", url->host);
-	xbps_dbg_printf(xhp, "url->port: %d\n", url->port);
-	xbps_dbg_printf(xhp, "url->doc: %s\n", url->doc);
-	xbps_dbg_printf(xhp, "url->offset: %zd\n", (ssize_t)url->offset);
-	xbps_dbg_printf(xhp, "url->length: %zu\n", url->length);
-	xbps_dbg_printf(xhp, "url->last_modified: %s\n",
+	xbps_dbg_printf("url->scheme: %s\n", url->scheme);
+	xbps_dbg_printf("url->host: %s\n", url->host);
+	xbps_dbg_printf("url->port: %d\n", url->port);
+	xbps_dbg_printf("url->doc: %s\n", url->doc);
+	xbps_dbg_printf("url->offset: %zd\n", (ssize_t)url->offset);
+	xbps_dbg_printf("url->length: %zu\n", url->length);
+	xbps_dbg_printf("url->last_modified: %s\n",
 	    print_time(&url->last_modified));
 	/*
 	 * If restarting, open the file for appending otherwise create it.
@@ -235,7 +235,7 @@ xbps_fetch_file_dest_sha256(struct xbps_handle *xhp, const char *uri, const char
 				SHA256_Update(&sha256, buf, bytes_read);
 			}
 			if (bytes_read == -1) {
-				xbps_dbg_printf(xhp, "IO error while reading %s: %s\n",
+				xbps_dbg_printf("IO error while reading %s: %s\n",
 					tempfile, strerror(errno));
 				errno = EIO;
 				rv = -1;
@@ -260,8 +260,7 @@ xbps_fetch_file_dest_sha256(struct xbps_handle *xhp, const char *uri, const char
 			SHA256_Update(&sha256, buf, bytes_read);
 		bytes_written = write(fd, buf, (size_t)bytes_read);
 		if (bytes_written != bytes_read) {
-			xbps_dbg_printf(xhp,
-			    "Couldn't write to %s!\n", tempfile);
+			xbps_dbg_printf("Couldn't write to %s!\n", tempfile);
 			rv = -1;
 			goto fetch_file_out;
 		}
@@ -275,13 +274,13 @@ xbps_fetch_file_dest_sha256(struct xbps_handle *xhp, const char *uri, const char
 		    filename, false, true, false);
 	}
 	if (bytes_read == -1) {
-		xbps_dbg_printf(xhp, "IO error while fetching %s: %s\n",
+		xbps_dbg_printf("IO error while fetching %s: %s\n",
 		    filename, fetchLastErrString);
 		errno = EIO;
 		rv = -1;
 		goto fetch_file_out;
 	} else if (url_st.size > 0 && ((bytes_dload + url->offset) != url_st.size)) {
-		xbps_dbg_printf(xhp, "file %s is truncated\n", filename);
+		xbps_dbg_printf("file %s is truncated\n", filename);
 		errno = EIO;
 		rv = -1;
 		goto fetch_file_out;
@@ -311,7 +310,7 @@ xbps_fetch_file_dest_sha256(struct xbps_handle *xhp, const char *uri, const char
 rename_file:
 	/* File downloaded successfully, rename to destfile */
 	if (rename(tempfile, filename) == -1) {
-		xbps_dbg_printf(xhp, "failed to rename %s to %s: %s",
+		xbps_dbg_printf("failed to rename %s to %s: %s",
 		    tempfile, filename, strerror(errno));
 		rv = -1;
 		goto fetch_file_out;

lib/external/fexec.c

@@ -58,12 +58,12 @@ pfcexec(struct xbps_handle *xhp, const char *file, const char **argv)
 		if (strcmp(xhp->rootdir, "/")) {
 			if ((geteuid() == 0) && (access("bin/sh", X_OK) == 0)) {
 				if (chroot(xhp->rootdir) == -1) {
-					xbps_dbg_printf(xhp, "%s: chroot() "
+					xbps_dbg_printf("%s: chroot() "
 					    "failed: %s\n", *argv, strerror(errno));
 					_exit(errno);
 				}
 				if (chdir("/") == -1) {
-					xbps_dbg_printf(xhp, "%s: chdir() "
+					xbps_dbg_printf("%s: chdir() "
 					    "failed: %s\n", *argv, strerror(errno));
 					_exit(errno);
 				}